+build Add sort imports support. (#28780)

* Add scalafix plugin for jdk 9. * Add command alias sortImports. * Excludes some sources from SortImports. * Update SortImports to 0.4.0 * Sort imports with `sortImports` command.
2020-04-27 20:32:18 +08:00 · 2020-04-27 20:32:18 +08:00 · 0e4d41ad33
commit 0e4d41ad33
parent ea7205eaf7
1534 changed files with 7454 additions and 6165 deletions
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurableDataSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurableDataSpec.scala
@ -7,6 +7,10 @@ package akka.cluster.ddata
 import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
+
+import com.typesafe.config.ConfigFactory
+import org.scalatest.CancelAfterFailure
+
 import akka.actor.Actor
 import akka.actor.ActorRef
 import akka.actor.ActorSystem
@ -16,8 +20,6 @@ import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
-import com.typesafe.config.ConfigFactory
-import org.scalatest.CancelAfterFailure

 final case class DurableDataSpecConfig(writeBehind: Boolean) extends MultiNodeConfig {
  val first = role("first")
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurablePruningSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/DurablePruningSpec.scala
@ -4,18 +4,19 @@

 package akka.cluster.ddata

+import scala.concurrent.Await
 import scala.concurrent.duration._

+import com.typesafe.config.ConfigFactory
+
+import akka.actor.ActorRef
+import akka.actor.ActorSystem
 import akka.cluster.Cluster
+import akka.cluster.MemberStatus
 import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
-import com.typesafe.config.ConfigFactory
-import akka.actor.ActorSystem
-import akka.actor.ActorRef
-import scala.concurrent.Await
-import akka.cluster.MemberStatus
 import akka.util.ccompat._

@ccompatUsedUntil213
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/JepsenInspiredInsertSpec.scala
@ -4,16 +4,18 @@

 package akka.cluster.ddata

-import scala.concurrent.duration._
 import java.util.concurrent.ThreadLocalRandom

+import scala.concurrent.duration._
+
+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
 import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.remote.transport.ThrottlerTransportAdapter.Direction
 import akka.testkit._
-import com.typesafe.config.ConfigFactory

 object JepsenInspiredInsertSpec extends MultiNodeConfig {
  val controller = role("controller")
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/PerformanceSpec.scala
@ -6,6 +6,9 @@ package akka.cluster.ddata

 import scala.concurrent.Await
 import scala.concurrent.duration._
+
+import com.typesafe.config.ConfigFactory
+
 import akka.actor.Actor
 import akka.actor.ActorRef
 import akka.actor.Deploy
@ -15,7 +18,6 @@ import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
-import com.typesafe.config.ConfigFactory

 object PerformanceSpec extends MultiNodeConfig {
  val n1 = role("n1")
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorChaosSpec.scala
@ -6,13 +6,14 @@ package akka.cluster.ddata

 import scala.concurrent.duration._

+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
 import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.remote.transport.ThrottlerTransportAdapter.Direction
 import akka.testkit._
-import com.typesafe.config.ConfigFactory

 object ReplicatorChaosSpec extends MultiNodeConfig {
  val first = role("first")
@ -38,8 +39,8 @@ class ReplicatorChaosSpecMultiJvmNode4 extends ReplicatorChaosSpec
 class ReplicatorChaosSpecMultiJvmNode5 extends ReplicatorChaosSpec

 class ReplicatorChaosSpec extends MultiNodeSpec(ReplicatorChaosSpec) with STMultiNodeSpec with ImplicitSender {
-  import ReplicatorChaosSpec._
  import Replicator._
+  import ReplicatorChaosSpec._

  override def initialParticipants = roles.size

--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorDeltaSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorDeltaSpec.scala
@ -8,6 +8,8 @@ import java.util.concurrent.ThreadLocalRandom

 import scala.concurrent.duration._

+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
 import akka.cluster.ddata.Replicator._
 import akka.remote.testconductor.RoleName
@ -15,7 +17,6 @@ import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.serialization.jackson.CborSerializable
 import akka.testkit._
-import com.typesafe.config.ConfigFactory

 object ReplicatorDeltaSpec extends MultiNodeConfig {
  val first = role("first")
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorMapDeltaSpec.scala
@ -7,14 +7,16 @@ package akka.cluster.ddata
 import java.util.concurrent.ThreadLocalRandom

 import scala.concurrent.duration._
+
+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
 import akka.cluster.ddata.Replicator._
+import akka.event.Logging.Error
 import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
-import com.typesafe.config.ConfigFactory
-import akka.event.Logging.Error

 object ReplicatorMapDeltaSpec extends MultiNodeConfig {
  val first = role("first")
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorORSetDeltaSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorORSetDeltaSpec.scala
@ -6,13 +6,14 @@ package akka.cluster.ddata

 import scala.concurrent.duration._

+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
 import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.remote.transport.ThrottlerTransportAdapter.Direction
 import akka.testkit._
-import com.typesafe.config.ConfigFactory

 object ReplicatorORSetDeltaSpec extends MultiNodeConfig {
  val first = role("first")
--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorPruningSpec.scala
@ -6,6 +6,8 @@ package akka.cluster.ddata

 import scala.concurrent.duration._

+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
 import akka.cluster.ClusterEvent.InitialStateAsEvents
 import akka.cluster.ClusterEvent.MemberUp
@ -13,7 +15,6 @@ import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
-import com.typesafe.config.ConfigFactory

 object ReplicatorPruningSpec extends MultiNodeConfig {
  val first = role("first")
@ -36,8 +37,8 @@ class ReplicatorPruningSpecMultiJvmNode2 extends ReplicatorPruningSpec
 class ReplicatorPruningSpecMultiJvmNode3 extends ReplicatorPruningSpec

 class ReplicatorPruningSpec extends MultiNodeSpec(ReplicatorPruningSpec) with STMultiNodeSpec with ImplicitSender {
-  import ReplicatorPruningSpec._
  import Replicator._
+  import ReplicatorPruningSpec._

  override def initialParticipants = roles.size

--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/ReplicatorSpec.scala
@ -7,15 +7,16 @@ package akka.cluster.ddata
 import scala.concurrent.Await
 import scala.concurrent.duration._

-import akka.pattern.ask
+import com.typesafe.config.ConfigFactory
+
 import akka.cluster.Cluster
+import akka.pattern.ask
 import akka.remote.testconductor.RoleName
 import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.remote.transport.ThrottlerTransportAdapter.Direction
 import akka.testkit._
 import akka.util.Timeout
-import com.typesafe.config.ConfigFactory

 object ReplicatorSpec extends MultiNodeConfig {
  val first = role("first")
@ -38,8 +39,8 @@ class ReplicatorSpecMultiJvmNode2 extends ReplicatorSpec
 class ReplicatorSpecMultiJvmNode3 extends ReplicatorSpec

 class ReplicatorSpec extends MultiNodeSpec(ReplicatorSpec) with STMultiNodeSpec with ImplicitSender {
-  import ReplicatorSpec._
  import Replicator._
+  import ReplicatorSpec._

  override def initialParticipants = roles.size

--- a/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala
+++ b/akka-distributed-data/src/multi-jvm/scala/akka/cluster/ddata/STMultiNodeSpec.scala
@ -4,11 +4,12 @@

 package akka.cluster.ddata

-import akka.remote.testkit.MultiNodeSpecCallbacks
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike

+import akka.remote.testkit.MultiNodeSpecCallbacks
+
 /**
 * Hooks up MultiNodeSpec with ScalaTest
 */