From c38a5dcf9c5f032cb11474b9004949a030ccf150 Mon Sep 17 00:00:00 2001 From: hepin1989 Date: Mon, 10 Dec 2018 05:13:50 +0800 Subject: [PATCH] Run scalafix to remove unused imports again. --- .../actor/typed/scaladsl/adapter/AdapterSpec.scala | 2 +- .../scala/akka/actor/typed/MessageAndSignals.scala | 4 ---- .../scala/akka/actor/typed/internal/Supervision.scala | 1 - .../sharding/typed/scaladsl/ClusterSharding.scala | 3 +-- .../scala/akka/cluster/client/ClusterClientSpec.scala | 2 -- .../akka/cluster/client/ClusterClientStopSpec.scala | 2 +- .../pubsub/DistributedPubSubMediatorSpec.scala | 1 - .../cluster/pubsub/DistributedPubSubRestartSpec.scala | 6 ------ .../singleton/ClusterSingletonManagerChaosSpec.scala | 5 ----- .../singleton/ClusterSingletonManagerLeaveSpec.scala | 11 ----------- .../ClusterSingletonManagerStartupSpec.scala | 1 - .../cluster/typed/MultiDcClusterSingletonSpec.scala | 1 - .../typed/ClusterSingletonPersistenceSpec.scala | 2 +- .../discovery/config/ConfigServiceDiscovery.scala | 1 - .../akka/remote/transport/netty/NettySSLSupport.scala | 2 -- .../src/main/scala/akka/stream/javadsl/Flow.scala | 1 - build.sbt | 2 +- 17 files changed, 5 insertions(+), 42 deletions(-) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala index d29cf398b6..bdf0de456d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/AdapterSpec.scala @@ -6,7 +6,7 @@ package akka.actor.typed.scaladsl.adapter import scala.concurrent.duration._ import scala.util.control.NoStackTrace -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, PostStop, Terminated } +import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Terminated } import akka.actor.InvalidMessageException import akka.actor.testkit.typed.TE import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala index 5b9186cb81..ee87c740b3 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/MessageAndSignals.scala @@ -4,12 +4,8 @@ package akka.actor.typed -import java.util.Optional - import akka.annotation.DoNotInherit -import scala.compat.java8.OptionConverters._ - /** * Envelope that is published on the eventStream for every message that is * dropped due to overfull queues. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala index 6f7ecba2ae..1e00239cba 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/Supervision.scala @@ -8,7 +8,6 @@ package internal import java.util.concurrent.ThreadLocalRandom import akka.actor.DeadLetterSuppression -import akka.actor.typed.Behavior.FailedBehavior import akka.actor.typed.BehaviorInterceptor.{ PreStartTarget, ReceiveTarget, SignalTarget } import akka.actor.typed.SupervisorStrategy._ import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala index cc13ed37e7..c8c7f13653 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala @@ -6,7 +6,6 @@ package akka.cluster.sharding.typed package scaladsl import scala.concurrent.Future -import scala.collection.{ immutable ⇒ im } import scala.reflect.ClassTag import akka.util.Timeout @@ -24,7 +23,7 @@ import akka.annotation.InternalApi import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy import akka.cluster.sharding.typed.internal.ClusterShardingImpl import akka.cluster.sharding.typed.internal.EntityTypeKeyImpl -import akka.cluster.sharding.ShardRegion.{ CurrentShardRegionState, StartEntity ⇒ UntypedStartEntity } +import akka.cluster.sharding.ShardRegion.{ StartEntity ⇒ UntypedStartEntity } import akka.persistence.typed.PersistenceId object ClusterSharding extends ExtensionId[ClusterSharding] { diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala index 9446619635..ad62fa5bf5 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientSpec.scala @@ -17,7 +17,6 @@ import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.cluster.pubsub._ -import akka.remote.RARP import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.util.Timeout @@ -217,7 +216,6 @@ class ClusterClientSpec extends MultiNodeSpec(ClusterClientSpec) with STMultiNod "work with ask" in within(10 seconds) { runOn(client) { import akka.pattern.ask - import system.dispatcher val c = system.actorOf(ClusterClient.props( ClusterClientSettings(system).withInitialContacts(initialContacts)), "ask-client") implicit val timeout = Timeout(remaining) diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala index eef06146fb..dcb8e84d7c 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientStopSpec.scala @@ -4,7 +4,7 @@ package akka.cluster.client -import akka.actor.{ Actor, Props, Terminated } +import akka.actor.{ Actor, Props } import akka.cluster.Cluster import akka.cluster.pubsub.{ DistributedPubSub, DistributedPubSubMediator } import akka.remote.testconductor.RoleName diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala index c44ba7315a..4c0ed9bd36 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubMediatorSpec.scala @@ -12,7 +12,6 @@ import akka.actor.ActorRef import akka.actor.PoisonPill import akka.actor.Props import akka.cluster.Cluster -import akka.cluster.ClusterEvent._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala index 639426f0d7..b822922d76 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/pubsub/DistributedPubSubRestartSpec.scala @@ -9,25 +9,19 @@ import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor.Actor import akka.actor.ActorRef -import akka.actor.PoisonPill import akka.actor.Props import akka.cluster.Cluster -import akka.cluster.ClusterEvent._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ -import akka.actor.ActorLogging -import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Status -import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Delta import akka.actor.ActorSystem import scala.concurrent.Await import akka.actor.Identify import akka.actor.RootActorPath import akka.actor.ActorIdentity -import akka.remote.RARP object DistributedPubSubRestartSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala index d3cf222c69..4088875d46 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerChaosSpec.scala @@ -5,26 +5,21 @@ package akka.cluster.singleton import language.postfixOps -import scala.collection.immutable import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor.Actor -import akka.actor.ActorLogging import akka.actor.ActorRef -import akka.actor.Address import akka.actor.Props import akka.actor.PoisonPill import akka.actor.RootActorPath import akka.cluster.Cluster import akka.cluster.ClusterEvent._ -import akka.cluster.Member import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.testkit.TestEvent._ -import akka.actor.Terminated import akka.actor.ActorSelection object ClusterSingletonManagerChaosSpec extends MultiNodeConfig { diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala index 02bda7ccf9..019ed946e7 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala @@ -4,28 +4,17 @@ package akka.cluster.singleton -import language.postfixOps -import scala.collection.immutable import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor.Actor -import akka.actor.ActorLogging import akka.actor.ActorRef -import akka.actor.Address import akka.actor.Props -import akka.actor.PoisonPill -import akka.actor.RootActorPath import akka.cluster.Cluster -import akka.cluster.ClusterEvent._ -import akka.cluster.Member import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ -import akka.testkit.TestEvent._ -import akka.actor.Terminated -import akka.actor.ActorSelection import akka.cluster.MemberStatus object ClusterSingletonManagerLeaveSpec extends MultiNodeConfig { diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala index 7b3f1bcc61..93f3cd9e64 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerStartupSpec.scala @@ -4,7 +4,6 @@ package akka.cluster.singleton -import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory import akka.actor.Actor diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala index 67a8c7864c..86163aba10 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiDcClusterSingletonSpec.scala @@ -4,7 +4,6 @@ package akka.cluster.typed -import akka.actor.typed.Props import akka.actor.typed.scaladsl.adapter._ import akka.cluster.{ MemberStatus, MultiNodeClusterSpec } import akka.remote.testconductor.RoleName diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala index f5496d10f5..310b5a78fc 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPersistenceSpec.scala @@ -5,7 +5,7 @@ package akka.cluster.typed import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.{ ActorRef, Behavior, Props } +import akka.actor.typed.{ ActorRef, Behavior } import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } import akka.actor.testkit.typed.scaladsl.TestProbe import akka.persistence.typed.PersistenceId diff --git a/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala b/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala index 5ddd066cfe..f7f314683b 100644 --- a/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala +++ b/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala @@ -12,7 +12,6 @@ import akka.event.Logging import com.typesafe.config.Config import scala.collection.JavaConverters._ -import scala.collection.{ breakOut, immutable } import scala.concurrent.Future import scala.concurrent.duration.FiniteDuration diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala index 699132b955..efbce26a65 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettySSLSupport.scala @@ -4,8 +4,6 @@ package akka.remote.transport.netty -import java.security._ - import akka.japi.Util._ import com.typesafe.config.Config import org.jboss.netty.handler.ssl.SslHandler diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala index 3ba36734ae..0ec9179f57 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala @@ -20,7 +20,6 @@ import akka.util.JavaDurationConverters._ import akka.actor.ActorRef import akka.dispatch.ExecutionContexts import akka.stream.impl.fusing.LazyFlow -import akka.stream.scaladsl.Sink import scala.annotation.unchecked.uncheckedVariance import scala.compat.java8.FutureConverters._ diff --git a/build.sbt b/build.sbt index 7da4f9d6db..9055299d0c 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ enablePlugins(UnidocRoot, TimeStampede, UnidocWithPrValidation, NoPublish, Copyr disablePlugins(MimaPlugin) addCommandAlias( name ="fixall", - value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;test:compile") + value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;test:compile;reload") import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm import com.typesafe.tools.mima.plugin.MimaPlugin import spray.boilerplate.BoilerplatePlugin