diff --git a/.scalafix.conf b/.scalafix.conf new file mode 100644 index 0000000000..1ccc2301d9 --- /dev/null +++ b/.scalafix.conf @@ -0,0 +1,16 @@ +// .scalafix.conf +rules = [ + RemoveUnused +] +RemoveUnused.imports = true +RemoveUnused.privates = false +RemoveUnused.locals = false + +//ignored files +ignored-files = [ + "TypedBenchmarkActors.scala", + "FlowPrependSpec.scala", + "FlowZipSpec.scala", + "FlowZipWithSpec.scala", + "FlowZipWithIndexSpec.scala" +] diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala index bfa4df05bd..0e8230486d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorDSLSpec.scala @@ -16,7 +16,6 @@ import akka.testkit.TimingTest class ActorDSLDummy { //#import - import akka.actor.ActorDSL._ import akka.actor.ActorSystem implicit val system = ActorSystem("demo") diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala index b77fdd73fc..8cea4a7d8b 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala @@ -6,9 +6,9 @@ package akka.io.dns.internal import java.net.InetSocketAddress -import akka.actor.{ Props, Terminated } +import akka.actor.Props import akka.io.Tcp -import akka.io.Tcp.{ CommandFailed, Connected, PeerClosed, Register } +import akka.io.Tcp.{ Connected, PeerClosed, Register } import akka.io.dns.{ RecordClass, RecordType } import akka.io.dns.internal.DnsClient.Answer import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } diff --git a/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala index 10ad8ca85a..8206e67b05 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala @@ -6,7 +6,6 @@ package akka.serialization import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletionStage -import java.util.concurrent.TimeUnit import akka.actor.ExtendedActorSystem import akka.testkit.{ AkkaSpec, EventFilter } diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala index 509e22d069..f5a90271b2 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala @@ -44,7 +44,6 @@ object WatchSpec { class WatchSpec extends ScalaTestWithActorTestKit(WatchSpec.config) with WordSpecLike { // FIXME why systemActor? spawn? - import testKit.systemActor implicit def untypedSystem = system.toUntyped diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala index 64270a1c6d..80dc761167 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala @@ -9,8 +9,6 @@ import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe import org.scalatest.WordSpecLike -import scala.concurrent.duration._ - class ReceivePartialSpec extends ScalaTestWithActorTestKit with WordSpecLike { implicit val ec = system.executionContext diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala index 5bde8d9fe2..00db2300d6 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/IntroSpec.scala @@ -17,8 +17,6 @@ import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import java.net.URLEncoder import java.nio.charset.StandardCharsets -import scala.concurrent.Await -import scala.concurrent.duration._ object IntroSpec { //format: OFF diff --git a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala index 2c7741a53f..267b0b25ca 100644 --- a/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/docs/akka/typed/OOIntroSpec.scala @@ -11,8 +11,6 @@ import java.nio.charset.StandardCharsets import akka.actor.typed._ import akka.actor.typed.scaladsl.{ ActorContext, Behaviors, AbstractBehavior } -import scala.concurrent.duration._ -import scala.concurrent.Await import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import org.scalatest.WordSpecLike //#imports diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala index bc7a7eff84..c9a7ddfe02 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala @@ -12,7 +12,6 @@ import akka.annotation.ApiMayChange import akka.actor.typed._ import java.util.Optional -import akka.util.Timeout import scala.concurrent.ExecutionContextExecutor /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala index 064e25e553..2e75355a82 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala @@ -8,7 +8,6 @@ import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId } import akka.actor.typed.internal.receptionist._ import akka.annotation.DoNotInherit import scala.collection.JavaConverters._ -import scala.concurrent.duration._ import scala.reflect.ClassTag import akka.actor.typed.ExtensionSetup diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala index a7ab33410a..326ceaef96 100644 --- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala @@ -4,7 +4,6 @@ package akka.actor -import language.existentials import scala.util.control.NonFatal import scala.util.{ Failure, Success, Try } import scala.collection.immutable diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala b/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala index 43425fb9c4..4a8e5db56c 100644 --- a/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala +++ b/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala @@ -13,7 +13,7 @@ import akka.util.JavaDurationConverters._ import com.typesafe.config.{ Config, ConfigValueType } import scala.collection.JavaConverters._ -import scala.collection.{ breakOut, immutable } +import scala.collection.breakOut import scala.concurrent.duration.FiniteDuration import scala.util.Try diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala index bacfd5e014..c553f80828 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala @@ -4,7 +4,7 @@ package akka.io.dns.internal -import java.net.{ InetAddress, InetSocketAddress } +import java.net.InetSocketAddress import java.util.concurrent.TimeUnit import akka.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, Props, Timers } @@ -16,7 +16,6 @@ import akka.io.{ Dns, DnsExt, PeriodicCacheCleanup } import akka.routing.FromConfig import akka.util.Timeout -import scala.collection.immutable import scala.concurrent.duration.Duration /** diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala b/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala index 670bcef212..5e255bb196 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala @@ -10,8 +10,8 @@ import akka.AkkaException import akka.actor.{ Actor, ActorLogging, ActorRef, Stash } import akka.annotation.InternalApi import akka.io.Tcp._ -import akka.io.dns.internal.DnsClient.{ Answer, DnsQuestion, Question4 } -import akka.io.{ IO, Tcp } +import akka.io.dns.internal.DnsClient.Answer +import akka.io.Tcp import akka.util.ByteString /** @@ -20,8 +20,6 @@ import akka.util.ByteString @InternalApi private[akka] class TcpDnsClient(tcp: ActorRef, ns: InetSocketAddress, answerRecipient: ActorRef) extends Actor with ActorLogging with Stash { import TcpDnsClient._ - import context.system - override def receive: Receive = idle val idle: Receive = { diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala index 26512fa0d7..460ef3f987 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala @@ -8,7 +8,7 @@ import java.util.concurrent.ThreadLocalRandom import java.util.Optional import akka.actor.{ Actor, ActorLogging, ActorRef, DeadLetterSuppression, OneForOneStrategy, Props, SupervisorStrategy, Terminated } -import akka.actor.SupervisorStrategy.{ Directive, Escalate, Restart, Stop } +import akka.actor.SupervisorStrategy.{ Directive, Escalate } import akka.util.JavaDurationConverters._ import scala.concurrent.duration.{ Duration, FiniteDuration } diff --git a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala b/akka-actor/src/main/scala/akka/util/ManifestInfo.scala index 14b41c8a40..f3e6360717 100644 --- a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala +++ b/akka-actor/src/main/scala/akka/util/ManifestInfo.scala @@ -15,7 +15,6 @@ import akka.actor.ExtendedActorSystem import akka.actor.Extension import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider -import akka.annotation.InternalApi import akka.event.Logging /** diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala index 7043738c38..47fbed1cc7 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala @@ -4,7 +4,7 @@ package akka.actor.typed -import java.util.concurrent.{ CountDownLatch, TimeUnit } +import java.util.concurrent.TimeUnit import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala index 0b62814f3b..99b90eae59 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedBenchmarkActors.scala @@ -4,12 +4,8 @@ package akka.actor.typed -import java.util.concurrent.{ CountDownLatch, TimeUnit } - import akka.Done -import akka.actor.typed.scaladsl.{ Behaviors, AbstractBehavior } -import akka.actor.typed.scaladsl.{ ActorContext ⇒ SActorContext } - +import akka.actor.typed.scaladsl.Behaviors import scala.concurrent.duration._ object TypedBenchmarkActors { diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala index b9b5855170..9a1485eeaa 100644 --- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala +++ b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala @@ -9,9 +9,7 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.actor.ExtendedActorSystem import akka.cluster.MultiNodeClusterSpec -import akka.testkit.LongRunningTest import akka.cluster.MemberStatus trait ClusterMetricsCommonConfig extends MultiNodeConfig { @@ -61,7 +59,6 @@ object ClusterMetricsDisabledConfig extends ClusterMetricsCommonConfig { } object ClusterMetricsEnabledConfig extends ClusterMetricsCommonConfig { - import ConfigFactory._ commonConfig { Seq( @@ -136,7 +133,6 @@ class ClusterMetricsDisabledMultiJvmNode5 extends ClusterMetricsDisabledSpec abstract class ClusterMetricsDisabledSpec extends MultiNodeSpec(ClusterMetricsDisabledConfig) with MultiNodeClusterSpec with RedirectLogging { - import akka.cluster.ClusterEvent.CurrentClusterState val metricsView = new ClusterMetricsView(cluster.system) diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala index 2f162016ce..f83f62bc64 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala @@ -4,7 +4,7 @@ package akka.cluster.sharding.typed -import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.concurrent.duration.FiniteDuration import akka.actor.NoSerializationVerificationNeeded import akka.actor.typed.ActorSystem import akka.annotation.InternalApi diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/PersistentEntity.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/PersistentEntity.scala index 97078f5f67..429b646b25 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/PersistentEntity.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/PersistentEntity.scala @@ -6,10 +6,7 @@ package akka.cluster.sharding.typed.javadsl import java.util.Optional -import scala.compat.java8.OptionConverters._ - import akka.actor.typed.BackoffSupervisorStrategy -import akka.actor.typed.Behavior import akka.persistence.typed.PersistenceId import akka.persistence.typed.javadsl.PersistentBehavior diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/PersistentEntity.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/PersistentEntity.scala index 125f9059a8..948a2dd3f6 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/PersistentEntity.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/PersistentEntity.scala @@ -4,7 +4,6 @@ package akka.cluster.sharding.typed.scaladsl -import akka.actor.typed.Behavior import akka.persistence.typed.scaladsl.Effect import akka.persistence.typed.scaladsl.PersistentBehavior diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala index 8a920d8d25..3d83deb629 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala @@ -8,7 +8,6 @@ import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit -import scala.concurrent.duration._ import scala.concurrent.ExecutionContext import scala.concurrent.Future import scala.concurrent.Promise diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala index 1769f319b8..d747832457 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success -import akka.Done import akka.actor.ExtendedActorSystem import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala index c89d5c8f80..e768155cbe 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala @@ -16,7 +16,6 @@ import akka.cluster.Cluster import akka.cluster.MemberStatus import akka.cluster.singleton.ClusterSingletonLeavingSpeedSpec.TheSingleton import akka.testkit.AkkaSpec -import akka.testkit.TestActors import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala index aaa2584b1a..06ee4ce414 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala @@ -6,7 +6,6 @@ package akka.cluster.ddata.typed.internal import scala.compat.java8.OptionConverters._ import scala.concurrent.duration._ -import scala.concurrent.duration.Duration import akka.annotation.InternalApi import akka.cluster.{ ddata ⇒ dd } diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala index 519d844080..d22601d3d4 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala @@ -4,7 +4,6 @@ package akka.cluster.typed.internal -import akka.actor.ExtendedActorSystem import akka.actor.typed.Props import akka.annotation.InternalApi import akka.cluster.ClusterEvent.MemberEvent diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala index 1710c46422..b892621ef4 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala @@ -13,12 +13,11 @@ import akka.actor.typed.{ ActorRef, Behavior, Terminated } import akka.annotation.InternalApi import akka.cluster.ClusterEvent.MemberRemoved import akka.cluster.ddata.{ DistributedData, ORMultiMap, ORMultiMapKey, Replicator } -import akka.cluster.{ Cluster, ClusterEvent, MemberStatus, UniqueAddress } +import akka.cluster.{ Cluster, ClusterEvent, UniqueAddress } import akka.remote.AddressUidExtension import akka.util.TypedMultiMap import scala.concurrent.duration._ -import scala.language.existentials /** INTERNAL API */ @InternalApi diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala index 9681268887..5642bdfd99 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/Registry.scala @@ -11,7 +11,6 @@ import akka.annotation.InternalApi import akka.cluster.{ Cluster, UniqueAddress } import akka.cluster.ddata.{ ORMultiMap, ORMultiMapKey } import akka.cluster.typed.internal.receptionist.ClusterReceptionist.{ DDataKey, EmptyORMultiMap, Entry } -import akka.util.Timeout import scala.concurrent.duration.Deadline diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala index 039ebaa76f..610060d505 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala @@ -4,7 +4,6 @@ package akka.cluster.typed -import java.util.UUID import java.util.concurrent.ConcurrentHashMap import akka.actor.{ Address, Scheduler } @@ -15,7 +14,6 @@ import org.scalatest.{ Matchers, Suite } import akka.actor.typed.scaladsl.adapter._ import akka.cluster.{ ClusterEvent, MemberStatus } import akka.remote.testconductor.RoleName -import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.duration._ import scala.language.implicitConversions diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala index 6e6fa0ca82..9d663600bb 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala @@ -15,7 +15,7 @@ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.cluster.Cluster import akka.cluster.ddata.typed.scaladsl.Replicator._ -import akka.cluster.ddata.{ GCounter, GCounterKey, ReplicatedData } +import akka.cluster.ddata.{ GCounter, GCounterKey } import akka.actor.testkit.typed.scaladsl._ import akka.util.Timeout import com.typesafe.config.ConfigFactory diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala index 07a5237985..1417a86067 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala @@ -12,7 +12,7 @@ import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import org.scalatest.{ WordSpec, WordSpecLike } +import org.scalatest.WordSpecLike object RemoteDeployNotAllowedSpec { def config = ConfigFactory.parseString( diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala index 10efddfa11..abc17ad80a 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala @@ -10,7 +10,7 @@ import akka.actor.{ ExtendedActorSystem, RootActorPath } import akka.actor.typed.receptionist.{ Receptionist, ServiceKey } import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ -import akka.actor.typed.{ ActorRef, ActorRefResolver, scaladsl } +import akka.actor.typed.{ ActorRef, ActorRefResolver } import akka.cluster.MemberStatus import akka.cluster.typed.{ Cluster, Join } import akka.serialization.SerializerWithStringManifest diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala index 5b341cd54a..02081c4c70 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala @@ -12,7 +12,7 @@ import akka.actor.Identify import akka.actor.Props import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import akka.remote.testkit.{ STMultiNodeSpec, MultiNodeConfig, MultiNodeSpec } +import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.actor.PoisonPill object AttemptSysMsgRedeliveryMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala index 8b2df894f1..e4b3613a6e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala @@ -4,12 +4,9 @@ package akka.cluster -import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Address -import scala.collection.immutable final case class ClientDowningNodeThatIsUnreachableMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala index 7e35475e97..b6844e742c 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala @@ -4,13 +4,9 @@ package akka.cluster -import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Address -import scala.collection.immutable final case class ClientDowningNodeThatIsUpMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala index 1e194c6d5f..23e4c69da4 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala @@ -6,7 +6,6 @@ package akka.cluster import scala.collection.immutable import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala index d718338781..2e8f85ce74 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/DisallowJoinOfTwoClustersSpec.scala @@ -4,7 +4,6 @@ package akka.cluster -import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala index 591f7d9721..8cb55aa436 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala @@ -7,8 +7,6 @@ package akka.cluster import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory -import akka.actor.Actor -import akka.actor.Props import akka.cluster.ClusterEvent.CurrentClusterState import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala index 4d4030d60c..792e04609e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala @@ -5,7 +5,6 @@ package akka.cluster import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala index 34b74d5029..87ba6a29a0 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala @@ -5,12 +5,9 @@ package akka.cluster import scala.collection.immutable -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ import akka.actor.Address object JoinSeedNodeMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala index cb982c9681..a8140b7faa 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala @@ -11,7 +11,6 @@ import akka.actor.ActorRef import akka.actor.ExtendedActorSystem import akka.actor.Identify import akka.cluster.ClusterEvent.UnreachableMember -import akka.remote.RARP import akka.remote.artery.ArterySettings import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala index 950654eab0..2258e40bbb 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala @@ -38,7 +38,6 @@ abstract class LeaderDowningAllOtherNodesSpec with MultiNodeClusterSpec { import LeaderDowningAllOtherNodesMultiJvmSpec._ - import ClusterEvent._ "A cluster of 6 nodes with monitored-by-nr-of-members=2" must { "setup" taggedAs LongRunningTest in { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala index 5794f40e8f..9a33a93784 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala @@ -10,9 +10,7 @@ import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor._ import scala.concurrent.duration._ -import scala.collection.immutable final case class LeaderDowningNodeThatIsUnreachableMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala index 5c4995b975..2ccef83e08 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala @@ -5,12 +5,10 @@ package akka.cluster import language.postfixOps -import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ import scala.concurrent.duration._ -import scala.collection.immutable final case class LeaderElectionMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val controller = role("controller") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala index c36b9bec65..6128a159c8 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala @@ -4,7 +4,6 @@ package akka.cluster -import scala.collection.immutable.SortedSet import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala index e6568b20e5..4f7f84757f 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala @@ -13,7 +13,6 @@ import javax.management.ObjectName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.util.Try object MBeanMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -38,7 +37,6 @@ abstract class MBeanSpec with MultiNodeClusterSpec { import MBeanMultiJvmSpec._ - import ClusterEvent._ val mbeanName = new ObjectName("akka:type=Cluster") lazy val mbeanServer = ManagementFactory.getPlatformMBeanServer diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala index 840f73b54b..1d1eccf6dd 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala @@ -4,13 +4,9 @@ package akka.cluster -import scala.collection.immutable.SortedSet -import org.scalatest.BeforeAndAfter -import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ import akka.actor.Props import akka.actor.Actor import akka.cluster.MemberStatus._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala index 7c879a1d84..a4170377a4 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala @@ -4,8 +4,6 @@ package akka.cluster -import scala.collection.immutable.SortedSet -import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala index c267829e4e..aa518a1fbc 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala @@ -5,16 +5,10 @@ package akka.cluster import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter -import scala.collection.immutable.SortedSet -import scala.concurrent.duration._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import java.util.concurrent.atomic.AtomicReference -import akka.actor.Props -import akka.actor.Actor import akka.cluster.MemberStatus._ object MinMembersBeforeUpMultiJvmSpec extends MultiNodeConfig { @@ -109,8 +103,6 @@ abstract class MinMembersBeforeUpBase(multiNodeConfig: MultiNodeConfig) extends MultiNodeSpec(multiNodeConfig) with MultiNodeClusterSpec { - import ClusterEvent._ - def first: RoleName def second: RoleName def third: RoleName diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala index 72f46345c0..0544064a94 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala @@ -14,7 +14,6 @@ import com.typesafe.config.ConfigFactory import scala.collection.immutable import scala.concurrent.duration._ -import scala.language.postfixOps object NodeChurnMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala index f609d696d1..b648b5f5fd 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala @@ -4,7 +4,6 @@ package akka.cluster -import scala.collection.immutable.SortedSet import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala index fa80289d40..2dc7ff15d0 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala @@ -4,8 +4,6 @@ package akka.cluster -import scala.collection.immutable.SortedSet -import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala index a042f1c20b..98260c3cc6 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala @@ -4,8 +4,6 @@ package akka.cluster -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala index c3d5155c6b..1e978f5e87 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala @@ -7,14 +7,12 @@ package akka.cluster import java.util.concurrent.ThreadLocalRandom import akka.actor.{ ActorSystem, Address } -import akka.remote.RARP import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.testkit._ import com.typesafe.config.ConfigFactory import scala.collection.immutable import scala.concurrent.duration._ -import scala.language.postfixOps // This test was a reproducer for issue #20639 object QuickRestartMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala index ebeb20e78b..fb9aedfeb1 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala @@ -7,7 +7,6 @@ package akka.cluster import language.postfixOps import scala.collection.immutable import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ @@ -20,7 +19,6 @@ import akka.actor.Actor import akka.actor.RootActorPath import akka.cluster.MemberStatus._ import akka.actor.Deploy -import akka.remote.RARP object RestartFirstSeedNodeMultiJvmSpec extends MultiNodeConfig { val seed1 = role("seed1") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala index 69df7ea59b..9c325a4931 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala @@ -13,9 +13,7 @@ import akka.actor.Address import akka.actor.Deploy import akka.actor.Props import akka.actor.RootActorPath -import akka.cluster.ClusterEvent._ import akka.cluster.MemberStatus._ -import akka.remote.AddressUidExtension import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala index 07f7a5f25e..92c808b86d 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala @@ -13,7 +13,6 @@ import akka.actor.Deploy import akka.actor.Props import akka.actor.RootActorPath import akka.cluster.MemberStatus._ -import akka.remote.RARP import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala index 92f652c2d9..2ee3c7a06a 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala @@ -11,9 +11,7 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ import scala.concurrent.duration._ -import akka.actor.Address import scala.concurrent.duration._ -import scala.collection.immutable import akka.remote.transport.ThrottlerTransportAdapter.Direction final case class SplitBrainMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala index 682713e1c2..98f1e23c8f 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala @@ -9,7 +9,6 @@ import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ import java.util.concurrent.ThreadLocalRandom -import java.util.concurrent.atomic.AtomicReference import org.scalatest.BeforeAndAfterEach import com.typesafe.config.Config import com.typesafe.config.ConfigFactory @@ -257,8 +256,6 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig { immutable.SortedMap.empty[Address, CurrentInternalStats] } - import context.dispatcher - def receive = { case PhiResult(from, phiValues) ⇒ phiValuesObservedByNode += from → phiValues case StatsResult(from, stats) ⇒ clusterStatsObservedByNode += from → stats @@ -290,7 +287,6 @@ private[cluster] object StressMultiJvmSpec extends MultiNodeConfig { def formatPhi: String = { if (phiValuesObservedByNode.isEmpty) "" else { - import akka.cluster.Member.addressOrdering val lines = for { (monitor, phiValues) ← phiValuesObservedByNode @@ -672,7 +668,6 @@ abstract class StressSpec }) with MultiNodeClusterSpec with BeforeAndAfterEach with ImplicitSender { import StressMultiJvmSpec._ - import ClusterEvent._ val settings = new Settings(system.settings.config) import settings._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala index b03ea6e1e2..91e1be68fe 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala @@ -5,11 +5,9 @@ package akka.cluster import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ import java.util.concurrent.atomic.AtomicReference import scala.collection.immutable.SortedSet import akka.actor.Props diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala index e2c69901a5..32ef43bec9 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala @@ -11,18 +11,15 @@ import akka.remote.transport.ThrottlerTransportAdapter.Direction import scala.concurrent.duration._ import akka.testkit._ -import akka.testkit.TestEvent._ -import java.util.concurrent.ThreadLocalRandom import akka.remote.testconductor.RoleName import akka.actor.Props import akka.actor.Actor import scala.util.control.NoStackTrace -import akka.remote.{ QuarantinedEvent, RARP, RemoteActorRefProvider } +import akka.remote.{ QuarantinedEvent, RemoteActorRefProvider } import akka.actor.ExtendedActorSystem import akka.actor.ActorRef -import akka.dispatch.sysmsg.Failed import akka.actor.PoisonPill import akka.actor.Terminated diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala index 6dbda32712..1dfc9b532f 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala @@ -16,10 +16,7 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import akka.actor.Actor -import akka.actor.ActorRef import akka.actor.Props -import akka.actor.RootActorPath import akka.cluster.MultiNodeClusterSpec.EndActor import akka.remote.RARP diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala index 74270a585f..b461622137 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala @@ -5,7 +5,6 @@ package akka.cluster.routing import scala.concurrent.Await -import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor.Actor import akka.actor.ActorRef @@ -15,7 +14,6 @@ import akka.cluster.MultiNodeClusterSpec import akka.pattern.ask import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.routing.ConsistentHashingRouter import akka.routing.ConsistentHashingRouter.ConsistentHashMapping import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope import akka.routing.GetRoutees diff --git a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala index 7951eb4166..677d7d208e 100644 --- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala +++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala @@ -7,7 +7,7 @@ package akka.cluster.ddata import java.util.concurrent.ThreadLocalRandom import scala.concurrent.duration._ -import akka.cluster.{ Cluster, ddata } +import akka.cluster.Cluster import akka.cluster.ddata.Replicator._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/SideEffect.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/SideEffect.scala index b64a15f2b1..b6dc652f08 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/SideEffect.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/SideEffect.scala @@ -6,7 +6,7 @@ package akka.persistence.typed import akka.actor.typed.ActorRef import akka.japi.function -import akka.annotation.{ DoNotInherit, InternalApi } +import akka.annotation.InternalApi /** * A [[SideEffect]] is an side effect that can be chained after a main effect. diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedBehavior.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedBehavior.scala index 101d37e2b2..93f1647158 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedBehavior.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedBehavior.scala @@ -7,8 +7,6 @@ package akka.persistence.typed.internal import java.util.UUID import java.util.concurrent.atomic.AtomicInteger -import akka.actor.typed.Behavior -import akka.actor.typed.scaladsl.Behaviors import akka.annotation.InternalApi import akka.persistence.typed.PersistenceId diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedReplayingSnapshot.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedReplayingSnapshot.scala index 7587572315..a53e98253d 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedReplayingSnapshot.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventsourcedReplayingSnapshot.scala @@ -5,7 +5,7 @@ package akka.persistence.typed.internal import akka.actor.typed.scaladsl.Behaviors.same -import akka.actor.typed.scaladsl.{ Behaviors, TimerScheduler } +import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.Behavior import akka.actor.typed.internal.PoisonPill import akka.annotation.InternalApi diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala index 2944ae0567..3fa20889df 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala @@ -5,7 +5,7 @@ package akka.persistence.typed.scaladsl import akka.annotation.DoNotInherit -import akka.persistence.typed.{ SideEffect, Stop } +import akka.persistence.typed.SideEffect import akka.persistence.typed.internal._ import scala.collection.{ immutable ⇒ im } diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorReplySpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorReplySpec.scala index d9f69561da..52432e7b8e 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorReplySpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentBehaviorReplySpec.scala @@ -7,29 +7,15 @@ package akka.persistence.typed.scaladsl import java.util.UUID import java.util.concurrent.atomic.AtomicInteger -import scala.concurrent.duration._ -import scala.util.Success -import scala.util.Try - import akka.Done -import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior -import akka.actor.typed.SupervisorStrategy -import akka.actor.typed.Terminated import akka.actor.typed.scaladsl.ActorContext -import akka.persistence.journal.inmem.InmemJournal -import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal -import akka.persistence.query.EventEnvelope -import akka.persistence.query.PersistenceQuery -import akka.persistence.query.Sequence import akka.persistence.typed.ExpectingReply import akka.persistence.typed.PersistenceId -import akka.stream.ActorMaterializer -import akka.stream.scaladsl.Sink import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.scalatest.WordSpecLike diff --git a/akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala b/akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala index 98ee7dd361..703c163eeb 100644 --- a/akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/OptimizedRecoverySpec.scala @@ -4,7 +4,6 @@ package akka.persistence -import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.Props import akka.testkit.ImplicitSender diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala index 2c36a7c413..ee672735ff 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala @@ -12,7 +12,7 @@ import akka.actor.Identify import akka.actor.Props import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import testkit.{ STMultiNodeSpec, MultiNodeConfig, MultiNodeSpec } +import testkit.MultiNodeConfig import akka.actor.PoisonPill import com.typesafe.config.ConfigFactory diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala index 200b6b3518..85e41de122 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala @@ -8,7 +8,7 @@ import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props import akka.pattern.ask -import testkit.{ STMultiNodeSpec, MultiNodeConfig, MultiNodeSpec } +import testkit.MultiNodeConfig import akka.testkit._ import akka.actor.Identify import akka.actor.ActorIdentity diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala index 1d81fbcb8a..3d370d3cf1 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala @@ -10,8 +10,7 @@ import language.postfixOps import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props -import testkit.{ STMultiNodeSpec, MultiNodeConfig, MultiNodeSpec } -import akka.testkit._ +import testkit.MultiNodeConfig import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala index 8899521a12..a4afdbe6cd 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala @@ -8,8 +8,7 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor._ import akka.testkit._ -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } -import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig class PiercingShouldKeepQuarantineConfig(artery: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala index d91b9e01f1..c8ab66c9c2 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala @@ -13,9 +13,6 @@ import akka.actor.ActorRef import akka.actor.Props import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec -import akka.testkit._ import akka.actor.ActorIdentity import akka.actor.Identify diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala index db8238354a..5af5bbc611 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala @@ -13,10 +13,7 @@ import akka.actor.Actor import akka.actor.ActorSystemImpl import akka.actor.Props import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ -import akka.testkit.TestEvent._ class RemoteDeploymentDeathWatchMultiJvmSpec(artery: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteGatePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteGatePiercingSpec.scala index e421ec088b..9f33adc30f 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteGatePiercingSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteGatePiercingSpec.scala @@ -6,15 +6,12 @@ package akka.remote import akka.remote.transport.AssociationHandle -import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor._ import akka.remote.testconductor.RoleName -import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociateExplicitly, ForceDisassociate, Direction } +import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ActorIdentity import akka.remote.testconductor.RoleName diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala index b14f8ab020..59f3501538 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala @@ -4,7 +4,6 @@ package akka.remote -import language.postfixOps import scala.concurrent.Await import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory @@ -13,12 +12,9 @@ import akka.actor.ActorIdentity import akka.actor.ActorRef import akka.actor.Identify import akka.actor.Props -import akka.actor.Terminated import akka.remote.testconductor.RoleName import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ExtendedActorSystem import akka.actor.ActorSystem diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartGateSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartGateSpec.scala index aca6ddc936..364cdde82f 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartGateSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartGateSpec.scala @@ -6,15 +6,12 @@ package akka.remote import akka.remote.transport.AssociationHandle -import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor._ import akka.remote.testconductor.RoleName -import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociateExplicitly, ForceDisassociate, Direction } +import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ActorIdentity import akka.remote.testconductor.RoleName diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeShutdownAndComesBackSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeShutdownAndComesBackSpec.scala index 937fe386f2..49a73bc22f 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeShutdownAndComesBackSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeShutdownAndComesBackSpec.scala @@ -11,8 +11,6 @@ import akka.actor._ import akka.remote.testconductor.RoleName import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociate, Direction } import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ActorIdentity import akka.remote.testconductor.RoleName diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala index 2fa8c9f096..e9654c8023 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala @@ -4,19 +4,13 @@ package akka.remote -import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor._ import akka.remote.testconductor.RoleName -import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociate, Direction } import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ -import akka.actor.ActorIdentity import akka.remote.testconductor.RoleName -import akka.actor.Identify import scala.concurrent.Await class RemoteQuarantinePiercingConfig(artery: Boolean) extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala index 0bb110b245..c4b196685e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala @@ -5,9 +5,6 @@ package akka.remote import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec -import akka.testkit.ImplicitSender import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props @@ -20,7 +17,6 @@ import scala.concurrent.duration._ import akka.actor.ActorIdentity import akka.actor.ActorLogging import akka.actor.Identify -import akka.remote.testconductor.TestConductor import akka.testkit.TestProbe class RemoteReDeploymentConfig(artery: Boolean) extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteRestartedQuarantinedSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteRestartedQuarantinedSpec.scala index e74af70969..8caf7f803e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteRestartedQuarantinedSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteRestartedQuarantinedSpec.scala @@ -4,17 +4,12 @@ package akka.remote -import akka.remote.transport.AssociationHandle - import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor._ import akka.remote.testconductor.RoleName -import akka.remote.transport.ThrottlerTransportAdapter.{ ForceDisassociateExplicitly, ForceDisassociate, Direction } import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ActorIdentity import akka.remote.testconductor.RoleName diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/Ticket15109Spec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/Ticket15109Spec.scala index c2fd8e5b88..f2df0574c4 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/Ticket15109Spec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/Ticket15109Spec.scala @@ -4,21 +4,17 @@ package akka.remote -import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor._ import akka.remote.testconductor.RoleName import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.actor.ActorIdentity import akka.remote.testconductor.RoleName import akka.actor.Identify import scala.concurrent.Await -import akka.remote.transport.Transport.InvalidAssociationException import akka.remote.transport.AssociationHandle object Ticket15109Spec extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala index 6c259b7c42..0657f24e9b 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala @@ -7,7 +7,6 @@ package akka.remote import java.util.concurrent.atomic.AtomicBoolean import scala.concurrent.duration._ -import scala.language.postfixOps import akka.actor.Actor import akka.actor.ActorIdentity diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala index 883ac23ad3..9298f9b4fc 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala @@ -4,25 +4,16 @@ package akka.remote.artery -import java.nio.ByteBuffer -import java.text.SimpleDateFormat -import java.util.Date import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit.NANOSECONDS import scala.concurrent.duration._ import akka.actor._ -import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec } +import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec } import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.PerfFlamesSupport -import akka.remote.testkit.STMultiNodeSpec -import akka.serialization.ByteBufferSerializer -import akka.serialization.SerializerWithStringManifest import akka.testkit._ import com.typesafe.config.ConfigFactory -import akka.remote.artery.compress.CompressionProtocol.Events.ReceivedActorRefCompressionTable import akka.remote.artery.MaxThroughputSpec._ object FanInThroughputSpec extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala index ae33447550..57a5de17ae 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala @@ -4,25 +4,16 @@ package akka.remote.artery -import java.nio.ByteBuffer -import java.text.SimpleDateFormat -import java.util.Date import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit.NANOSECONDS import scala.concurrent.duration._ import akka.actor._ -import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec } +import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec } import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.PerfFlamesSupport -import akka.remote.testkit.STMultiNodeSpec -import akka.serialization.ByteBufferSerializer -import akka.serialization.SerializerWithStringManifest import akka.testkit._ import com.typesafe.config.ConfigFactory -import akka.remote.artery.compress.CompressionProtocol.Events.ReceivedActorRefCompressionTable import akka.remote.artery.MaxThroughputSpec._ object FanOutThroughputSpec extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala index 62a6a55c0a..8ca72a4b3e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.duration._ import akka.actor._ import akka.remote.AddressUidExtension import akka.remote.RARP -import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala index 68ea4d58d2..d7df5a7111 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala @@ -5,7 +5,7 @@ package akka.remote.artery import java.util.concurrent.Executors -import java.util.concurrent.atomic.{ AtomicBoolean, AtomicLongArray } +import java.util.concurrent.atomic.AtomicLongArray import java.util.concurrent.locks.LockSupport import scala.concurrent.duration._ @@ -13,8 +13,6 @@ import akka.actor._ import akka.remote.RemotingMultiNodeSpec import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.stream.ActorMaterializer import akka.testkit._ import com.typesafe.config.ConfigFactory diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala index af72aedf67..3903202aa7 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala @@ -5,8 +5,6 @@ package akka.remote.artery import java.nio.ByteBuffer -import java.text.SimpleDateFormat -import java.util.Date import java.util.concurrent.Executors import java.util.concurrent.TimeUnit.NANOSECONDS @@ -15,9 +13,7 @@ import akka.actor._ import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec } import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.PerfFlamesSupport -import akka.remote.testkit.STMultiNodeSpec import akka.serialization.ByteBufferSerializer import akka.serialization.SerializerWithStringManifest import akka.testkit._ diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala index de9e1a90dd..39ff4d3c81 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala @@ -4,22 +4,16 @@ package akka.remote.artery -import scala.concurrent.duration._ import akka.actor._ import akka.actor.ActorIdentity import akka.actor.Identify -import akka.remote.{ QuarantinedEvent, RARP, RemotingMultiNodeSpec } -import akka.remote.testconductor.RoleName +import akka.remote.{ RARP, RemotingMultiNodeSpec } import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec -import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ import akka.util.Timeout import com.typesafe.config.ConfigFactory import org.scalatest.concurrent.ScalaFutures -import scala.util.Try import scala.util.control.NoStackTrace object SurviveInboundStreamRestartWithCompressionInFlightSpec extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala index 57e62dacbf..94a41f56db 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala @@ -9,10 +9,7 @@ import akka.actor._ import akka.actor.ActorIdentity import akka.actor.Identify import akka.remote.{ RemotingMultiNodeSpec, QuarantinedEvent, RARP } -import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.remote.testkit.MultiNodeSpec -import akka.remote.testkit.STMultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ import com.typesafe.config.ConfigFactory diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala index 79353b1c68..0f5b84af6f 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala @@ -6,10 +6,8 @@ package akka.remote.artery import akka.actor.ExtendedActorSystem import akka.serialization.SerializerWithStringManifest -import akka.serialization.ByteBufferSerializer import akka.remote.artery.protobuf.{ TestMessages ⇒ proto } import akka.protobuf.ByteString -import java.util.concurrent.locks.LockSupport object TestMessage { final case class Item(id: Long, name: String) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala index 0d06f0bcc3..15c5388993 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestRateReporter.scala @@ -5,7 +5,6 @@ package akka.remote.artery import java.util.concurrent.TimeUnit.SECONDS -import java.util.concurrent.Executors class TestRateReporter(name: String) extends RateReporter( SECONDS.toNanos(1), diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala index 5a0092bcfb..266ce67eeb 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala @@ -26,7 +26,6 @@ import akka.stream.ActorMaterializer import akka.stream.KillSwitches import akka.stream.ThrottleMode import akka.stream.scaladsl.Flow -import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Source import akka.testkit._ import akka.util.ByteString diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala index 3f6af8456f..d44b4e803f 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala @@ -11,7 +11,7 @@ import akka.actor.Address import akka.actor.PoisonPill import akka.actor.Props import akka.remote.RemotingMultiNodeSpec -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } +import akka.remote.testkit.MultiNodeConfig import akka.routing.Broadcast import akka.routing.RandomPool import akka.routing.RoutedActorRef diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala index d9c363fbb4..abff3ed1e0 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala @@ -11,7 +11,7 @@ import akka.actor.Address import akka.actor.PoisonPill import akka.actor.Props import akka.remote.RemotingMultiNodeSpec -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } +import akka.remote.testkit.MultiNodeConfig import akka.routing.Broadcast import akka.routing.ScatterGatherFirstCompletedPool import akka.routing.RoutedActorRef diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala index a11bf319b8..5583188159 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala @@ -5,19 +5,13 @@ package akka.remote.testconductor import language.postfixOps -import com.typesafe.config.ConfigFactory import akka.actor.{ Actor, ActorIdentity, Deploy, Identify, Props } -import scala.concurrent.Await -import scala.concurrent.Awaitable import scala.concurrent.duration._ -import akka.testkit.ImplicitSender import akka.testkit.LongRunningTest -import java.net.InetSocketAddress -import java.net.InetAddress import akka.remote.RemotingMultiNodeSpec -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } +import akka.remote.testkit.MultiNodeConfig import akka.remote.transport.ThrottlerTransportAdapter.Direction object TestConductorMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala index 028ff575d1..66157354ac 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeSpecSpec.scala @@ -23,8 +23,6 @@ class MultiNodeSpecSpecMultiJvmNode4 extends MultiNodeSpecSpec class MultiNodeSpecSpec extends RemotingMultiNodeSpec(MultiNodeSpecMultiJvmSpec) { - import MultiNodeSpecMultiJvmSpec._ - def initialParticipants = 4 "A MultiNodeSpec" must { diff --git a/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala index de8d5b1aa7..56b8d16de6 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala @@ -42,7 +42,6 @@ import io.aeron.status.ChannelEndpointStatus import org.agrona.DirectBuffer import org.agrona.ErrorHandler import org.agrona.IoUtil -import org.agrona.collections.IntObjConsumer import org.agrona.concurrent.BackoffIdleStrategy import org.agrona.concurrent.status.CountersReader.MetaData diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index 4b437d0ae3..3ce4cfb2bd 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -20,7 +20,6 @@ import scala.concurrent.Future import scala.concurrent.duration._ import java.util.concurrent.ThreadLocalRandom -import akka.serialization.SerializerWithStringManifest import akka.testkit.SocketUtil.temporaryServerAddress object RemotingSpec { diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index 58dfc6afb5..0c5726937c 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -12,7 +12,7 @@ import akka.actor._ import akka.event.NoMarkerLogging import akka.pattern.ask import akka.remote.Configuration.{ CipherConfig, getCipherConfig } -import akka.remote.transport.netty.{ NettySSLSupport, SSLSettings } +import akka.remote.transport.netty.SSLSettings import akka.testkit._ import akka.util.Timeout import com.typesafe.config._ @@ -20,7 +20,6 @@ import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ import scala.reflect.classTag -import akka.event.Logging import akka.remote.transport.netty.ConfigSSLEngineProvider object Configuration { diff --git a/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala index 23d4fc9da8..e2dea6a8b9 100644 --- a/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala @@ -6,7 +6,7 @@ package akka.remote import java.io.NotSerializableException -import akka.actor.{ Actor, ActorSystem, ExtendedActorSystem, Props, RootActorPath } +import akka.actor.{ ActorSystem, ExtendedActorSystem, RootActorPath } import akka.serialization.SerializerWithStringManifest import akka.testkit.{ AkkaSpec, TestActors, TestKit } import com.typesafe.config.{ Config, ConfigFactory } diff --git a/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala index 8c395aab8f..6d637716c0 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala @@ -4,7 +4,7 @@ package akka.remote.artery -import com.typesafe.config.{ Config, ConfigFactory } +import com.typesafe.config.ConfigFactory import akka.actor.{ ActorSystem, Address } import akka.remote.transport.netty.NettyTransportSpec._ diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala index 3ec3039a33..27b1a2a83c 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala @@ -6,11 +6,7 @@ package akka.stream.testkit import akka.actor.ActorRef import akka.actor.ActorRefWithCell -import akka.stream.Materializer -import akka.stream.impl._ -import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ import scala.util.control.NoStackTrace object Utils { diff --git a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala index 7784a0e740..0ca462e23f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala @@ -8,7 +8,6 @@ import akka.actor.{ ActorRef, PoisonPill, Props } import akka.stream.{ ClosedShape, ActorMaterializer, ActorMaterializerSettings, ActorAttributes } import akka.stream.scaladsl._ import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.impl.ReactiveStreamsCompliance import akka.testkit.TestEvent.Mute diff --git a/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala index 064205efd5..88110f7b62 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala @@ -8,7 +8,6 @@ import akka.stream.{ ActorMaterializerSettings, ActorMaterializer } import akka.stream.scaladsl.{ Source, Flow } import akka.stream.scaladsl.Sink import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestProbe import org.reactivestreams.{ Publisher, Subscriber } diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala index 7cc2bdfef4..7583ccaea3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/GraphInterpreterPortsSpec.scala @@ -6,7 +6,6 @@ package akka.stream.impl.fusing import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils._ -import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphInterpreterPortsSpec extends StreamSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala index e45f8d4a47..9d1dc86f0a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterStressSpec.scala @@ -4,7 +4,6 @@ package akka.stream.impl.fusing -import akka.stream.Supervision import akka.stream.testkit.StreamSpec import akka.testkit.LongRunningTest import akka.util.ConstantFun diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala index 00bd21962d..c7b03ba878 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala @@ -4,8 +4,7 @@ package akka.stream.io -import java.nio.channels.NonWritableChannelException -import java.nio.file.StandardOpenOption.{ CREATE, READ, WRITE } +import java.nio.file.StandardOpenOption.{ CREATE, WRITE } import java.nio.file._ import akka.actor.ActorSystem @@ -24,7 +23,6 @@ import com.google.common.jimfs.{ Configuration, Jimfs } import scala.collection.mutable.ListBuffer import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ -import scala.concurrent.ExecutionContext.Implicits.global class FileSinkSpec extends StreamSpec(UnboundedMailboxConfig) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala index 8292b861e7..91c41c98e2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala @@ -14,7 +14,6 @@ import akka.io.Tcp._ import akka.stream._ import akka.stream.scaladsl.Tcp.{ IncomingConnection, ServerBinding } import akka.stream.scaladsl.{ Flow, _ } -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.testkit.{ EventFilter, TestKit, TestLatch, TestProbe } @@ -29,7 +28,6 @@ import org.scalatest.concurrent.PatienceConfiguration.Timeout import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.{ Await, ExecutionContext, Future, Promise } -import scala.util.control.NonFatal class TcpSpec extends StreamSpec(""" akka.loglevel = debug diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala index abbb2a94d8..dbdc65981d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala @@ -8,7 +8,6 @@ import scala.concurrent.duration._ import akka.actor.{ Actor, ActorRef, Props, Status } import akka.stream.ActorMaterializer import akka.stream.Attributes.inputBuffer -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala index 8b991c7d0d..d83a27be7c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream.ActorMaterializer import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl._ import akka.actor.Actor diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala index b7f99f1961..f519193fee 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.NotUsed import akka.stream.testkit.StreamSpec -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.util.ByteString import akka.stream._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala index 0c194c6977..fb5ccb95e3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala @@ -10,7 +10,6 @@ import akka.actor.{ Actor, ActorRef, PoisonPill, Props } import akka.stream.ActorAttributes.supervisionStrategy import akka.stream.{ ActorAttributes, ActorMaterializer, Supervision } import akka.stream.Supervision.resumingDecider -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.testkit.{ TestActors, TestProbe } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala index 245e9673b3..9b17f84eda 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.duration._ import akka.stream.{ BufferOverflowException, ActorMaterializer, ActorMaterializerSettings, OverflowStrategy } import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowBufferSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala index 581de773d7..08b9da6d87 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala @@ -11,7 +11,6 @@ import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowConcatAllSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala index 2c1c07d4f8..7dd86b9fd6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.{ BaseTwoStreamsSetup, TestPublisher, TestSubscriber } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala index 4aa1e75235..21dcec1adc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import akka.Done import akka.stream.Attributes._ import akka.stream.OverflowStrategies.EmitEarly -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.{ StreamSpec, TestPublisher, TestSubscriber } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala index 81843dd4c3..a05b2b05c3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala @@ -9,7 +9,6 @@ import akka.stream.testkit.scaladsl.TestSink import java.util.concurrent.ThreadLocalRandom.{ current ⇒ random } import akka.stream.ActorAttributes._ import akka.stream.Supervision._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala index a235834558..88cd0dbfe1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala @@ -14,7 +14,6 @@ import scala.concurrent._ import scala.concurrent.duration._ import akka.stream.impl.TraversalBuilder -import akka.stream.impl.fusing.GraphStages import akka.stream.impl.fusing.GraphStages.SingleSource import akka.stream.testkit.{ StreamSpec, TestPublisher } import org.scalatest.exceptions.TestFailedException diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala index 139decc36e..49835564fb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala @@ -8,7 +8,6 @@ import akka.NotUsed import akka.stream.testkit.StreamSpec import scala.concurrent.Await -import scala.util.control.NoStackTrace import akka.stream.{ ActorAttributes, ActorMaterializer, Supervision } import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala index 12da9d81e5..fd88e21f36 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala @@ -10,7 +10,6 @@ import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowFromFutureSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala index 15e2619a10..88915a4371 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala @@ -10,7 +10,6 @@ import java.util.concurrent.ThreadLocalRandom.{ current ⇒ random } import akka.stream.{ ActorMaterializer, ActorMaterializerSettings, ThrottleMode } import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TimingTest diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala index ad6585d2ed..4c7dec1e2b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import org.reactivestreams.Publisher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala index bf6f911b21..d8592072bd 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala @@ -10,9 +10,7 @@ import scala.concurrent.duration._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.testkit.EventFilter class FlowIteratorSpec extends AbstractFlowIteratorSpec { override def testName = "A Flow based on an iterator producing function" diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala index fe14877a34..826408602f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream.{ ActorMaterializer, ActorMaterializerSettings, FlowShape, OverflowStrategy } import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl._ import com.typesafe.config.ConfigFactory diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala index 26bf8fe48a..2e5355856c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala @@ -11,7 +11,6 @@ import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestLatch import akka.testkit.TestProbe diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala index 0663218516..b7ef7461e8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ Supervision, ActorAttributes, ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import scala.util.control.NoStackTrace diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala index 348444557d..f7fe8fc363 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala @@ -5,7 +5,6 @@ package akka.stream.scaladsl import akka.stream.testkit.StreamSpec -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala index 64f015fef0..258f1a69eb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import org.reactivestreams.Publisher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala index 874eb06097..15ae19c06a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala @@ -11,7 +11,6 @@ import scala.util.control.NoStackTrace import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestProbe diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala index 74f224ac27..14c7690f93 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala @@ -5,8 +5,6 @@ package akka.stream.scaladsl //#or-else -import akka.stream.scaladsl.Source -import akka.stream.scaladsl.Sink //#or-else import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala index 5264f1de1f..f53f2ecd51 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.duration._ import scala.util.control.NoStackTrace import akka.stream._ import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowPrefixAndTailSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala index a662a9637d..ff53225c3e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.TestSink import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import scala.util.control.NoStackTrace diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala index 208f768323..136cffb49e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import akka.stream.testkit.StreamSpec import scala.concurrent.Await -import scala.util.control.NoStackTrace import akka.stream.{ ActorAttributes, ActorMaterializer, Supervision } import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala index 26481e135f..c725907115 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala @@ -16,7 +16,7 @@ import akka.stream.{ ActorAttributes, ActorMaterializer, Supervision } import scala.collection.immutable import scala.concurrent.{ Future, Promise } import scala.concurrent.duration._ -import scala.util.{ Failure, Success } +import scala.util.Failure class FlowScanAsyncSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala index 18084f78e3..811af11e1c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala @@ -4,7 +4,6 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index 72a0f50a3c..260b6407ad 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -9,7 +9,6 @@ import java.util.concurrent.ThreadLocalRandom import akka.NotUsed import akka.actor._ import akka.stream.impl._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.stream._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala index 628c3f70cb..15325f1d74 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream.ActorAttributes._ import akka.stream.Supervision._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala index 3b6f947e1e..b86e2a69ff 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import scala.concurrent.duration._ import akka.stream.ActorMaterializer import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowTakeWithinSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala index b9c2d78137..e8211d3b4b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.actor.{ Actor, PoisonPill, Props } import akka.stream.ActorMaterializer -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.testkit.TestActors diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala index e2e2a9936c..305c29b7c9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala @@ -8,7 +8,6 @@ import akka.Done import akka.pattern.pipe import akka.stream._ import akka.stream.testkit.StreamSpec -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.{ TestSink, TestSource } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala index 679fc89a15..dc52603c7e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala @@ -10,7 +10,6 @@ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ -import scala.concurrent.duration._ import scala.util.control.NoStackTrace class FlowWireTapSpec extends StreamSpec("akka.stream.materializer.debug.fuzzing-mode = off") { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipSpec.scala index 9adebfa9d9..780d4c43a6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipSpec.scala @@ -10,7 +10,6 @@ import akka.stream.scaladsl.Sink //#zip -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.{ BaseTwoStreamsSetup, TestSubscriber } import org.reactivestreams.Publisher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipWithIndexSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipWithIndexSpec.scala index 4eaabd14e4..72f82c475d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipWithIndexSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipWithIndexSpec.scala @@ -9,7 +9,6 @@ import akka.stream.scaladsl.Source import akka.stream.scaladsl.Sink //#zip-with-index -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit.{ StreamSpec, TestSubscriber } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala index bcaedde8e0..6103b38773 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.Future import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphBalanceSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala index 78b47864cb..88b1f5bb2d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ import akka.stream._ import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphBroadcastSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala index 3baf608137..da775fc63c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala @@ -8,7 +8,6 @@ import scala.concurrent.{ Promise } import akka.stream._ import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphConcatSpec extends TwoStreamsSetup { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala index c86df73525..6d9d2a459e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala @@ -5,7 +5,6 @@ package akka.stream.scaladsl import akka.stream._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSource diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala index 1515fec8cf..e3ade851ba 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala @@ -10,7 +10,6 @@ import scala.concurrent.Await import scala.concurrent.duration._ import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphMergeSpec extends TwoStreamsSetup { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala index 5caa75b0e0..b15ca439d7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream.testkit._ import akka.stream.{ OverflowStrategy, ActorMaterializer, ActorMaterializerSettings, ClosedShape } -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala index c51e1f35ce..29e630df54 100755 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import scala.concurrent.duration._ import akka.stream.{ ClosedShape, OverflowStrategy, ActorMaterializerSettings, ActorMaterializer } import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphUnzipSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala index 8d708c975f..9b8b9b1ea2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.stream._ import akka.stream.testkit.TestSubscriber.Probe -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import org.reactivestreams.Publisher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphWireTapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphWireTapSpec.scala index 3a5cd8d505..abc9a7b748 100755 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphWireTapSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphWireTapSpec.scala @@ -5,7 +5,6 @@ package akka.stream.scaladsl import akka.stream._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala index 959687e773..acbf9d3c67 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala @@ -5,7 +5,6 @@ package akka.stream.scaladsl import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala index b80dd1b1cd..d6af2c02c3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala @@ -5,7 +5,6 @@ package akka.stream.scaladsl import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala index 2a6790bd02..4877a0bede 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala @@ -9,7 +9,6 @@ import scala.concurrent.Future import scala.concurrent.duration._ import akka.stream.{ AbruptTerminationException, ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class HeadSinkSpec extends StreamSpec with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala index c28f4e8718..73751ebc64 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala @@ -6,7 +6,6 @@ package akka.stream.scaladsl import akka.NotUsed import akka.stream._ -import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue } import akka.stream.testkit.{ StreamSpec, TestPublisher } import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala index 265d60a1f5..94e8cdcec0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala @@ -7,8 +7,6 @@ package akka.stream.scaladsl import java.util.concurrent.TimeoutException import akka.NotUsed -import akka.stream.ActorAttributes.supervisionStrategy -import akka.stream.Supervision._ import akka.stream._ import akka.stream.stage.{ GraphStage, GraphStageLogic } import akka.stream.testkit.{ StreamSpec, TestPublisher } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala index eef822fd52..572039c7c1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import akka.stream.testkit.StreamSpec import akka.stream.{ ClosedShape, ActorMaterializer } -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import scala.concurrent.duration._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala index bd296d722d..e1cb603066 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala @@ -8,7 +8,6 @@ import akka.actor.Status import akka.pattern.pipe import akka.stream.Attributes.inputBuffer import akka.stream.{ ActorMaterializer, StreamDetachedException } -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala index e28089f9cf..cab3f8d174 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala @@ -9,7 +9,6 @@ import akka.actor.Status import akka.pattern.pipe import akka.stream._ import akka.stream.impl.QueueSource -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.{ GraphStageMessages, StreamSpec, TestSourceStage, TestSubscriber } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala index 4efa3562d2..007a1c1e25 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala @@ -10,7 +10,6 @@ import akka.stream.ActorMaterializer import akka.stream.ActorAttributes._ import akka.stream.Supervision._ import akka.stream.testkit.StreamSpec -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.{ TestLatch, TestProbe } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala index bb03827558..b7500a9416 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala @@ -12,7 +12,6 @@ import java.util.stream.{ Collector, Collectors } import akka.stream._ import akka.stream.testkit.Utils._ -import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.DefaultTimeout diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala index 1c0db0ee1c..6594955e9c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala @@ -11,7 +11,7 @@ import akka.pattern._ import akka.stream.testkit.TestPublisher import akka.stream.testkit.scaladsl._ import akka.stream._ -import akka.testkit.{ AkkaSpec, ImplicitSender, SocketUtil, TestKit, TestProbe } +import akka.testkit.{ AkkaSpec, ImplicitSender, TestKit, TestProbe } import akka.util.ByteString import com.typesafe.config._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala index 5fdc8e0e87..ed88e11bbf 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSinkSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ class SubscriberSinkSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala index 37667b0798..6cf2524876 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.impl.SubscriptionTimeoutException import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import scala.concurrent.Await diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala index 0904240621..9fc96b7c0b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala @@ -7,7 +7,6 @@ package akka.stream.scaladsl import scala.concurrent.duration._ import akka.stream.{ ClosedShape, ActorMaterializer } import akka.stream.testkit._ -import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TimingTest diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala index 0a30210db2..c5ba675ddc 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala @@ -8,7 +8,6 @@ import java.util.function.BiFunction import akka.NotUsed import akka.actor.typed.ActorRef -import akka.stream.ActorAttributes import akka.stream.javadsl.Flow import akka.util.JavaDurationConverters diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala index da04c1ca10..470af4243d 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala @@ -13,7 +13,6 @@ import akka.util.Timeout import scala.annotation.implicitNotFound import scala.concurrent.Future -import scala.reflect.ClassTag /** * Collection of Flows aimed at integrating with typed Actors. diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala index 4271affcc1..7579decbf2 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala @@ -6,7 +6,7 @@ package akka.stream.javadsl import akka.NotUsed import akka.event.LoggingAdapter -import akka.japi.{ Pair, Util, function } +import akka.japi.{ Util, function } import akka.stream._ import akka.util.ConstantFun import akka.util.JavaDurationConverters._ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala index d18dc56cdc..6783fec383 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala @@ -8,7 +8,6 @@ import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } import akka.stream.{ Attributes, Inlet, Outlet, UniformFanInShape } import scala.collection.immutable -import scala.language.higherKinds /** * MergeLatest joins elements from N input streams into stream of lists of size N. diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala index cf4674fe51..0a3611ecb4 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala @@ -5,7 +5,7 @@ package akka.stream.scaladsl import akka.NotUsed -import akka.stream.{ Attributes, Inlet, KillSwitch, SinkShape } +import akka.stream.{ Attributes, Inlet, SinkShape } import akka.stream.stage.{ GraphStage, InHandler } import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala index da386f6bb7..fb5b7a3634 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala @@ -5,7 +5,7 @@ package akka.stream.scaladsl import akka.NotUsed -import akka.stream.{ Attributes, KillSwitch, Outlet, SourceShape } +import akka.stream.{ Attributes, Outlet, SourceShape } import akka.stream.stage.{ GraphStage, OutHandler } import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala index 57c8e9ff1d..7cd37d3135 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala @@ -26,8 +26,6 @@ import scala.concurrent.{ Future, Promise } import akka.stream.stage.GraphStageWithMaterializedValue import scala.compat.java8.FutureConverters._ -import akka.stream.impl.fusing.GraphStageModule - /** * A `Source` is a set of stream processing steps that has one open output. It can comprise * any number of internal sources and transformations that are wired together, or it can be diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/StreamRefs.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/StreamRefs.scala index 89af4c4db4..64b0db0176 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/StreamRefs.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/StreamRefs.scala @@ -5,7 +5,7 @@ package akka.stream.scaladsl import akka.annotation.ApiMayChange -import akka.stream.{ SinkRef, SourceRef, StreamRefAttributes } +import akka.stream.{ SinkRef, SourceRef } import akka.stream.impl.streamref.{ SinkRefStageImpl, SourceRefStageImpl } import akka.util.OptionVal diff --git a/build.sbt b/build.sbt index ebfb371655..b678ce881a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,11 @@ -import akka.{ParadoxSupport, AutomaticModuleName} +import akka.{AutomaticModuleName, ParadoxSupport, ScalafixIgnoreFilePlugin} -enablePlugins(UnidocRoot, TimeStampede, UnidocWithPrValidation, NoPublish, CopyrightHeader, CopyrightHeaderInPr) +enablePlugins(UnidocRoot, TimeStampede, UnidocWithPrValidation, NoPublish, CopyrightHeader, CopyrightHeaderInPr, + ScalafixIgnoreFilePlugin) disablePlugins(MimaPlugin) +addCommandAlias( + name ="fix", + value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;test:compile") import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm import com.typesafe.tools.mima.plugin.MimaPlugin @@ -242,6 +246,7 @@ lazy val docs = akkaModule("akka-docs") StreamOperatorsIndexGenerator) .settings(ParadoxSupport.paradoxWithCustomDirectives) .disablePlugins(MimaPlugin, WhiteSourcePlugin) + .disablePlugins(ScalafixPlugin) lazy val multiNodeTestkit = akkaModule("akka-multi-node-testkit") .dependsOn(remote, testkit) @@ -481,4 +486,3 @@ def akkaModule(name: String): Project = .settings(akka.AkkaBuild.defaultSettings) .settings(akka.Formatting.formatSettings) .enablePlugins(BootstrapGenjavadoc) - diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 822fa9e3af..4aacbfaf25 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -4,12 +4,12 @@ package akka -import java.io.{ FileInputStream, InputStreamReader } +import java.io.{FileInputStream, InputStreamReader} import java.util.Properties -import com.typesafe.sbt.pgp.PgpKeys.publishSigned import sbt.Keys._ import sbt._ + import scala.collection.breakOut object AkkaBuild { @@ -83,7 +83,7 @@ object AkkaBuild { private def allWarnings: Boolean = System.getProperty("akka.allwarnings", "false").toBoolean - final val DefaultScalacOptions = Seq("-encoding", "UTF-8", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint") + final val DefaultScalacOptions = Seq("-encoding", "UTF-8", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint", "-Ywarn-unused") // -XDignore.symbol.file suppresses sun.misc.Unsafe warnings final val DefaultJavacOptions = Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-XDignore.symbol.file") @@ -108,7 +108,8 @@ object AkkaBuild { Seq("-release", "8", "-javabootclasspath", CrossJava.Keys.fullJavaHomes.value("8") + "/jre/lib/rt.jar")), scalacOptions in Compile ++= (if (allWarnings) Seq("-deprecation") else Nil), scalacOptions in Test := (scalacOptions in Test).value.filterNot(opt ⇒ - opt == "-Xlog-reflective-calls" || opt.contains("genjavadoc")), + opt == "-Xlog-reflective-calls" || opt.contains("genjavadoc")) ++ Seq( + "-Ywarn-unused"), javacOptions in compile ++= DefaultJavacOptions ++ ( if (System.getProperty("java.version").startsWith("1.")) Seq() diff --git a/project/ScalafixForMultiNodeScalaTestPlugin.scala b/project/ScalafixForMultiNodeScalaTestPlugin.scala new file mode 100644 index 0000000000..2c1db64873 --- /dev/null +++ b/project/ScalafixForMultiNodeScalaTestPlugin.scala @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2018 Lightbend Inc. + */ + +package akka + +import com.typesafe.sbt.MultiJvmPlugin +import sbt.{AutoPlugin, Def, PluginTrigger, Plugins, Setting, inConfig} +import scalafix.sbt.ScalafixPlugin.autoImport.scalafixConfigSettings + +object ScalafixForMultiNodeScalaTestPlugin extends AutoPlugin with ScalafixIgnoreFileSupport { + override def trigger: PluginTrigger = allRequirements + + override def requires: Plugins = MultiNodeScalaTest + + import MultiJvmPlugin.autoImport._ + + lazy val scalafixIgnoredSetting: Seq[Setting[_]] = Seq( + ignore(MultiJvm) + ) + + override def projectSettings: Seq[Def.Setting[_]] = + Seq(MultiJvm).flatMap(c => inConfig(c)(scalafixConfigSettings(c))) ++ scalafixIgnoredSetting +} diff --git a/project/ScalafixIgnoreFilePlugin.scala b/project/ScalafixIgnoreFilePlugin.scala new file mode 100644 index 0000000000..a05362f4f4 --- /dev/null +++ b/project/ScalafixIgnoreFilePlugin.scala @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2018 Lightbend Inc. + */ +package akka + +import sbt.plugins.JvmPlugin +import sbt.{AutoPlugin, PluginTrigger, Plugins} + +object ScalafixIgnoreFilePlugin extends AutoPlugin with ScalafixIgnoreFileSupport { + override def trigger: PluginTrigger = allRequirements + + override def requires: Plugins = JvmPlugin + import sbt._ + lazy val scalafixIgnoredSetting: Seq[Setting[_]] = Seq( + ignore(Test) + ) + + override def projectSettings: Seq[Def.Setting[_]] = scalafixIgnoredSetting +} diff --git a/project/ScalafixIgnoreFileSupport.scala b/project/ScalafixIgnoreFileSupport.scala new file mode 100644 index 0000000000..b4263dd2ac --- /dev/null +++ b/project/ScalafixIgnoreFileSupport.scala @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2018 Lightbend Inc. + */ +package akka + +import com.typesafe.config.ConfigFactory +import sbt.Keys.unmanagedSources +import sbt.{ConfigKey, file} +import sbt.internal.sbtscalafix.Compat + +trait ScalafixIgnoreFileSupport { + import scalafix.sbt.ScalafixPlugin.autoImport._ + protected def ignore(configKey:ConfigKey) = { + lazy val stdoutLogger = Compat.ConsoleLogger(System.out) + + lazy val ignoredFiles:Set[String] = { + import scala.collection.JavaConverters._ + val config = ConfigFactory.parseFile(file(".scalafix.conf")) + stdoutLogger.info("ignored-files from .scalaifx.config:" + config.origin().filename()) + config + .getStringList("ignored-files") + .asScala + .toSet + } + unmanagedSources.in(configKey, scalafix) := + unmanagedSources.in(configKey, scalafix).value + .filterNot(file => { + val ignored = ignoredFiles(file.getName) + if (ignored){ + stdoutLogger.info("scalafix ignored file:"+file.toURI) + } + ignored + }) + } +} diff --git a/project/plugins.sbt b/project/plugins.sbt index 90fa258346..f43e47d2d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,6 +9,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0") //#sbt-multi-jvm addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.1") addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.3.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")