chore: Update import group in scalafix.conf and sort imports of strea…

…m and stream-tests
apache · Jan 15, 2024 · ae53336 · ae53336
1 parent 8760939
commit ae53336
Show file tree

Hide file tree

Showing 119 changed files with 303 additions and 266 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -46,7 +46,10 @@ SortImports.blocks = [
   "scala.",
   "*",
   "com.sun."
-  "org.apache.pekko."
+  "re:^(org\\.apache\\.pekko|pekko\\.)\\w*"
   "org.reactivestreams."
   "io.netty."
+  "org.scalatest."
+  "org.slf4j."
+  "com.typesafe."
 ]
diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/ActorMaterializerSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/ActorMaterializerSpec.scala
@@ -19,8 +19,6 @@ import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.{ Failure, Try }
 
-import com.typesafe.config.ConfigFactory
-
 import org.apache.pekko
 import pekko.Done
 import pekko.actor.{ Actor, ActorSystem, PoisonPill, Props }
@@ -35,6 +33,8 @@ import pekko.stream.testkit.{ StreamSpec, TestPublisher }
 import pekko.testkit.{ ImplicitSender, TestProbe }
 import pekko.testkit.TestKit
 
+import com.typesafe.config.ConfigFactory
+
 object IndirectMaterializerCreation extends ExtensionId[IndirectMaterializerCreation] with ExtensionIdProvider {
   def createExtension(system: ExtendedActorSystem): IndirectMaterializerCreation =
     new IndirectMaterializerCreation(system)

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/DslConsistencySpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/DslConsistencySpec.scala
@@ -16,9 +16,10 @@ package org.apache.pekko.stream
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 
-import org.apache.pekko
 import scala.annotation.nowarn
 
+import org.apache.pekko
+
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/DslFactoriesConsistencySpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/DslFactoriesConsistencySpec.scala
@@ -14,6 +14,7 @@
 package org.apache.pekko.stream
 
 import org.apache.pekko
+
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/SystemMaterializerSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/SystemMaterializerSpec.scala
@@ -15,14 +15,14 @@ package org.apache.pekko.stream
 
 import scala.concurrent.Future
 
-import org.scalatest.concurrent.ScalaFutures
-
 import org.apache.pekko
 import pekko.stream.scaladsl.Keep
 import pekko.stream.scaladsl.Sink
 import pekko.stream.scaladsl.Source
 import pekko.stream.testkit.StreamSpec
 
+import org.scalatest.concurrent.ScalaFutures
+
 class SystemMaterializerSpec extends StreamSpec with ScalaFutures {
 
   def compileOnly(): Unit = {

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/GraphStageLogicSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/GraphStageLogicSpec.scala
@@ -15,8 +15,6 @@ package org.apache.pekko.stream.impl
 
 import scala.concurrent.duration.Duration
 
-import org.scalatest.concurrent.ScalaFutures
-
 import org.apache.pekko
 import pekko.NotUsed
 import pekko.stream._
@@ -27,6 +25,8 @@ import pekko.stream.stage.GraphStageLogic.{ EagerTerminateInput, EagerTerminateO
 import pekko.stream.testkit.StreamSpec
 import pekko.stream.testkit.scaladsl.TestSink
 
+import org.scalatest.concurrent.ScalaFutures
+
 class GraphStageLogicSpec extends StreamSpec with GraphInterpreterSpecKit with ScalaFutures {
 
   object emit1234 extends GraphStage[FlowShape[Int, Int]] {

diff --git a/...ests/src/test/scala/org/apache/pekko/stream/impl/ResizableMultiReaderRingBufferSpec.scala b/...ests/src/test/scala/org/apache/pekko/stream/impl/ResizableMultiReaderRingBufferSpec.scala
@@ -15,11 +15,11 @@ package org.apache.pekko.stream.impl
 
 import scala.util.Random
 
+import org.apache.pekko.stream.impl.ResizableMultiReaderRingBuffer._
+
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
-import org.apache.pekko.stream.impl.ResizableMultiReaderRingBuffer._
-
 class ResizableMultiReaderRingBufferSpec extends AnyWordSpec with Matchers {
 
   "A ResizableMultiReaderRingBuffer" should {

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/TimeoutsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/TimeoutsSpec.scala
@@ -19,9 +19,6 @@ import scala.concurrent.Await
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
 import org.apache.pekko
 import pekko.Done
 import pekko.stream._
@@ -31,6 +28,9 @@ import pekko.stream.testkit.TestPublisher
 import pekko.stream.testkit.TestSubscriber
 import pekko.stream.testkit.Utils._
 
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
 class TimeoutsSpec extends StreamSpec {
 
   "InitialTimeout" must {

diff --git a/...-tests/src/test/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreterSpec.scala b/...-tests/src/test/scala/org/apache/pekko/stream/impl/fusing/ActorGraphInterpreterSpec.scala
@@ -19,10 +19,6 @@ import scala.concurrent.Await
 import scala.concurrent.Promise
 import scala.concurrent.duration._
 
-import org.reactivestreams.Publisher
-import org.reactivestreams.Subscriber
-import org.reactivestreams.Subscription
-
 import org.apache.pekko
 import pekko.Done
 import pekko.stream._
@@ -40,6 +36,10 @@ import pekko.stream.testkit.Utils._
 import pekko.testkit.EventFilter
 import pekko.testkit.TestLatch
 
+import org.reactivestreams.Publisher
+import org.reactivestreams.Subscriber
+import org.reactivestreams.Subscription
+
 class ActorGraphInterpreterSpec extends StreamSpec {
   "ActorGraphInterpreter" must {
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/impl/io/TLSUtilsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/impl/io/TLSUtilsSpec.scala
@@ -15,13 +15,13 @@ package org.apache.pekko.stream.impl.io
 
 import javax.net.ssl.{ SSLContext, SSLEngine, SSLParameters }
 
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
 import org.apache.pekko
 import pekko.stream.TLSClientAuth
 import pekko.stream.TLSProtocol.NegotiateNewSession
 
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
 class TLSUtilsSpec extends AnyWordSpecLike with Matchers {
 
   "TlsUtils.applySessionParameters" must {

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/DeprecatedTlsSpec.scala
@@ -26,8 +26,6 @@ import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.Random
 
-import com.typesafe.sslconfig.pekko.PekkoSSLConfig
-
 import org.apache.pekko
 import pekko.NotUsed
 import pekko.pattern.{ after => later }
@@ -42,6 +40,8 @@ import pekko.testkit.WithLogCapturing
 import pekko.util.ByteString
 import pekko.util.JavaVersion
 
+import com.typesafe.sslconfig.pekko.PekkoSSLConfig
+
 object DeprecatedTlsSpec {
 
   val rnd = new Random

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSinkSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/FileSinkSpec.scala
@@ -23,7 +23,6 @@ import scala.concurrent.duration._
 import scala.util.Success
 
 import com.google.common.jimfs.{ Configuration, Jimfs }
-import org.scalatest.concurrent.ScalaFutures
 
 import org.apache.pekko
 import pekko.dispatch.ExecutionContexts
@@ -35,6 +34,8 @@ import pekko.stream.testkit._
 import pekko.stream.testkit.Utils._
 import pekko.util.ByteString
 
+import org.scalatest.concurrent.ScalaFutures
+
 @nowarn
 class FileSinkSpec extends StreamSpec(UnboundedMailboxConfig) with ScalaFutures {
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/OutputStreamSinkSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/OutputStreamSinkSpec.scala
@@ -18,8 +18,6 @@ import java.io.OutputStream
 import scala.annotation.nowarn
 import scala.util.Success
 
-import org.scalatest.concurrent.ScalaFutures
-
 import org.apache.pekko
 import pekko.Done
 import pekko.stream.{ ActorMaterializer, ActorMaterializerSettings, IOOperationIncompleteException }
@@ -29,6 +27,8 @@ import pekko.stream.testkit.Utils._
 import pekko.testkit.TestProbe
 import pekko.util.ByteString
 
+import org.scalatest.concurrent.ScalaFutures
+
 @nowarn
 class OutputStreamSinkSpec extends StreamSpec(UnboundedMailboxConfig) with ScalaFutures {
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/TcpSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/TcpSpec.scala
@@ -25,11 +25,6 @@ import scala.concurrent.Future
 import scala.concurrent.Promise
 import scala.concurrent.duration._
 
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-import org.scalatest.concurrent.PatienceConfiguration
-import org.scalatest.concurrent.PatienceConfiguration.Timeout
-
 import org.apache.pekko
 import pekko.Done
 import pekko.NotUsed
@@ -59,6 +54,12 @@ import pekko.testkit.TestProbe
 import pekko.testkit.WithLogCapturing
 import pekko.util.ByteString
 
+import org.scalatest.concurrent.PatienceConfiguration
+import org.scalatest.concurrent.PatienceConfiguration.Timeout
+
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
 @nowarn("msg=never used")
 class NonResolvingDnsActor(cache: SimpleDnsCache, config: Config) extends Actor {
   def receive = {
@@ -1021,12 +1022,12 @@ class TcpSpec extends StreamSpec("""
       import java.security.KeyStore
       import javax.net.ssl._
 
-      import com.typesafe.sslconfig.pekko.PekkoSSLConfig
-
       import org.apache.pekko
       import pekko.stream.TLSClientAuth
       import pekko.stream.TLSProtocol
 
+      import com.typesafe.sslconfig.pekko.PekkoSSLConfig
+
       val sslConfig = PekkoSSLConfig(system)
 
       // Don't hardcode your password in actual code

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CodecSpecSupport.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CodecSpecSupport.scala
@@ -13,15 +13,15 @@
 
 package org.apache.pekko.stream.io.compression
 
-import org.scalatest.BeforeAndAfterAll
-import org.scalatest.Suite
-import org.scalatest.matchers.should.Matchers
-
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.testkit.TestKit
 import pekko.util.ByteString
 
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.Suite
+import org.scalatest.matchers.should.Matchers
+
 trait CodecSpecSupport extends Matchers with BeforeAndAfterAll { self: Suite =>
 
   def readAs(string: String, charset: String = "UTF8") =

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CoderSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/io/compression/CoderSpec.scala
@@ -22,15 +22,15 @@ import scala.concurrent.Await
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 
-import org.scalatest.Inspectors
-import org.scalatest.wordspec.AnyWordSpec
-
 import org.apache.pekko
 import pekko.NotUsed
 import pekko.stream.impl.io.compression.Compressor
 import pekko.stream.scaladsl.{ Compression, Flow, Sink, Source }
 import pekko.util.ByteString
 
+import org.scalatest.Inspectors
+import org.scalatest.wordspec.AnyWordSpec
+
 abstract class CoderSpec(codecName: String) extends AnyWordSpec with CodecSpecSupport with Inspectors {
   import CompressionTestingTools._
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/ActorRefSourceSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/ActorRefSourceSpec.scala
@@ -16,8 +16,6 @@ package org.apache.pekko.stream.scaladsl
 import scala.annotation.nowarn
 import scala.concurrent.duration._
 
-import org.reactivestreams.Publisher
-
 import org.apache.pekko
 import pekko.Done
 import pekko.actor.{ ActorRef, Status }
@@ -26,6 +24,8 @@ import pekko.stream.testkit._
 import pekko.stream.testkit.Utils._
 import pekko.stream.testkit.scaladsl._
 
+import org.reactivestreams.Publisher
+
 @nowarn("msg=deprecated")
 class ActorRefSourceSpec extends StreamSpec {
 

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AggregateWithBoundarySpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AggregateWithBoundarySpec.scala
@@ -17,16 +17,17 @@ import scala.collection.mutable.ListBuffer
 import scala.concurrent.Await
 import scala.concurrent.duration._
 
-import com.typesafe.config.{ ConfigFactory, ConfigValueFactory }
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.stream.OverflowStrategy
 import pekko.stream.testkit.{ StreamSpec, TestPublisher, TestSubscriber }
 import pekko.testkit.{ ExplicitlyTriggeredScheduler, PekkoSpec }
 
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
+import com.typesafe.config.{ ConfigFactory, ConfigValueFactory }
+
 class AggregateWithBoundarySpec extends StreamSpec {
 
   "split aggregator by size" in {

diff --git a/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AttributesSpec.scala b/stream-tests/src/test/scala/org/apache/pekko/stream/scaladsl/AttributesSpec.scala
@@ -14,22 +14,24 @@
 package org.apache.pekko.stream.scaladsl
 
 import java.util.concurrent.{ CompletionStage, TimeUnit }
+
 import scala.annotation.nowarn
 
-import com.typesafe.config.ConfigFactory
 import org.apache.pekko
 import pekko.{ Done, NotUsed }
 import pekko.actor.ActorSystem
 import pekko.dispatch.Dispatchers
-import pekko.stream.ActorAttributes.Dispatcher
 import pekko.stream._
+import pekko.stream.ActorAttributes.Dispatcher
 import pekko.stream.Attributes._
 import pekko.stream.javadsl
-import pekko.stream.stage._
 import pekko.stream.snapshot.MaterializerState
+import pekko.stream.stage._
 import pekko.stream.testkit._
 import pekko.testkit.TestKit
 
+import com.typesafe.config.ConfigFactory
+
 object AttributesSpec {
 
   class AttributesSource(_initialAttributes: Attributes = Attributes.none)

diff --git a/...am-tests/src/test/scala/org/apache/pekko/stream/scaladsl/CoupledTerminationFlowSpec.scala b/...am-tests/src/test/scala/org/apache/pekko/stream/scaladsl/CoupledTerminationFlowSpec.scala
@@ -19,11 +19,6 @@ import scala.util.Success
 import scala.util.Try
 import scala.xml.Node
 
-import org.reactivestreams.Publisher
-import org.reactivestreams.Subscriber
-import org.reactivestreams.Subscription
-import org.scalatest.Assertion
-
 import org.apache.pekko
 import pekko.Done
 import pekko.NotUsed
@@ -32,6 +27,12 @@ import pekko.stream.testkit._
 import pekko.stream.testkit.scaladsl.TestSource
 import pekko.testkit.TestProbe
 
+import org.reactivestreams.Publisher
+import org.reactivestreams.Subscriber
+import org.reactivestreams.Subscription
+
+import org.scalatest.Assertion
+
 class CoupledTerminationFlowSpec extends StreamSpec("""
     pekko.stream.materializer.initial-input-buffer-size = 2
   """) with ScriptedTest {