From 2c2b8ba001068dd81b02167159da214202ead237 Mon Sep 17 00:00:00 2001 From: Jimin Hsieh Date: Fri, 16 Mar 2018 19:08:29 +0800 Subject: [PATCH] Remove some of `Unused import` warning (#24650) --- .../scala/akka/actor/CoordinatedShutdownSpec.scala | 4 ---- .../src/test/scala/akka/actor/TypedActorSpec.scala | 2 +- .../scala/akka/actor/dungeon/DispatchSpec.scala | 2 -- .../src/test/scala/akka/io/TcpConnectionSpec.scala | 4 ++-- .../src/test/scala/akka/pattern/AskSpec.scala | 1 - .../test/scala/akka/pattern/PromiseRefSpec.scala | 1 - .../akka/pattern/extended/ExplicitAskSpec.scala | 1 - .../serialization/SerializationSetupSpec.scala | 2 +- akka-actor/src/main/scala/akka/AkkaVersion.scala | 2 -- .../src/main/scala/akka/actor/AbstractActor.scala | 3 +-- .../src/main/scala/akka/actor/AbstractFSM.scala | 1 - .../src/main/scala/akka/actor/AbstractProps.scala | 1 - .../src/main/scala/akka/actor/ActorCell.scala | 2 -- .../src/main/scala/akka/actor/ActorRef.scala | 2 +- .../src/main/scala/akka/actor/Deployer.scala | 1 - akka-actor/src/main/scala/akka/actor/Props.scala | 1 - akka-actor/src/main/scala/akka/actor/Timers.scala | 1 - .../main/scala/akka/actor/dungeon/Dispatch.scala | 1 - .../src/main/scala/akka/dispatch/Future.scala | 1 - .../akka/dispatch/affinity/AffinityPool.scala | 2 +- .../src/main/scala/akka/event/EventStream.scala | 2 -- .../src/main/scala/akka/event/LoggerMailbox.scala | 1 - akka-actor/src/main/scala/akka/event/Logging.scala | 2 +- .../src/main/scala/akka/util/ByteString.scala | 2 +- .../src/test/scala/akka/agent/AgentSpec.scala | 2 +- .../src/main/scala/akka/actor/ActorBenchmark.scala | 2 -- .../akka/actor/DirectByteBufferPoolBenchmark.scala | 7 ------- .../akka/remote/artery/SendQueueBenchmark.scala | 6 ------ .../scala/akka/stream/EmptySourceBenchmark.scala | 1 - .../scala/akka/stream/FusedGraphsBenchmark.scala | 1 - .../scala/akka/stream/PartitionHubBenchmark.scala | 4 ---- .../scala/akka/stream/SourceRefBenchmark.scala | 2 -- .../akka/stream/io/FileSourcesScaleBenchmark.scala | 7 +++---- .../util/ByteString_copyToBuffer_Benchmark.scala | 3 +-- .../util/ByteString_dropSliceTake_Benchmark.scala | 1 - .../src/main/scala/akka/camel/Consumer.scala | 2 -- .../akka/camel/CamelExchangeAdapterTest.scala | 2 -- .../scala/akka/camel/ConsumerIntegrationTest.scala | 1 - .../test/scala/akka/camel/DefaultCamelTest.scala | 2 +- .../internal/component/ActorProducerTest.scala | 4 ++-- .../cluster/metrics/ClusterMetricsCollector.scala | 1 - .../main/scala/akka/cluster/sharding/Shard.scala | 5 +---- .../AllAtOnceEntityRecoveryStrategySpec.scala | 3 --- .../ConstantRateEntityRecoveryStrategySpec.scala | 8 -------- .../singleton/ClusterSingletonRestart2Spec.scala | 1 - .../singleton/ClusterSingletonRestartSpec.scala | 1 - .../main/scala/akka/cluster/ClusterDaemon.scala | 4 +--- .../main/scala/akka/cluster/ClusterHeartbeat.scala | 2 +- .../akka/cluster/CrossDcClusterHeartbeat.scala | 5 ++--- .../main/scala/akka/cluster/DowningProvider.scala | 3 +-- .../src/main/scala/akka/cluster/Gossip.scala | 2 +- .../test/scala/akka/cluster/ClusterTestKit.scala | 4 +--- .../akka/cluster/JoinConfigCompatCheckerSpec.scala | 6 +----- .../akka/contrib/pattern/ReliableProxySpec.scala | 1 - .../circuitbreaker/CircuitBreakerProxySpec.scala | 3 +-- .../src/main/scala/akka/cluster/ddata/ORMap.scala | 2 +- .../src/main/scala/akka/cluster/ddata/ORSet.scala | 2 -- .../ddata/protobuf/ReplicatedDataSerializer.scala | 3 --- .../protobuf/ReplicatorMessageSerializerSpec.scala | 1 - .../scala/akka/remote/testconductor/Player.scala | 2 -- .../akka/osgi/BundleDelegatingClassLoader.scala | 1 - .../src/main/scala/akka/remote/Endpoint.scala | 2 +- .../akka/remote/PhiAccrualFailureDetector.scala | 1 - .../scala/akka/remote/RemoteActorRefProvider.scala | 2 -- .../src/main/scala/akka/remote/RemoteDaemon.scala | 4 +--- .../src/main/scala/akka/remote/RemoteWatcher.scala | 1 - .../src/main/scala/akka/remote/artery/Codecs.scala | 2 -- .../main/scala/akka/remote/artery/Control.scala | 1 - .../akka/remote/artery/FixedSizePartitionHub.scala | 2 -- .../akka/remote/artery/ImmutableLongMap.scala | 1 - .../scala/akka/remote/artery/InboundEnvelope.scala | 1 - .../akka/remote/artery/MessageDispatcher.scala | 4 +--- .../main/scala/akka/remote/artery/SendQueue.scala | 7 ------- .../main/scala/akka/remote/artery/TestStage.scala | 1 - .../scala/akka/remote/artery/aeron/AeronSink.scala | 2 -- .../artery/aeron/ArteryAeronUdpTransport.scala | 2 -- .../remote/artery/compress/TopHeavyHitters.scala | 3 +-- .../remote/artery/tcp/ArteryTcpTransport.scala | 5 ----- .../serialization/DaemonMsgCreateSerializer.scala | 2 +- .../serialization/PrimitiveSerializers.scala | 3 +-- .../transport/ThrottlerTransportAdapter.scala | 1 - .../src/test/scala/akka/remote/DaemonicSpec.scala | 4 +--- .../remote/RemoteDeploymentWhitelistSpec.scala | 3 --- .../remote/artery/BindCanonicalAddressSpec.scala | 1 - .../akka/remote/artery/FlushOnShutdownSpec.scala | 6 ++---- .../akka/remote/artery/HandshakeDenySpec.scala | 3 +-- .../akka/remote/artery/HandshakeFailureSpec.scala | 4 ++-- .../akka/remote/artery/HandshakeRetrySpec.scala | 2 +- .../akka/remote/artery/ImmutableLongMapSpec.scala | 1 - .../scala/akka/remote/artery/LateConnectSpec.scala | 2 -- .../akka/remote/artery/OutboundHandshakeSpec.scala | 4 ---- .../remote/artery/RemoteActorRefProviderSpec.scala | 1 - .../remote/artery/RemoteActorSelectionSpec.scala | 6 ++---- .../akka/remote/artery/RemoteConnectionSpec.scala | 6 ++---- .../akka/remote/artery/RemoteDeathWatchSpec.scala | 2 -- .../akka/remote/artery/RemoteDeploymentSpec.scala | 6 +----- .../RemoteInstrumentsSerializationSpec.scala | 2 +- .../artery/RemoteMessageSerializationSpec.scala | 7 ++----- .../remote/artery/RemoteSendConsistencySpec.scala | 5 ++--- .../remote/artery/SerializationErrorSpec.scala | 7 ++----- .../remote/artery/SystemMessageDeliverySpec.scala | 2 -- .../scala/akka/remote/artery/UntrustedSpec.scala | 3 --- .../compress/CompressionIntegrationSpec.scala | 5 ----- .../AllowJavaSerializationOffSpec.scala | 2 +- .../PrimitivesSerializationSpec.scala | 2 -- .../SystemMessageSerializationSpec.scala | 3 +-- .../scala/akka/stream/testkit/StreamTestKit.scala | 3 +-- .../scala/akka/stream/tck/FilePublisherTest.scala | 1 - akka-stream/src/main/scala/akka/stream/Graph.scala | 2 +- .../src/main/scala/akka/stream/Materializer.scala | 2 -- .../src/main/scala/akka/stream/StreamRefs.scala | 2 +- .../src/main/scala/akka/stream/extra/Timed.scala | 1 - .../scala/akka/stream/impl/ActorRefSinkActor.scala | 1 - .../akka/stream/impl/CompletedPublishers.scala | 2 -- .../src/main/scala/akka/stream/impl/Messages.scala | 1 - .../src/main/scala/akka/stream/impl/Modules.scala | 3 --- .../main/scala/akka/stream/impl/QueueSource.scala | 1 - .../src/main/scala/akka/stream/impl/Sinks.scala | 14 ++++---------- .../akka/stream/impl/fusing/GraphInterpreter.scala | 1 - .../akka/stream/impl/fusing/GraphStages.scala | 3 +-- .../main/scala/akka/stream/impl/fusing/Ops.scala | 11 ++++------- .../akka/stream/impl/fusing/StreamOfStreams.scala | 4 +--- .../main/scala/akka/stream/impl/io/TlsModule.scala | 2 +- .../impl/io/compression/CompressionUtils.scala | 4 ++-- .../akka/stream/impl/streamref/SinkRefImpl.scala | 3 +-- .../akka/stream/impl/streamref/SourceRefImpl.scala | 1 - .../stream/impl/streamref/StreamRefsMaster.scala | 5 +---- .../main/scala/akka/stream/javadsl/FileIO.scala | 2 +- .../src/main/scala/akka/stream/javadsl/Queue.scala | 2 -- .../main/scala/akka/stream/javadsl/Restart.scala | 1 - .../main/scala/akka/stream/javadsl/Source.scala | 5 +---- .../main/scala/akka/stream/javadsl/SubSource.scala | 2 -- .../main/scala/akka/stream/scaladsl/FileIO.scala | 2 +- .../src/main/scala/akka/stream/scaladsl/Hub.scala | 2 +- .../akka/stream/scaladsl/Materialization.scala | 2 -- .../main/scala/akka/stream/scaladsl/Queue.scala | 4 ---- .../scala/akka/stream/scaladsl/StreamRefs.scala | 2 +- .../stream/serialization/StreamRefSerializer.scala | 5 +---- .../main/scala/akka/stream/stage/GraphStage.scala | 1 - .../scala/akka/stream/stage/StageLogging.scala | 2 +- .../testkit/typed/internal/ActorSystemStub.scala | 2 +- .../testkit/typed/internal/TestProbeImpl.scala | 2 +- .../akka/testkit/typed/javadsl/ActorTestKit.scala | 2 -- .../akka/testkit/typed/scaladsl/package.scala | 6 +----- .../testkit/typed/scaladsl/TestProbeSpec.scala | 1 - .../src/main/scala/akka/testkit/SocketUtil.scala | 2 -- .../scala/akka/testkit/TestEventListener.scala | 3 +-- .../src/main/scala/akka/testkit/TestKit.scala | 2 +- .../scala/akka/testkit/TestMessageSerializer.scala | 3 --- .../scala/akka/testkit/metrics/MetricsKit.scala | 1 - 150 files changed, 85 insertions(+), 323 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala index 901eedc718..3554b006cc 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala @@ -164,7 +164,6 @@ class CoordinatedShutdownSpec extends AkkaSpec(ConfigFactory.parseString( } "run from a given phase" in { - import system.dispatcher val phases = Map( "a" → emptyPhase, "b" → phase("a"), @@ -188,7 +187,6 @@ class CoordinatedShutdownSpec extends AkkaSpec(ConfigFactory.parseString( } "only run once" in { - import system.dispatcher val phases = Map("a" → emptyPhase) val co = new CoordinatedShutdown(extSys, phases) co.addTask("a", "a1") { () ⇒ @@ -244,7 +242,6 @@ class CoordinatedShutdownSpec extends AkkaSpec(ConfigFactory.parseString( } "abort if recover=off" in { - import system.dispatcher val phases = Map( "a" → emptyPhase, "b" → Phase(dependsOn = Set("a"), timeout = 100.millis, recover = false, enabled = true), @@ -288,7 +285,6 @@ class CoordinatedShutdownSpec extends AkkaSpec(ConfigFactory.parseString( } "be possible to add tasks in later phase from task in earlier phase" in { - import system.dispatcher val phases = Map( "a" → emptyPhase, "b" → phase("a")) diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala index 816f976ad5..eca94dc452 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala @@ -19,7 +19,7 @@ import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.{ Await, Future } import scala.language.postfixOps object TypedActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala index 3ae98cac3e..f094e2dd01 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala @@ -4,8 +4,6 @@ package akka.actor.dungeon -import java.io.NotSerializableException - import akka.actor.Actor import akka.actor.Props diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala index f4a2afd629..22d7ab6a1e 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala @@ -4,8 +4,8 @@ package akka.io -import java.io.{ File, IOException } -import java.net.{ InetSocketAddress, ServerSocket, URLClassLoader } +import java.io.IOException +import java.net.{ InetSocketAddress, ServerSocket } import java.nio.ByteBuffer import java.nio.channels._ import java.nio.channels.spi.SelectorProvider diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala index cb23f9dba9..22c5a170fb 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala @@ -7,7 +7,6 @@ package akka.pattern import akka.actor._ import akka.testkit.{ TestProbe, AkkaSpec } import akka.util.Timeout -import org.scalatest.concurrent.ScalaFutures import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala index 672e4c34bb..9c281e1ee8 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala @@ -6,7 +6,6 @@ package akka.pattern import akka.actor._ import akka.testkit.{ AkkaSpec, TestProbe, ImplicitSender } -import org.scalatest.concurrent.ScalaFutures import scala.concurrent.Promise import scala.concurrent.duration._ diff --git a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala index 6b392c6be8..66d1b751ff 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala @@ -7,7 +7,6 @@ package akka.pattern.extended import akka.actor._ import akka.testkit.AkkaSpec import akka.util.Timeout -import org.scalatest.concurrent.ScalaFutures import scala.concurrent.duration._ object ExplicitAskSpec { diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala index 1cd109bd20..5f7628fc3e 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala @@ -10,7 +10,7 @@ import java.util.{ BitSet ⇒ ProgrammaticJavaDummy } import java.util.{ Date ⇒ SerializableDummy } import akka.actor.setup.ActorSystemSetup -import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem, Terminated } +import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem } import akka.testkit.{ AkkaSpec, TestKit, TestProbe } import com.typesafe.config.ConfigFactory diff --git a/akka-actor/src/main/scala/akka/AkkaVersion.scala b/akka-actor/src/main/scala/akka/AkkaVersion.scala index 9689dd064f..ecf46e5ffa 100644 --- a/akka-actor/src/main/scala/akka/AkkaVersion.scala +++ b/akka-actor/src/main/scala/akka/AkkaVersion.scala @@ -6,8 +6,6 @@ package akka import akka.annotation.InternalApi -import scala.annotation.varargs - final class UnsupportedAkkaVersion private[akka] (msg: String) extends RuntimeException(msg) object AkkaVersion { diff --git a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala b/akka-actor/src/main/scala/akka/actor/AbstractActor.scala index 693be3ec24..b56776d5ee 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractActor.scala @@ -4,9 +4,8 @@ package akka.actor -import akka.annotation.{ ApiMayChange, DoNotInherit } +import akka.annotation.DoNotInherit import akka.japi.pf.ReceiveBuilder -import akka.japi.pf.UnitPFBuilder import scala.runtime.BoxedUnit import java.util.Optional diff --git a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala b/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala index 0a81b737cc..de8a06bf45 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala @@ -5,7 +5,6 @@ package akka.actor import akka.util.JavaDurationConverters - import scala.concurrent.duration.FiniteDuration /** diff --git a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala index 3e8a31ebfa..e1cc2d1485 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala @@ -8,7 +8,6 @@ import java.lang.reflect.{ Modifier, ParameterizedType, TypeVariable } import akka.japi.Creator import akka.util.Reflect import scala.annotation.varargs -import scala.language.existentials import scala.annotation.tailrec import java.lang.reflect.Constructor diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index 75676fab12..6173a4878a 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -20,8 +20,6 @@ import java.util.concurrent.ThreadLocalRandom import scala.util.control.NonFatal import akka.dispatch.MessageDispatcher import akka.util.Reflect -import akka.japi.pf.ReceiveBuilder -import akka.actor.AbstractActor.Receive import akka.annotation.InternalApi /** diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index c9ed9a35ae..035faa3c6b 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -10,7 +10,7 @@ import akka.dispatch.sysmsg._ import java.lang.{ IllegalStateException, UnsupportedOperationException } import akka.serialization.{ JavaSerializer, Serialization } -import akka.event.{ EventStream, Logging, LoggingAdapter, MarkerLoggingAdapter } +import akka.event.{ EventStream, Logging, MarkerLoggingAdapter } import scala.annotation.tailrec import java.util.concurrent.ConcurrentHashMap diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala index c6a13adc71..c90bc84895 100644 --- a/akka-actor/src/main/scala/akka/actor/Deployer.scala +++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala @@ -6,7 +6,6 @@ package akka.actor import java.util.concurrent.atomic.AtomicReference -import akka.annotation.InternalApi import akka.routing._ import akka.util.WildcardIndex import com.typesafe.config._ diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala index b7a6568b91..2dbe5c404d 100644 --- a/akka-actor/src/main/scala/akka/actor/Props.scala +++ b/akka-actor/src/main/scala/akka/actor/Props.scala @@ -9,7 +9,6 @@ import akka.dispatch._ import akka.routing._ import scala.collection.immutable -import scala.language.existentials import scala.reflect.ClassTag /** diff --git a/akka-actor/src/main/scala/akka/actor/Timers.scala b/akka-actor/src/main/scala/akka/actor/Timers.scala index ac6acaf21c..7e93282820 100644 --- a/akka-actor/src/main/scala/akka/actor/Timers.scala +++ b/akka-actor/src/main/scala/akka/actor/Timers.scala @@ -6,7 +6,6 @@ package akka.actor import scala.concurrent.duration.FiniteDuration import akka.annotation.DoNotInherit -import akka.dispatch.Envelope import akka.util.OptionVal /** diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala index c06054849d..6b4b823721 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala @@ -5,7 +5,6 @@ package akka.actor.dungeon import scala.annotation.tailrec -import scala.util.{ Failure, Success, Try } import akka.AkkaException import akka.dispatch.{ Envelope, Mailbox } diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 0be82890e9..ed7936b60a 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -13,7 +13,6 @@ import java.util.concurrent.{ Executor, ExecutorService, Callable } import scala.util.{ Try, Success, Failure } import java.util.concurrent.CompletionStage import java.util.concurrent.CompletableFuture -import scala.collection.immutable import akka.compat /** diff --git a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala index 34041d7ea2..2d6b22063b 100644 --- a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala +++ b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala @@ -9,7 +9,7 @@ import java.lang.invoke.MethodType.methodType import java.util.Collections import java.util.concurrent.TimeUnit.MICROSECONDS import java.util.concurrent._ -import java.util.concurrent.atomic.{ AtomicInteger, AtomicReference } +import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.locks.LockSupport import java.lang.Integer.reverseBytes diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/akka/event/EventStream.scala index 6e2302ff7f..9d11558b67 100644 --- a/akka-actor/src/main/scala/akka/event/EventStream.scala +++ b/akka-actor/src/main/scala/akka/event/EventStream.scala @@ -4,8 +4,6 @@ package akka.event -import language.implicitConversions - import akka.actor.{ ActorRef, ActorSystem } import akka.event.Logging.simpleName import akka.util.Subclassification diff --git a/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala b/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala index 631240ace8..67641d316d 100644 --- a/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala +++ b/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala @@ -11,7 +11,6 @@ import com.typesafe.config.Config import akka.actor.ActorSystem import akka.actor.ActorRef import akka.dispatch.ProducesMessageQueue -import akka.event.Logging.Debug import akka.event.Logging.LogEvent trait LoggerMessageQueueSemantics diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala index ea73eee97c..5e3a4649b1 100644 --- a/akka-actor/src/main/scala/akka/event/Logging.scala +++ b/akka-actor/src/main/scala/akka/event/Logging.scala @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger import akka.actor.ActorSystem.Settings import akka.actor._ -import akka.annotation.{ DoNotInherit, InternalApi } +import akka.annotation.DoNotInherit import akka.dispatch.RequiresMessageQueue import akka.event.Logging._ import akka.util.ReentrantGuard diff --git a/akka-actor/src/main/scala/akka/util/ByteString.scala b/akka-actor/src/main/scala/akka/util/ByteString.scala index fb00bdf9cc..104be290b2 100644 --- a/akka-actor/src/main/scala/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala/akka/util/ByteString.scala @@ -12,7 +12,7 @@ import scala.annotation.{ tailrec, varargs } import scala.collection.IndexedSeqOptimized import scala.collection.mutable.{ Builder, WrappedArray } import scala.collection.immutable -import scala.collection.immutable.{ IndexedSeq, VectorBuilder, VectorIterator } +import scala.collection.immutable.{ IndexedSeq, VectorBuilder } import scala.collection.generic.CanBuildFrom import scala.reflect.ClassTag import java.nio.charset.{ Charset, StandardCharsets } diff --git a/akka-agent/src/test/scala/akka/agent/AgentSpec.scala b/akka-agent/src/test/scala/akka/agent/AgentSpec.scala index 7825f9b661..a847a9da57 100644 --- a/akka-agent/src/test/scala/akka/agent/AgentSpec.scala +++ b/akka-agent/src/test/scala/akka/agent/AgentSpec.scala @@ -12,7 +12,7 @@ import scala.util.control.NonFatal import akka.util.Timeout import akka.testkit._ import scala.concurrent.stm._ -import java.util.concurrent.{ CountDownLatch, TimeUnit } +import java.util.concurrent.{ CountDownLatch } class CountDownFunction[A](num: Int = 1) extends Function1[A, A] { val latch = new CountDownLatch(num) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala index 5ce85efa65..f3543d0f68 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala @@ -4,12 +4,10 @@ package akka.actor -import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ import java.util.concurrent.TimeUnit import scala.concurrent.Await -import scala.annotation.tailrec import BenchmarkActors._ import scala.concurrent.duration._ diff --git a/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala index d34be295dc..6befd6db7c 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala @@ -8,20 +8,13 @@ import java.nio.ByteBuffer import java.util.Random import java.util.concurrent.TimeUnit -import akka.dispatch.forkjoin.ThreadLocalRandom import akka.io.DirectByteBufferPool -import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import scala.concurrent.Await -import scala.concurrent.duration._ - @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.NANOSECONDS) class DirectByteBufferPoolBenchmark { - import DirectByteBufferPoolBenchmark._ private val MAX_LIVE_BUFFERS = 8192 diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala index 3ebad86d91..003927158f 100644 --- a/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala @@ -5,20 +5,14 @@ package akka.remote.artery import java.util.concurrent.TimeUnit -import akka.NotUsed import akka.actor.ActorSystem import akka.stream.scaladsl._ import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import scala.concurrent.Lock -import scala.util.Success -import akka.stream.impl.fusing.GraphStages -import org.reactivestreams._ import scala.concurrent.Await import scala.concurrent.duration._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings -import java.util.concurrent.Semaphore import akka.stream.OverflowStrategy import java.util.concurrent.CyclicBarrier import java.util.concurrent.CountDownLatch diff --git a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala index e5dcfc6598..16d84d7db1 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala @@ -8,7 +8,6 @@ import java.util.concurrent.TimeUnit import akka.actor.ActorSystem import akka.stream.scaladsl._ -import akka.{ Done, NotUsed } import org.openjdk.jmh.annotations._ import scala.concurrent._ diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala index dbec03dd7c..da41a917f8 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala @@ -8,7 +8,6 @@ import java.util.concurrent.{ CountDownLatch, TimeUnit } import akka.NotUsed import akka.actor.ActorSystem -import akka.stream.impl.fusing.GraphStages import akka.stream.scaladsl._ import akka.stream.stage._ import org.openjdk.jmh.annotations.{ OperationsPerInvocation, _ } diff --git a/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala index 489c980189..6c3bf1e93c 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala @@ -10,10 +10,6 @@ import akka.actor.ActorSystem import akka.stream.scaladsl._ import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import java.util.concurrent.Semaphore -import scala.util.Success -import akka.stream.impl.fusing.GraphStages -import org.reactivestreams._ import scala.concurrent.Await import scala.concurrent.duration._ import akka.remote.artery.BenchTestSource diff --git a/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala index aacf2a0acf..5f53c44f39 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala @@ -6,9 +6,7 @@ package akka.stream import java.util.concurrent.{ Semaphore, TimeUnit } -import akka.NotUsed import akka.actor.ActorSystem -import akka.stream.impl.fusing.GraphStages import akka.stream.scaladsl._ import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ diff --git a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala index f78052b75d..8d19845ecb 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala @@ -9,13 +9,12 @@ import java.util.concurrent.TimeUnit import akka.actor.ActorSystem import akka.stream.scaladsl._ -import akka.stream.{ ActorMaterializer, Attributes, IOResult } +import akka.stream.{ ActorMaterializer, IOResult } import akka.util.ByteString -import akka.{ Done, NotUsed } -import org.openjdk.jmh.annotations.{ BenchmarkMode, OutputTimeUnit, Scope, State, _ } +import org.openjdk.jmh.annotations.{ BenchmarkMode, Scope, State, _ } import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.{ Await, Future } @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.AverageTime)) diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala index 5cafdd110e..c8e0574b1b 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala @@ -7,9 +7,8 @@ package akka.util import java.nio.ByteBuffer import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1, ByteString1C, ByteStrings } +import akka.util.ByteString.{ ByteString1C, ByteStrings } import org.openjdk.jmh.annotations._ -import org.openjdk.jmh.infra.Blackhole @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala index f4608f9a92..338a5ce216 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala @@ -4,7 +4,6 @@ package akka.util -import java.nio.ByteBuffer import java.util.concurrent.TimeUnit import akka.util.ByteString.{ ByteString1C, ByteStrings } diff --git a/akka-camel/src/main/scala/akka/camel/Consumer.scala b/akka-camel/src/main/scala/akka/camel/Consumer.scala index 301f5996c4..67a700f71b 100644 --- a/akka-camel/src/main/scala/akka/camel/Consumer.scala +++ b/akka-camel/src/main/scala/akka/camel/Consumer.scala @@ -10,8 +10,6 @@ import akka.actor._ import scala.concurrent.duration._ import akka.dispatch.Mapper -import scala.language.existentials - /** * Mixed in by Actor implementations that consume message from Camel endpoints. */ diff --git a/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala b/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala index c095d9c3ef..2e46060668 100644 --- a/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala +++ b/akka-camel/src/test/scala/akka/camel/CamelExchangeAdapterTest.scala @@ -10,8 +10,6 @@ import org.apache.camel.impl.DefaultExchange import org.apache.camel.{ Exchange, ExchangePattern } import org.scalatest.FunSuite -import scala.language.implicitConversions - class CamelExchangeAdapterTest extends FunSuite with SharedCamelSystem { test("mustSetInMessageFromRequestMessage") { diff --git a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala index 5e9aeeb070..dacf57dc33 100644 --- a/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala +++ b/akka-camel/src/test/scala/akka/camel/ConsumerIntegrationTest.scala @@ -5,7 +5,6 @@ package akka.camel import language.postfixOps -import language.existentials import akka.actor._ import org.scalatest.Matchers diff --git a/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala b/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala index 06de4bbbf2..78423159d9 100644 --- a/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala +++ b/akka-camel/src/test/scala/akka/camel/DefaultCamelTest.scala @@ -10,7 +10,7 @@ import org.scalatest.Matchers import org.scalatest.mock.MockitoSugar import org.apache.camel.ProducerTemplate import org.scalatest.WordSpec -import akka.event.{ LoggingAdapter, MarkerLoggingAdapter } +import akka.event.MarkerLoggingAdapter import akka.actor.ActorSystem.Settings import com.typesafe.config.ConfigFactory import org.apache.camel.impl.DefaultCamelContext diff --git a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala index dc2c3272e3..b45698e028 100644 --- a/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala +++ b/akka-camel/src/test/scala/akka/camel/internal/component/ActorProducerTest.scala @@ -18,12 +18,12 @@ import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach, Suite, WordSpecLik import akka.camel.TestSupport._ import java.util.concurrent.{ CountDownLatch, TimeoutException } -import org.mockito.{ ArgumentMatcher, ArgumentMatchers, Mockito, Matchers ⇒ MMatchers } +import org.mockito.{ ArgumentMatcher, ArgumentMatchers, Mockito } import org.scalatest.Matchers import akka.actor.Status.Failure import com.typesafe.config.ConfigFactory import akka.actor.ActorSystem.Settings -import akka.event.{ LoggingAdapter, MarkerLoggingAdapter } +import akka.event.MarkerLoggingAdapter import akka.testkit.{ TestKit, TestLatch, TestProbe, TimingTest } import org.apache.camel.impl.DefaultCamelContext diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala index d6d3a68e7c..1bcf145213 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala @@ -8,7 +8,6 @@ import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.Props import akka.actor.Address -import akka.cluster.InternalClusterAction import akka.cluster.ClusterEvent import akka.cluster.Member import akka.cluster.Cluster diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala index 3b63877063..71b2cf263a 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala @@ -23,7 +23,6 @@ import akka.cluster.ddata.ORSet import akka.cluster.ddata.ORSetKey import akka.cluster.ddata.Replicator._ import akka.actor.Stash -import akka.cluster.ddata.DistributedData import akka.persistence.PersistentActor import akka.persistence.SnapshotOffer import akka.persistence.SaveSnapshotSuccess @@ -370,7 +369,6 @@ private[akka] class RememberEntityStarter( requestor: ActorRef) extends Actor with ActorLogging { import context.dispatcher - import scala.concurrent.duration._ import RememberEntityStarter.Tick var waitingForAck = ids @@ -487,7 +485,6 @@ private[akka] class PersistentShard( typeName, shardId, entityProps, settings, extractEntityId, extractShardId, handOffStopMessage) with RememberingShard with PersistentActor with ActorLogging { - import ShardRegion.{ EntityId, Msg } import Shard._ import settings.tuningParameters._ @@ -583,7 +580,7 @@ private[akka] class DDataShard( typeName, shardId, entityProps, settings, extractEntityId, extractShardId, handOffStopMessage) with RememberingShard with Stash with ActorLogging { - import ShardRegion.{ EntityId, Msg } + import ShardRegion.EntityId import Shard._ import settings.tuningParameters._ diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/AllAtOnceEntityRecoveryStrategySpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/AllAtOnceEntityRecoveryStrategySpec.scala index 6e6a50023b..58eaae229b 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/AllAtOnceEntityRecoveryStrategySpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/AllAtOnceEntityRecoveryStrategySpec.scala @@ -4,9 +4,6 @@ package akka.cluster.sharding -import scala.concurrent.duration._ -import scala.language.postfixOps - import akka.cluster.sharding.ShardRegion.EntityId import akka.testkit.AkkaSpec diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala index 582699b4d2..b688339e93 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala @@ -4,18 +4,10 @@ package akka.cluster.sharding -import akka.cluster.sharding.ShardRegion.EntityId import akka.testkit.AkkaSpec -import scala.concurrent.{ Await, Future } -import scala.concurrent.duration._ -import akka.testkit.TimingTest - -import scala.concurrent.duration.Duration.DurationIsOrdered - class ConstantRateEntityRecoveryStrategySpec extends AkkaSpec { - import system.dispatcher /* val strategy = EntityRecoveryStrategy.constantStrategy(system, 1.second, 2) "ConstantRateEntityRecoveryStrategy" must { diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala index aaac79f58e..2c2dc3ba3b 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala @@ -13,7 +13,6 @@ import akka.actor.Props import akka.cluster.Cluster import akka.cluster.MemberStatus import akka.cluster.UniqueAddress -import akka.remote.RARP import akka.testkit.AkkaSpec import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala index 8260ee6e2e..bd3caee73e 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala @@ -9,7 +9,6 @@ import akka.actor.ActorSystem import akka.actor.PoisonPill import akka.cluster.Cluster import akka.cluster.MemberStatus -import akka.remote.RARP import akka.testkit.AkkaSpec import akka.testkit.TestActors import akka.testkit.TestProbe diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala index d971fc0080..209d6c335f 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala @@ -12,18 +12,16 @@ import akka.cluster.ClusterEvent._ import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.Done import akka.actor.CoordinatedShutdown.Reason -import akka.cluster.ClusterUserAction.JoinTo import akka.pattern.ask import akka.remote.QuarantinedEvent import akka.util.Timeout -import com.typesafe.config.{ Config, ConfigFactory } +import com.typesafe.config.Config import scala.collection.immutable import scala.concurrent.duration._ import scala.concurrent.Future import scala.concurrent.Promise import scala.util.control.NonFatal -import language.existentials /** * Base trait for all cluster messages. All ClusterMessage's are serializable. diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala index b4884ad325..5db9a361e6 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala @@ -6,7 +6,7 @@ package akka.cluster import scala.annotation.tailrec import scala.collection.immutable -import akka.actor.{ Actor, ActorLogging, ActorPath, ActorRef, ActorSelection, Address, DeadLetterSuppression, RootActorPath } +import akka.actor.{ Actor, ActorLogging, ActorPath, ActorSelection, Address, DeadLetterSuppression, RootActorPath } import akka.cluster.ClusterEvent._ import akka.remote.FailureDetectorRegistry import akka.remote.HeartbeatMessage diff --git a/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala index 5a0ec07525..0633b2ce43 100644 --- a/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala +++ b/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala @@ -4,15 +4,14 @@ package akka.cluster -import akka.actor.{ Actor, ActorLogging, ActorSelection, Address, NoSerializationVerificationNeeded, RootActorPath } +import akka.actor.{ Actor, ActorLogging, ActorSelection, Address, NoSerializationVerificationNeeded } import akka.annotation.InternalApi import akka.cluster.ClusterEvent._ import akka.cluster.ClusterSettings.DataCenter -import akka.event.Logging import akka.remote.FailureDetectorRegistry import akka.util.ConstantFun -import scala.collection.{ SortedSet, immutable, breakOut } +import scala.collection.{ SortedSet, breakOut } /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala b/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala index ef88e9f862..813587dd73 100644 --- a/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala +++ b/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala @@ -6,9 +6,8 @@ package akka.cluster import akka.ConfigurationException import akka.actor.{ ActorSystem, ExtendedActorSystem, Props } -import com.typesafe.config.Config -import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.concurrent.duration.FiniteDuration /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala index 43cbecee3e..dbff02efd4 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala @@ -4,7 +4,7 @@ package akka.cluster -import scala.collection.{ SortedSet, immutable } +import scala.collection.immutable import ClusterSettings.DataCenter import MemberStatus._ import akka.annotation.InternalApi diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala index e7aef742df..3cc55fbe8b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala @@ -4,13 +4,11 @@ package akka.cluster -import akka.actor.{ ActorSystem, Address } +import akka.actor.ActorSystem import akka.cluster.MemberStatus.Removed import akka.testkit.TestKitBase import com.typesafe.config.{ Config, ConfigFactory } -import scala.collection.{ immutable ⇒ im } - /** * Builds on TestKitBase to provide some extra utilities to run cluster test. * diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala index ba0f6e8cd4..2de740a641 100644 --- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala @@ -4,15 +4,11 @@ package akka.cluster -import akka.actor.{ ActorSystem, Address } -import akka.cluster.InternalClusterAction.LeaderActionsTick -import akka.cluster.MemberStatus.{ Removed, Up } +import akka.cluster.MemberStatus.Up import akka.testkit.{ AkkaSpec, LongRunningTest } import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.{ Matchers, WordSpec } import scala.concurrent.duration._ -import scala.collection.JavaConverters._ import scala.collection.{ immutable ⇒ im } object JoinConfigCompatCheckerSpec { diff --git a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala index 95c4ba11d8..1d1a2d8555 100644 --- a/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala +++ b/akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala @@ -19,7 +19,6 @@ import akka.actor.ActorRef import akka.testkit.TestKitExtension import akka.actor.ActorIdentity import akka.actor.Identify -import com.typesafe.config.ConfigValueFactory object ReliableProxySpec extends MultiNodeConfig { val local = role("local") diff --git a/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala b/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala index 957651af99..ebe20fe21a 100644 --- a/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala +++ b/akka-contrib/src/test/scala/akka/contrib/circuitbreaker/CircuitBreakerProxySpec.scala @@ -8,8 +8,7 @@ import akka.actor.{ ActorRef, PoisonPill } import akka.contrib.circuitbreaker.CircuitBreakerProxy._ import akka.testkit.{ AkkaSpec, TestProbe } import akka.util.Timeout -import org.scalatest.time.{ Millis, Second, Span } -import org.scalatest.{ GivenWhenThen, Matchers } +import org.scalatest.GivenWhenThen import scala.concurrent.duration._ import scala.language.postfixOps diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala index c469ba9ebc..2b1662ef5a 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala @@ -8,7 +8,7 @@ import akka.cluster.Cluster import akka.cluster.UniqueAddress import akka.util.HashCode import akka.annotation.InternalApi -import akka.cluster.ddata.ORMap.{ AtomicDeltaOp, ZeroTag } +import akka.cluster.ddata.ORMap.ZeroTag import scala.collection.immutable diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala index 0c0c7aa3e9..39f92c6773 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala @@ -285,8 +285,6 @@ final class ORSet[A] private[akka] ( extends DeltaReplicatedData with ReplicatedDataSerialization with RemovedNodePruning with FastMerge { - import ORSet.{ AddDeltaOp, RemoveDeltaOp } - type T = ORSet[A] type D = ORSet.DeltaOp diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala index 5c64cf7a17..d89df7d4dc 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala @@ -23,12 +23,9 @@ import akka.serialization.BaseSerializer import akka.protobuf.{ ByteString, GeneratedMessage } import akka.util.ByteString.UTF_8 -import scala.collection.immutable.TreeMap -import akka.cluster.UniqueAddress import java.io.NotSerializableException import akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage -import akka.cluster.ddata.ORSet.DeltaOp private object ReplicatedDataSerializer { /* diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala index d1e812292d..d877bcf346 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala @@ -14,7 +14,6 @@ import akka.actor.ExtendedActorSystem import akka.actor.Props import akka.cluster.ddata.GSet import akka.cluster.ddata.GSetKey -import akka.cluster.ddata.PruningState import akka.cluster.ddata.PruningState.PruningInitialized import akka.cluster.ddata.PruningState.PruningPerformed import akka.cluster.ddata.Replicator._ diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala index c5bbe55a67..1f94de1804 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala @@ -73,8 +73,6 @@ trait Player { this: TestConductorExt ⇒ * set in [[akka.remote.testconductor.Conductor]]`.startController()`. */ def startClient(name: RoleName, controllerAddr: InetSocketAddress): Future[Done] = { - import ClientFSM._ - import akka.actor.FSM._ import Settings.BarrierTimeout if (_client ne null) throw new IllegalStateException("TestConductorClient already started") diff --git a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala b/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala index 09bd299cbd..737389760a 100644 --- a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala +++ b/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala @@ -4,7 +4,6 @@ package akka.osgi -import language.existentials import java.net.URL import java.util.Enumeration import org.osgi.framework.{ BundleContext, Bundle } diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala index d303be3e0c..002873606c 100644 --- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala +++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala @@ -9,7 +9,7 @@ import akka.actor.SupervisorStrategy._ import akka.actor.Terminated import akka.actor._ import akka.dispatch.sysmsg.SystemMessage -import akka.event.{ LogMarker, Logging, LoggingAdapter, MarkerLoggingAdapter } +import akka.event.{ LogMarker, Logging, MarkerLoggingAdapter } import akka.pattern.pipe import akka.remote.EndpointManager.{ Link, ResendState, Send } import akka.remote.EndpointWriter.{ FlushAndStop, StoppedReading } diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala index cb5fbc293c..94668e8989 100644 --- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala +++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala @@ -5,7 +5,6 @@ package akka.remote import akka.event.Logging.Warning -import akka.event.jul.Logger import akka.remote.FailureDetector.Clock import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala index c472e363f3..8a5c33915e 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala @@ -24,11 +24,9 @@ import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.remote.artery.ArteryTransport import akka.remote.artery.aeron.ArteryAeronUdpTransport import akka.remote.artery.ArterySettings -import akka.remote.artery.ArterySettings.AeronUpd import akka.util.OptionVal import akka.remote.artery.OutboundEnvelope import akka.remote.artery.SystemMessageDelivery.SystemMessageEnvelope -import akka.remote.serialization.ActorRefResolveCache import akka.remote.serialization.ActorRefResolveThreadLocalCache import akka.remote.artery.tcp.ArteryTcpTransport diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala index 8a53f2eb1c..bbb83a5158 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala @@ -4,11 +4,10 @@ package akka.remote -import scala.concurrent.duration._ import scala.annotation.tailrec import scala.util.control.NonFatal import akka.actor.{ Actor, ActorPath, ActorPathExtractor, ActorRef, ActorSystemImpl, AddressTerminated, Deploy, InternalActorRef, Nobody, Props, VirtualPathContainer } -import akka.event.{ AddressTerminatedTopic, LogMarker, LoggingAdapter, MarkerLoggingAdapter } +import akka.event.{ AddressTerminatedTopic, LogMarker, MarkerLoggingAdapter } import akka.dispatch.sysmsg.{ DeathWatchNotification, SystemMessage, Watch } import akka.actor.ActorRefWithCell import akka.actor.ActorRefScope @@ -24,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap import scala.collection.immutable import akka.dispatch.sysmsg.Unwatch -import akka.NotUsed /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala index 39417ca3e4..72d9bb3cf7 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala @@ -4,7 +4,6 @@ package akka.remote -import akka.ConfigurationException import akka.actor._ import akka.dispatch.sysmsg.{ DeathWatchNotification, Watch } import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } diff --git a/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala b/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala index 008be7c0e8..5eeca91f12 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala @@ -22,8 +22,6 @@ import akka.util.{ OptionVal, Unsafe } import scala.concurrent.duration._ import scala.concurrent.{ Future, Promise } import scala.util.control.NonFatal -import akka.util.ByteStringBuilder -import java.nio.ByteOrder import akka.remote.artery.OutboundHandshake.HandshakeReq import akka.serialization.SerializerWithStringManifest diff --git a/akka-remote/src/main/scala/akka/remote/artery/Control.scala b/akka-remote/src/main/scala/akka/remote/artery/Control.scala index f1aa608196..40918bada4 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Control.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Control.scala @@ -168,7 +168,6 @@ private[remote] class OutboundControlJunction( override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = { val logic = new GraphStageLogic(shape) with InHandler with OutHandler with StageLogging with OutboundControlIngress { - import OutboundControlJunction._ val sendControlMessageCallback = getAsyncCallback[ControlMessage](internalSendControlMessage) private val maxControlMessageBufferSize: Int = outboundContext.settings.Advanced.OutboundControlQueueSize diff --git a/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala b/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala index 9156c78069..b0b5b4522d 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala @@ -7,8 +7,6 @@ package akka.remote.artery import akka.annotation.InternalApi import akka.stream.scaladsl.PartitionHub import org.agrona.concurrent.OneToOneConcurrentArrayQueue -import java.util.concurrent.atomic.AtomicInteger -import org.agrona.concurrent.ManyToManyConcurrentArrayQueue /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala b/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala index 524469bfd1..a8363ee30a 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala @@ -28,7 +28,6 @@ private[akka] object ImmutableLongMap { */ private[akka] class ImmutableLongMap[A >: Null] private ( private val keys: Array[Long], private val values: Array[A])(implicit t: ClassTag[A]) { - import ImmutableLongMap.MaxScanLength val size: Int = keys.length diff --git a/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala b/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala index 0b875590d5..f548b21163 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala @@ -6,7 +6,6 @@ package akka.remote.artery import akka.actor.InternalActorRef import akka.util.OptionVal -import akka.actor.Address import akka.actor.ActorRef /** diff --git a/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala b/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala index 788bdb2302..dd36382fec 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala @@ -7,14 +7,12 @@ package akka.remote.artery import akka.actor.ActorRef import akka.actor.ActorSelection import akka.actor.ActorSelectionMessage -import akka.actor.Address import akka.actor.ExtendedActorSystem -import akka.actor.InternalActorRef import akka.actor.LocalRef import akka.actor.PossiblyHarmful import akka.actor.RepointableRef import akka.dispatch.sysmsg.SystemMessage -import akka.event.{ LogMarker, Logging, LoggingReceive } +import akka.event.{ LogMarker, Logging } import akka.remote.RemoteActorRefProvider import akka.remote.RemoteRef import akka.util.OptionVal diff --git a/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala b/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala index 5b87308ec5..2739f89f18 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala @@ -6,17 +6,12 @@ package akka.remote.artery import java.util.Queue -import akka.stream.stage.GraphStage import akka.stream.stage.OutHandler import akka.stream.Attributes import akka.stream.Outlet import akka.stream.SourceShape import akka.stream.stage.GraphStageLogic -import org.agrona.concurrent.ManyToOneConcurrentArrayQueue import akka.stream.stage.GraphStageWithMaterializedValue -import org.agrona.concurrent.ManyToOneConcurrentLinkedQueueTail -import org.agrona.concurrent.ManyToOneConcurrentLinkedQueue -import java.util.concurrent.atomic.AtomicInteger import scala.annotation.tailrec import scala.concurrent.Promise @@ -24,8 +19,6 @@ import scala.util.Try import scala.util.Success import scala.util.Failure -import akka.actor.ActorRef - /** * INTERNAL API */ diff --git a/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala b/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala index f0830f138a..141c7819b3 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala @@ -7,7 +7,6 @@ package akka.remote.artery import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec -import scala.concurrent.duration._ import akka.actor.Address import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.stream.Attributes diff --git a/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala b/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala index 3333476fc8..cf559e656f 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala @@ -6,8 +6,6 @@ package akka.remote.artery package aeron import akka.util.PrettyDuration.PrettyPrintableDuration -import java.nio.ByteBuffer -import java.util.concurrent.atomic.AtomicInteger import scala.annotation.tailrec import scala.concurrent.Future import scala.concurrent.Promise 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 ddbe3f9932..67a912934d 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 @@ -25,12 +25,10 @@ import akka.remote.RemoteActorRefProvider import akka.remote.RemoteTransportException import akka.remote.artery.compress._ import akka.stream.KillSwitches -import akka.stream.SharedKillSwitch import akka.stream.scaladsl.Flow import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import akka.util.OptionVal import io.aeron.Aeron import io.aeron.AvailableImageHandler import io.aeron.CncFileDescriptor diff --git a/akka-remote/src/main/scala/akka/remote/artery/compress/TopHeavyHitters.scala b/akka-remote/src/main/scala/akka/remote/artery/compress/TopHeavyHitters.scala index 6643b6c0dd..998bed15f6 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/compress/TopHeavyHitters.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/compress/TopHeavyHitters.scala @@ -5,9 +5,8 @@ package akka.remote.artery.compress import java.util.Objects -import java.util.concurrent.atomic.AtomicReference -import scala.annotation.{ switch, tailrec } +import scala.annotation.tailrec import scala.reflect.ClassTag /** diff --git a/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala index 874f0fc336..425d368c70 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala @@ -9,10 +9,8 @@ import java.net.InetSocketAddress import scala.concurrent.Await import scala.concurrent.ExecutionContext -import scala.concurrent.ExecutionContextExecutor import scala.concurrent.Future import scala.concurrent.Promise -import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success import scala.util.Try @@ -30,13 +28,10 @@ import akka.remote.artery.Decoder.InboundCompressionAccess import akka.remote.artery.compress._ import akka.stream.Attributes import akka.stream.Attributes.LogLevels -import akka.stream.FlowShape -import akka.stream.Graph import akka.stream.KillSwitches import akka.stream.Materializer import akka.stream.SharedKillSwitch import akka.stream.SinkShape -import akka.stream.scaladsl.Broadcast import akka.stream.scaladsl.Flow import akka.stream.scaladsl.GraphDSL import akka.stream.scaladsl.Keep diff --git a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala index 8e6ec6dcbf..5f48f7ed47 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala @@ -9,7 +9,7 @@ import akka.protobuf.ByteString import com.typesafe.config.{ Config, ConfigFactory } import akka.actor.{ Deploy, ExtendedActorSystem, NoScopeGiven, Props, Scope } import akka.remote.DaemonMsgCreate -import akka.remote.WireFormats.{ DaemonMsgCreateData, DeployData, PropsData, SerializedMessage } +import akka.remote.WireFormats.{ DaemonMsgCreateData, DeployData, PropsData } import akka.routing.{ NoRouter, RouterConfig } import scala.reflect.ClassTag diff --git a/akka-remote/src/main/scala/akka/remote/serialization/PrimitiveSerializers.scala b/akka-remote/src/main/scala/akka/remote/serialization/PrimitiveSerializers.scala index 938bb72654..e2571d1d86 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/PrimitiveSerializers.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/PrimitiveSerializers.scala @@ -6,8 +6,7 @@ package akka.remote.serialization import java.nio.{ BufferOverflowException, ByteBuffer } -import akka.actor.{ ExtendedActorSystem, Kill, PoisonPill } -import akka.remote.OversizedPayloadException +import akka.actor.ExtendedActorSystem import akka.serialization.{ BaseSerializer, ByteBufferSerializer } import akka.util.ByteString diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala index cede5a0372..08bf7a9e4a 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala @@ -25,7 +25,6 @@ import scala.util.{ Failure, Success } import scala.util.control.NonFatal import akka.dispatch.sysmsg.{ Unwatch, Watch } import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.event.LoggingAdapter import akka.remote.RARP class ThrottlerProvider extends TransportAdapterProvider { diff --git a/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala b/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala index 5b2071acd4..415da9961e 100644 --- a/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala @@ -6,10 +6,8 @@ package akka.remote import akka.testkit._ import scala.concurrent.duration._ -import akka.actor.{ Address, ExtendedActorSystem, ActorSystem } +import akka.actor.{ Address, ActorSystem } import com.typesafe.config.ConfigFactory -import java.nio.channels.ServerSocketChannel -import java.net.InetSocketAddress import scala.collection.JavaConverters._ class DaemonicSpec extends AkkaSpec { diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala index 3689054959..2815868611 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteDeploymentWhitelistSpec.scala @@ -4,12 +4,9 @@ package akka.remote -import java.util.concurrent.ThreadLocalRandom - import akka.actor._ import akka.remote.transport._ import akka.testkit._ -import akka.util.ByteString import com.typesafe.config._ import scala.concurrent.duration._ 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 8e0ac30edd..006b4872f4 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,6 @@ package akka.remote.artery -import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import akka.actor.ActorSystem import akka.remote.transport.netty.NettyTransportSpec._ diff --git a/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala index 9465b93aad..303ba185ab 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala @@ -4,10 +4,8 @@ package akka.remote.artery -import akka.actor.{ Actor, ActorIdentity, ActorSystem, Identify, Props, RootActorPath } -import akka.remote.RARP -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import com.typesafe.config.ConfigFactory +import akka.actor.{ Actor, ActorIdentity, Identify, Props } +import akka.testkit.TestProbe import scala.concurrent.Await import scala.concurrent.duration._ diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala index 09cb80f575..aa74ed5c69 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala @@ -6,7 +6,7 @@ package akka.remote.artery import scala.concurrent.duration._ -import akka.actor.{ ActorIdentity, ActorSystem, Identify } +import akka.actor.{ ActorIdentity, Identify } import akka.testkit._ import com.typesafe.config.ConfigFactory import akka.actor.RootActorPath @@ -22,7 +22,6 @@ object HandshakeDenySpec { } class HandshakeDenySpec extends ArteryMultiNodeSpec(HandshakeDenySpec.commonConfig) with ImplicitSender { - import HandshakeDenySpec._ var systemB = newRemoteSystem(name = Some("systemB")) diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala index 0feba722f5..a79812167a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala @@ -6,8 +6,8 @@ package akka.remote.artery import scala.concurrent.duration._ -import akka.actor.{ ActorIdentity, ActorSystem, Identify } -import akka.testkit.{ AkkaSpec, ImplicitSender } +import akka.actor.{ ActorIdentity, Identify } +import akka.testkit.ImplicitSender import akka.testkit.SocketUtil import akka.testkit.TestActors import com.typesafe.config.ConfigFactory diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala index 829158e2de..78d5270151 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala @@ -7,7 +7,7 @@ package akka.remote.artery import scala.concurrent.duration._ import akka.actor._ -import akka.testkit.{ AkkaSpec, ImplicitSender } +import akka.testkit.ImplicitSender import akka.testkit.SocketUtil import akka.testkit.TestActors import com.typesafe.config.ConfigFactory diff --git a/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala index 21e20d5816..fbd27c1673 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala @@ -4,7 +4,6 @@ package akka.remote.artery -import scala.concurrent.duration._ import org.scalatest.Matchers import org.scalatest.WordSpec import akka.util.OptionVal diff --git a/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala index 0ba0d72dff..31de5661d3 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala @@ -6,10 +6,8 @@ package akka.remote.artery import scala.concurrent.duration._ -import akka.actor.ActorSystem import akka.actor.RootActorPath import akka.remote.RARP -import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.SocketUtil import akka.testkit.TestActors diff --git a/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala index 954966aa09..1be83699f3 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala @@ -6,12 +6,9 @@ package akka.remote.artery import scala.concurrent.duration._ import akka.actor.Address -import akka.remote.EndpointManager.Send -import akka.remote.RemoteActorRef import akka.remote.UniqueAddress import akka.remote.artery.OutboundHandshake.HandshakeReq import akka.remote.artery.OutboundHandshake.HandshakeTimeoutException -import akka.remote.artery.SystemMessageDelivery._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.scaladsl.Keep @@ -21,7 +18,6 @@ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import akka.testkit.TestProbe import akka.util.OptionVal class OutboundHandshakeSpec extends AkkaSpec with ImplicitSender { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala index 2ef265ceac..0fbddca5bf 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala @@ -7,7 +7,6 @@ package akka.remote.artery import akka.actor.{ EmptyLocalActorRef, InternalActorRef } import akka.remote.RemoteActorRef import akka.testkit.{ EventFilter, TestActors } -import akka.actor.Props import akka.actor.ExtendedActorSystem import akka.actor.ActorRefScope diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala index 999f0ba5ed..5c108a2f7d 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala @@ -4,10 +4,8 @@ package akka.remote.artery -import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, ActorRefScope, ActorSelection, ActorSystem, ExtendedActorSystem, Identify, PoisonPill, Props, Terminated } -import akka.remote.RARP -import akka.testkit.{ AkkaSpec, ImplicitSender, SocketUtil, TestActors } -import com.typesafe.config.ConfigFactory +import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, ActorRefScope, ActorSelection, Identify, PoisonPill, Props, Terminated } +import akka.testkit.{ ImplicitSender, SocketUtil, TestActors } import scala.concurrent.duration._ import akka.testkit.JavaSerializable diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala index acc23ffd22..0d41786716 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala @@ -4,11 +4,9 @@ package akka.remote.artery -import akka.actor.{ ActorSystem, ExtendedActorSystem } -import akka.remote.RARP +import akka.actor.ActorSystem import akka.testkit.SocketUtil._ -import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender, TestActors, TestEvent, TestProbe } -import com.typesafe.config.ConfigFactory +import akka.testkit.{ EventFilter, ImplicitSender, TestActors, TestEvent, TestProbe } import scala.concurrent.duration._ diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala index 708dbb4648..4ae1eb02e6 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala @@ -10,10 +10,8 @@ import com.typesafe.config.ConfigFactory import akka.actor.RootActorPath import scala.concurrent.duration._ import akka.testkit.SocketUtil -import akka.event.Logging.Warning import akka.remote.QuarantinedEvent import akka.remote.RARP -import akka.remote.RemoteActorRef object RemoteDeathWatchSpec { val otherPort = SocketUtil.temporaryLocalPort(udp = true) diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala index 0cd53f7eba..92b465f866 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala @@ -4,14 +4,10 @@ package akka.remote.artery -import scala.collection.immutable import akka.testkit._ -import akka.routing._ import akka.actor._ -import akka.remote.routing._ import com.typesafe.config._ -import akka.testkit.TestActors.echoActorProps -import akka.remote.{ RARP, RemoteScope } +import akka.remote.RARP object RemoteDeploymentSpec { class Echo1 extends Actor { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala index ef067af116..2af99993ce 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala @@ -7,7 +7,7 @@ package akka.remote.artery import akka.actor.{ ActorRef, ActorSystem, ExtendedActorSystem, InternalActorRef } import akka.event._ import akka.testkit.TestEvent.Mute -import akka.testkit.{ AkkaSpec, EventFilter, TestEvent, TestProbe } +import akka.testkit.{ AkkaSpec, EventFilter, TestProbe } import akka.util.OptionVal import java.nio.{ ByteBuffer, CharBuffer } import java.nio.charset.Charset diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala index 5b6492caa8..d24d18d6ae 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala @@ -7,11 +7,10 @@ package akka.remote.artery import java.io.NotSerializableException import java.util.concurrent.ThreadLocalRandom -import akka.actor.{ Actor, ActorRef, ActorSystem, Address, Deploy, ExtendedActorSystem, PoisonPill, Props } +import akka.actor.{ Actor, ActorRef, PoisonPill, Props } import akka.remote.{ AssociationErrorEvent, DisassociatedEvent, OversizedPayloadException, RARP } -import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender, TestActors } +import akka.testkit.{ EventFilter, ImplicitSender, TestActors } import akka.util.ByteString -import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ @@ -29,8 +28,6 @@ class RemoteMessageSerializationSpec extends ArteryMultiNodeSpec(""" akka.actor.serialize-creators = off """) with ImplicitSender { - import RemoteMessageSerializationSpec._ - val maxPayloadBytes = RARP(system).provider.remoteSettings.Artery.Advanced.MaximumFrameSize val remoteSystem = newRemoteSystem() diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala index 6ee7025589..5b14b94aee 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala @@ -4,9 +4,8 @@ package akka.remote.artery -import akka.actor.{ Actor, ActorIdentity, ActorRef, ActorSystem, Deploy, Identify, PoisonPill, Props, RootActorPath } -import akka.remote.RARP -import akka.testkit.{ AkkaSpec, ImplicitSender, TestActors, TestProbe } +import akka.actor.{ Actor, ActorIdentity, ActorRef, Deploy, Identify, PoisonPill, Props, RootActorPath } +import akka.testkit.{ ImplicitSender, TestActors, TestProbe } import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.duration._ diff --git a/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala index d48914c7dc..27f36ea0e5 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala @@ -4,12 +4,9 @@ package akka.remote.artery -import scala.concurrent.duration._ -import akka.actor.{ ActorIdentity, ActorSystem, ExtendedActorSystem, Identify, RootActorPath } -import akka.remote.RARP -import akka.testkit.{ AkkaSpec, ImplicitSender } +import akka.actor.{ ActorIdentity, Identify, RootActorPath } +import akka.testkit.ImplicitSender import akka.testkit.TestActors -import com.typesafe.config.ConfigFactory import akka.testkit.EventFilter object SerializationErrorSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala index f07193fbd7..4a09299735 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala @@ -12,7 +12,6 @@ import akka.NotUsed import akka.actor.ActorIdentity import akka.actor.ActorSystem import akka.actor.Identify -import akka.actor.PoisonPill import akka.actor.RootActorPath import akka.remote.{ AddressUidExtension, RARP, UniqueAddress } import akka.remote.artery.SystemMessageDelivery._ @@ -26,7 +25,6 @@ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.ImplicitSender import akka.testkit.TestActors import akka.testkit.TestProbe -import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import akka.util.OptionVal diff --git a/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala index 8b82b56bb8..facf2ebd49 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala @@ -9,15 +9,12 @@ import com.typesafe.config.ConfigFactory import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef -import akka.actor.ActorSystem import akka.actor.Deploy -import akka.actor.ExtendedActorSystem import akka.actor.Identify import akka.actor.PoisonPill import akka.actor.Props import akka.actor.RootActorPath import akka.actor.Terminated -import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.TestProbe import akka.actor.ActorSelection diff --git a/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala index 4ba34ba83b..d05322c4b2 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala @@ -6,14 +6,10 @@ package akka.remote.artery.compress import com.typesafe.config.ConfigFactory import akka.actor._ -import akka.pattern.ask import akka.remote.artery.compress.CompressionProtocol.Events import akka.testkit._ -import akka.util.Timeout import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfter -import scala.concurrent.Await import scala.concurrent.duration._ import akka.actor.ExtendedActorSystem import akka.serialization.SerializerWithStringManifest @@ -46,7 +42,6 @@ object CompressionIntegrationSpec { class CompressionIntegrationSpec extends ArteryMultiNodeSpec(CompressionIntegrationSpec.commonConfig) with ImplicitSender { - import CompressionIntegrationSpec._ val systemB = newRemoteSystem(name = Some("systemB")) val messagesToExchange = 10 diff --git a/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala index 89646cacc2..fded86f718 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala @@ -5,7 +5,7 @@ package akka.remote.serialization import akka.actor.setup.ActorSystemSetup -import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem, Terminated } +import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem } import akka.serialization._ import akka.testkit.{ AkkaSpec, TestKit, TestProbe } import com.typesafe.config.ConfigFactory diff --git a/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala index 56bcdcf90c..4cfe7147b5 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala @@ -6,7 +6,6 @@ package akka.remote.serialization import java.nio.ByteBuffer -import akka.actor.{ ActorIdentity, ExtendedActorSystem, Identify } import akka.serialization.SerializationExtension import akka.testkit.AkkaSpec import akka.util.ByteString @@ -14,7 +13,6 @@ import com.typesafe.config.ConfigFactory import scala.util.Random import java.nio.ByteOrder -import akka.serialization.Serialization import akka.serialization.ByteBufferSerializer import akka.serialization.Serializer diff --git a/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala index 00d256b266..d7f19744f7 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala @@ -4,11 +4,10 @@ package akka.remote.serialization -import akka.actor.{ ActorInitializationException, ActorRef, ExtendedActorSystem, InternalActorRef } +import akka.actor.{ ActorInitializationException, ExtendedActorSystem, InternalActorRef } import akka.dispatch.sysmsg._ import akka.serialization.SerializationExtension import akka.testkit.{ AkkaSpec, TestProbe } -import akka.util.ByteString import com.typesafe.config.ConfigFactory object SystemMessageSerializationSpec { diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala index a3b33e561a..2ae641e89b 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala @@ -13,12 +13,11 @@ import org.reactivestreams.{ Publisher, Subscriber, Subscription } import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ -import scala.language.existentials import java.io.StringWriter import java.io.PrintWriter import java.util.concurrent.CountDownLatch -import akka.testkit.TestActor.{ AutoPilot, NoAutoPilot } +import akka.testkit.TestActor.AutoPilot /** * Provides factory methods for various Publishers. diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala index f90789b2e7..e82f743809 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala @@ -8,7 +8,6 @@ import java.nio.file.Files import akka.actor.ActorSystem import akka.event.Logging import akka.stream.scaladsl.{ Sink, FileIO } -import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.testkit.{ EventFilter, TestEvent } import akka.util.ByteString diff --git a/akka-stream/src/main/scala/akka/stream/Graph.scala b/akka-stream/src/main/scala/akka/stream/Graph.scala index ba431c6205..53f70b4e4a 100644 --- a/akka-stream/src/main/scala/akka/stream/Graph.scala +++ b/akka-stream/src/main/scala/akka/stream/Graph.scala @@ -4,7 +4,7 @@ package akka.stream -import akka.stream.impl.{ GraphStageTag, IslandTag, TraversalBuilder } +import akka.stream.impl.TraversalBuilder import scala.annotation.unchecked.uncheckedVariance diff --git a/akka-stream/src/main/scala/akka/stream/Materializer.scala b/akka-stream/src/main/scala/akka/stream/Materializer.scala index d0b8a972ed..a5b41958b8 100644 --- a/akka-stream/src/main/scala/akka/stream/Materializer.scala +++ b/akka-stream/src/main/scala/akka/stream/Materializer.scala @@ -6,8 +6,6 @@ package akka.stream import akka.actor.Cancellable import akka.annotation.InternalApi -import akka.stream.ActorAttributes.Dispatcher -import akka.stream.Attributes.InputBuffer import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/StreamRefs.scala b/akka-stream/src/main/scala/akka/stream/StreamRefs.scala index 239f970a2e..b3383ede75 100644 --- a/akka-stream/src/main/scala/akka/stream/StreamRefs.scala +++ b/akka-stream/src/main/scala/akka/stream/StreamRefs.scala @@ -5,7 +5,7 @@ package akka.stream import akka.NotUsed -import akka.actor.{ ActorRef, ActorSystem } +import akka.actor.ActorRef import akka.stream.scaladsl.{ Sink, Source } import scala.language.implicitConversions diff --git a/akka-stream/src/main/scala/akka/stream/extra/Timed.scala b/akka-stream/src/main/scala/akka/stream/extra/Timed.scala index 955bf49270..793aaff5d3 100644 --- a/akka-stream/src/main/scala/akka/stream/extra/Timed.scala +++ b/akka-stream/src/main/scala/akka/stream/extra/Timed.scala @@ -12,7 +12,6 @@ import akka.stream.scaladsl.{ Flow, Source } import akka.stream.stage._ import scala.concurrent.duration._ -import scala.language.existentials /** * Provides operations needed to implement the `timed` DSL diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkActor.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkActor.scala index 0289975556..cfa070e1d7 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkActor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkActor.scala @@ -7,7 +7,6 @@ package akka.stream.impl import akka.stream.actor.ActorSubscriber import akka.actor.ActorRef import akka.stream.actor.ActorSubscriberMessage -import akka.actor.Status import akka.stream.actor.WatermarkRequestStrategy import akka.actor.Props import akka.actor.Terminated diff --git a/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala b/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala index ba9f3d87e5..135d7d2510 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala @@ -7,8 +7,6 @@ package akka.stream.impl import akka.annotation.InternalApi import org.reactivestreams.{ Publisher, Subscriber, Subscription } -import scala.concurrent.{ ExecutionContext, Promise } - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Messages.scala b/akka-stream/src/main/scala/akka/stream/impl/Messages.scala index cb2930617f..a13cec1018 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Messages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Messages.scala @@ -4,7 +4,6 @@ package akka.stream.impl -import language.existentials import akka.actor.{ DeadLetterSuppression, NoSerializationVerificationNeeded } import akka.annotation.InternalApi diff --git a/akka-stream/src/main/scala/akka/stream/impl/Modules.scala b/akka-stream/src/main/scala/akka/stream/impl/Modules.scala index 051b675fe3..0a29263ab3 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Modules.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Modules.scala @@ -7,15 +7,12 @@ package akka.stream.impl import akka.NotUsed import akka.actor._ import akka.annotation.{ DoNotInherit, InternalApi } -import akka.dispatch.Dispatchers import akka.stream._ import akka.stream.impl.StreamLayout.AtomicModule import org.reactivestreams._ import scala.annotation.unchecked.uncheckedVariance -import scala.concurrent.Promise import akka.event.Logging -import akka.util.OptionVal /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala b/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala index 06f165d785..95745951b7 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala @@ -8,7 +8,6 @@ import java.util.concurrent.CompletionStage import akka.Done import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts.sameThreadExecutionContext import akka.stream.OverflowStrategies._ import akka.stream._ import akka.stream.stage._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala index 1caf3ea31f..71c3468955 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala @@ -6,17 +6,13 @@ package akka.stream.impl import akka.dispatch.ExecutionContexts import akka.stream.ActorAttributes.SupervisionStrategy -import akka.stream.Supervision.{ Stop, stoppingDecider } import akka.stream.impl.QueueSink.{ Output, Pull } -import akka.stream.impl.fusing.GraphInterpreter -import akka.{ Done, NotUsed, annotation } -import akka.actor.{ Actor, ActorRef, Props } +import akka.NotUsed +import akka.actor.{ ActorRef, Props } import akka.stream.Attributes.InputBuffer import akka.stream._ import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.StreamLayout.AtomicModule -import java.util.concurrent.atomic.AtomicReference -import java.util.function.BiConsumer import akka.actor.{ ActorRef, Props } import akka.stream.Attributes.InputBuffer @@ -26,11 +22,10 @@ import org.reactivestreams.{ Publisher, Subscriber } import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable -import scala.concurrent.{ ExecutionContext, Future, Promise } -import scala.language.postfixOps +import scala.concurrent.{ Future, Promise } import scala.util.control.NonFatal import scala.util.{ Failure, Success, Try } -import akka.stream.scaladsl.{ Sink, SinkQueue, SinkQueueWithCancel, Source } +import akka.stream.scaladsl.{ Sink, SinkQueueWithCancel, Source } import java.util.concurrent.CompletionStage import scala.compat.java8.FutureConverters._ @@ -39,7 +34,6 @@ import java.util.Optional import akka.annotation.{ DoNotInherit, InternalApi } import akka.event.Logging -import akka.util.OptionVal import scala.collection.generic.CanBuildFrom diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala index 396aee5728..ec4b1d9d59 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala @@ -12,7 +12,6 @@ import java.util.concurrent.ThreadLocalRandom import akka.Done import akka.annotation.InternalApi -import akka.util.OptionVal import scala.concurrent.Promise import scala.util.control.NonFatal diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala index 25d52288c0..7c46eebbb1 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala @@ -20,10 +20,9 @@ import akka.stream.stage._ import akka.stream.{ Shape, _ } import scala.annotation.unchecked.uncheckedVariance -import scala.util.{ Failure, Success, Try } +import scala.util.Try import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ Future, Promise } -import scala.util.control.NonFatal /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala index 6dc9369ae1..da71a496cd 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala @@ -11,28 +11,25 @@ import akka.annotation.{ DoNotInherit, InternalApi } import akka.dispatch.ExecutionContexts import akka.event.Logging.LogLevel import akka.event.{ LogSource, Logging, LoggingAdapter } -import akka.pattern.AskSupport import akka.stream.Attributes.{ InputBuffer, LogLevels } import akka.stream.OverflowStrategies._ import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage -import akka.stream.impl.{ ConstantFun, ReactiveStreamsCompliance, Stages, Buffer ⇒ BufferImpl } -import akka.stream.scaladsl.{ Flow, Keep, Source, SourceQueue } +import akka.stream.impl.{ ReactiveStreamsCompliance, Buffer ⇒ BufferImpl } +import akka.stream.scaladsl.{ Flow, Keep, Source } import akka.stream.stage._ import akka.stream.{ Supervision, _ } import scala.annotation.tailrec import scala.collection.immutable import scala.collection.immutable.VectorBuilder -import scala.concurrent.{ Future, Promise } +import scala.concurrent.Future import scala.util.control.{ NoStackTrace, NonFatal } import scala.util.{ Failure, Success, Try } import akka.stream.ActorAttributes.SupervisionStrategy import scala.concurrent.duration.{ FiniteDuration, _ } import akka.stream.impl.Stages.DefaultAttributes -import akka.util.{ OptionVal, Timeout } - -import scala.reflect.ClassTag +import akka.util.OptionVal /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala index 54a010fe98..4fad974fb0 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala @@ -16,12 +16,10 @@ import akka.stream.stage._ import akka.stream.scaladsl._ import akka.stream.actor.ActorSubscriberMessage -import scala.collection.{ immutable, mutable } +import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import scala.util.control.NonFatal import scala.annotation.tailrec -import akka.stream.impl.PublisherSource -import akka.stream.impl.CancellingSubscriber import akka.stream.impl.{ Buffer ⇒ BufferImpl } import scala.collection.JavaConverters._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala index e0a44abf55..7ffd385539 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala @@ -13,7 +13,7 @@ import akka.stream._ import akka.stream.impl.StreamLayout.AtomicModule import akka.stream.TLSProtocol._ import akka.stream.impl.{ TlsModuleIslandTag, TraversalBuilder } -import akka.util.{ ByteString, OptionVal } +import akka.util.ByteString import scala.util.Try diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/compression/CompressionUtils.scala b/akka-stream/src/main/scala/akka/stream/impl/io/compression/CompressionUtils.scala index 25ebee5383..f613cd7655 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/compression/CompressionUtils.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/compression/CompressionUtils.scala @@ -6,10 +6,10 @@ package akka.stream.impl.io.compression import akka.NotUsed import akka.annotation.InternalApi -import akka.stream.{ Attributes, FlowShape } +import akka.stream.Attributes import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.scaladsl.Flow -import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } +import akka.stream.stage.{ GraphStageLogic, InHandler, OutHandler } import akka.util.ByteString /** INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala index 13aef52837..d824d720a3 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala @@ -4,10 +4,9 @@ package akka.stream.impl.streamref -import scala.language.implicitConversions import akka.Done import akka.NotUsed -import akka.actor.{ ActorRef, ActorSystem, Terminated } +import akka.actor.{ ActorRef, Terminated } import akka.annotation.InternalApi import akka.event.Logging import akka.stream._ diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala index 61aec87cab..dab422f624 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala @@ -16,7 +16,6 @@ import akka.stream.stage._ import akka.util.{ OptionVal, PrettyDuration } import scala.concurrent.{ Future, Promise } -import scala.language.implicitConversions /** INTERNAL API: Implementation class, not intended to be touched directly by end-users */ @InternalApi diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala index 442627a24b..054142e9a8 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala @@ -4,14 +4,11 @@ package akka.stream.impl.streamref -import akka.actor.{ Actor, ActorLogging, ActorPath, ActorRef, ActorRefProvider, ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider, MinimalActorRef, Props, RepointableActorRef, Stash } +import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import akka.annotation.InternalApi import akka.event.Logging -import akka.stream.SourceRef import akka.stream.impl.SeqActorName -import scala.concurrent.Future - /** INTERNAL API */ @InternalApi private[stream] object StreamRefsMaster extends ExtensionId[StreamRefsMaster] with ExtensionIdProvider { diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala b/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala index 500f081715..29ec75c016 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala @@ -9,7 +9,7 @@ import java.nio.file.{ OpenOption, Path } import java.util import java.util.concurrent.CompletionStage -import akka.stream.{ ActorAttributes, IOResult, javadsl, scaladsl } +import akka.stream.{ IOResult, javadsl, scaladsl } import akka.util.ByteString import scala.collection.JavaConverters._ diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala index e31e45232b..8ed7abc4a6 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala @@ -10,8 +10,6 @@ import java.util.concurrent.CompletionStage import akka.Done import akka.stream.QueueOfferResult -import scala.concurrent.Future - /** * This trait allows to have the queue as a data source for some stream. */ diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Restart.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Restart.scala index 6f3ad864f5..98a82b0542 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Restart.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Restart.scala @@ -6,7 +6,6 @@ package akka.stream.javadsl import akka.NotUsed import akka.japi.function.Creator -import akka.stream.KillSwitch import scala.concurrent.duration.FiniteDuration diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index d6fe9f23c2..2241088d7d 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -14,21 +14,18 @@ import akka.actor.{ ActorRef, Cancellable, Props } import akka.event.LoggingAdapter import akka.japi.{ Pair, Util, function } import akka.stream._ -import akka.stream.impl.{ LinearTraversalBuilder, SourceQueueAdapter, StreamLayout } +import akka.stream.impl.{ LinearTraversalBuilder, SourceQueueAdapter } import org.reactivestreams.{ Publisher, Subscriber } import scala.annotation.unchecked.uncheckedVariance import scala.collection.JavaConverters._ import scala.collection.immutable -import scala.collection.immutable.Range.Inclusive import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ Future, Promise } import scala.compat.java8.OptionConverters._ import java.util.concurrent.CompletionStage import java.util.concurrent.CompletableFuture -import akka.annotation.InternalApi - import scala.compat.java8.FutureConverters._ import scala.reflect.ClassTag 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 df30edc348..478573b92a 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala @@ -17,8 +17,6 @@ import akka.japi.Util import java.util.Comparator import java.util.concurrent.CompletionStage -import akka.stream.impl.fusing.MapError - import scala.compat.java8.FutureConverters._ import scala.reflect.ClassTag diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala index 4d8e14f24f..b8bd06c07c 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala @@ -10,7 +10,7 @@ import java.nio.file.StandardOpenOption._ import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io._ -import akka.stream.{ ActorAttributes, IOResult } +import akka.stream.IOResult import akka.util.ByteString import scala.concurrent.Future diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala index 62a6f637d8..f79780257f 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala @@ -8,7 +8,7 @@ import java.util import java.util.concurrent.atomic.{ AtomicLong, AtomicReference } import akka.NotUsed -import akka.dispatch.{ AbstractNodeQueue, ExecutionContexts } +import akka.dispatch.AbstractNodeQueue import akka.stream._ import akka.stream.stage._ import scala.annotation.tailrec diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Materialization.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Materialization.scala index 7443a9667e..5a1b014a49 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Materialization.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Materialization.scala @@ -4,8 +4,6 @@ package akka.stream.scaladsl -import scala.concurrent.Future - import akka.NotUsed /** diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala index e9b91c5f9c..c674eba8bf 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala @@ -6,11 +6,7 @@ package akka.stream.scaladsl import scala.concurrent.Future import akka.Done -import akka.annotation.DoNotInherit import akka.stream.QueueOfferResult -import akka.stream.stage.GraphStageLogic - -import scala.util.control.NoStackTrace /** * This trait allows to have the queue as a data source for some stream. 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 13a16a3a21..d04987c28d 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/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala b/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala index 17f9c57358..1641fc9896 100644 --- a/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala +++ b/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala @@ -8,12 +8,9 @@ import akka.protobuf.ByteString import akka.actor.ExtendedActorSystem import akka.annotation.InternalApi import akka.serialization.{ BaseSerializer, Serialization, SerializationExtension, SerializerWithStringManifest } -import akka.stream.{ SourceRef, StreamRefMessages } +import akka.stream.StreamRefMessages import akka.stream.impl.streamref._ -import scala.concurrent.duration._ -import scala.concurrent.Await - /** INTERNAL API */ @InternalApi private[akka] final class StreamRefSerializer(val system: ExtendedActorSystem) extends SerializerWithStringManifest diff --git a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala index 3768eb4ab1..e9341a3ddf 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala @@ -8,7 +8,6 @@ import java.util.concurrent.atomic.AtomicReference import akka.actor._ import akka.annotation.{ ApiMayChange, InternalApi } -import akka.dispatch.ExecutionContexts import akka.japi.function.{ Effect, Procedure } import akka.stream._ import akka.stream.actor.ActorSubscriberMessage diff --git a/akka-stream/src/main/scala/akka/stream/stage/StageLogging.scala b/akka-stream/src/main/scala/akka/stream/stage/StageLogging.scala index 12defdebee..286adae8ca 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/StageLogging.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/StageLogging.scala @@ -5,7 +5,7 @@ package akka.stream.stage import akka.event.{ LoggingAdapter, NoLogging } -import akka.stream.{ ActorMaterializer, MaterializerLoggingProvider } +import akka.stream.MaterializerLoggingProvider /** * Simple way to obtain a [[LoggingAdapter]] when used together with an [[ActorMaterializer]]. diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala b/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala index e6c334015e..81fab13b7d 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala +++ b/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/ActorSystemStub.scala @@ -10,7 +10,7 @@ import akka.actor.typed.internal.ActorRefImpl import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, DispatcherSelector, Dispatchers, Extension, ExtensionId, Logger, Props, Settings, Terminated } import akka.annotation.InternalApi import akka.util.Timeout -import akka.{ actor ⇒ a, event ⇒ e } +import akka.{ actor ⇒ a } import com.typesafe.config.ConfigFactory import scala.compat.java8.FutureConverters diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala b/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala index d7db2eb963..178945406e 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala +++ b/akka-testkit-typed/src/main/scala/akka/testkit/typed/internal/TestProbeImpl.scala @@ -20,7 +20,7 @@ import akka.util.{ BoxedType, Timeout } import scala.annotation.tailrec import scala.concurrent.Await import scala.concurrent.duration._ -import scala.util.control.{ NoStackTrace, NonFatal } +import scala.util.control.NonFatal @InternalApi private[akka] object TestProbeImpl { diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala b/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala index ce045099b4..ea5589cd00 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala +++ b/akka-testkit-typed/src/main/scala/akka/testkit/typed/javadsl/ActorTestKit.scala @@ -4,8 +4,6 @@ package akka.testkit.typed.javadsl -import java.util.concurrent.TimeUnit - import akka.actor.Scheduler import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props } import akka.testkit.typed.TestKitSettings diff --git a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala b/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala index 22b4f1b275..fcbe8c9886 100644 --- a/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala +++ b/akka-testkit-typed/src/main/scala/akka/testkit/typed/scaladsl/package.scala @@ -4,11 +4,7 @@ package akka.testkit.typed -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.reflect.ClassTag -import scala.collection.immutable -import java.util.concurrent.TimeUnit.MILLISECONDS -import akka.actor.typed.ActorSystem +import scala.concurrent.duration.FiniteDuration package object scaladsl { diff --git a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala b/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala index 92c5d7591d..de4f81400a 100644 --- a/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala +++ b/akka-testkit-typed/src/test/scala/akka/testkit/typed/scaladsl/TestProbeSpec.scala @@ -5,7 +5,6 @@ package akka.testkit.typed.scaladsl import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } import scala.concurrent.duration._ diff --git a/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala b/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala index 8d3e013349..109af0daba 100644 --- a/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala +++ b/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala @@ -17,8 +17,6 @@ import java.net.StandardProtocolFamily */ object SocketUtil { - import scala.language.reflectiveCalls - val RANDOM_LOOPBACK_ADDRESS = "RANDOM_LOOPBACK_ADDRESS" private val canBindOnAlternativeLoopbackAddresses = { diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala index ea3506f385..263f11ef13 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala @@ -4,7 +4,6 @@ package akka.testkit -import language.existentials import scala.util.matching.Regex import scala.collection.immutable import scala.concurrent.duration.Duration @@ -13,7 +12,7 @@ import akka.actor.{ DeadLetter, ActorSystem, UnhandledMessage } import akka.dispatch.sysmsg.{ SystemMessage, Terminate } import akka.event.Logging.{ Warning, LogEvent, InitializeLogger, Info, Error, Debug, LoggerInitialized } import akka.event.Logging -import akka.actor.{ ActorRef, NoSerializationVerificationNeeded } +import akka.actor.NoSerializationVerificationNeeded import akka.japi.Util.immutableSeq import java.lang.{ Iterable ⇒ JIterable } import akka.util.BoxedType diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index 098a1376c7..dca27908a8 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -14,7 +14,7 @@ import java.util.concurrent._ import java.util.concurrent.atomic.AtomicInteger import akka.actor._ -import akka.util.{ BoxedType, OptionVal, Timeout } +import akka.util.{ BoxedType, Timeout } import scala.util.control.NonFatal import scala.Some diff --git a/akka-testkit/src/main/scala/akka/testkit/TestMessageSerializer.scala b/akka-testkit/src/main/scala/akka/testkit/TestMessageSerializer.scala index cf27701b85..c65f7fb227 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestMessageSerializer.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestMessageSerializer.scala @@ -9,14 +9,11 @@ package akka.testkit */ import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, ObjectOutputStream } -import java.util.concurrent.Callable import akka.actor.ExtendedActorSystem import akka.serialization.{ BaseSerializer, JavaSerializer } import akka.util.ClassLoaderObjectInputStream -import scala.util.DynamicVariable - /** * This Serializer uses standard Java Serialization and is useful for tests where ad-hoc messages are created and sent * between actor systems. It needs to be explicitly enabled in the config (or through `ActorSystemSetup`) like so: diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala index 6017180782..55ec0e506a 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala @@ -6,7 +6,6 @@ package akka.testkit.metrics import com.codahale.metrics._ -import java.net.InetSocketAddress import java.util.concurrent.TimeUnit import scala.concurrent.duration._ import com.typesafe.config.Config