chore: Sort imports on stream,stream-tests,stream-testkit

apache · Jan 16, 2024 · 858b94b · 858b94b
1 parent b2cd306
commit 858b94b
Show file tree

Hide file tree

Showing 128 changed files with 327 additions and 290 deletions.
diff --git a/...-testkit/src/test/scala/org/apache/pekko/stream/impl/fusing/GraphInterpreterSpecKit.scala b/...-testkit/src/test/scala/org/apache/pekko/stream/impl/fusing/GraphInterpreterSpecKit.scala
@@ -13,12 +13,11 @@
 
 package org.apache.pekko.stream.impl.fusing
 
+import scala.annotation.nowarn
 import scala.collection.{ Map => SMap }
 import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.duration.FiniteDuration
 
-import scala.annotation.nowarn
-
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.actor.Cancellable

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/BaseTwoStreamsSetup.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/BaseTwoStreamsSetup.scala
@@ -16,13 +16,13 @@ package org.apache.pekko.stream.testkit
 import scala.collection.immutable
 import scala.util.control.NoStackTrace
 
-import org.reactivestreams.Publisher
-
 import org.apache.pekko
 import pekko.stream.scaladsl._
 import pekko.stream.testkit.scaladsl.StreamTestKit._
 import pekko.testkit.PekkoSpec
 
+import org.reactivestreams.Publisher
+
 abstract class BaseTwoStreamsSetup extends PekkoSpec("""
     pekko.stream.materializer.initial-input-buffer-size = 2
     pekko.stream.materializer.max-input-buffer-size = 2

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ChainSetup.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ChainSetup.scala
@@ -14,7 +14,6 @@
 package org.apache.pekko.stream.testkit
 
 import scala.annotation.nowarn
-import org.reactivestreams.Publisher
 
 import org.apache.pekko
 import pekko.NotUsed
@@ -25,6 +24,8 @@ import pekko.stream.ActorMaterializerSettings
 import pekko.stream.Materializer
 import pekko.stream.scaladsl._
 
+import org.reactivestreams.Publisher
+
 class ChainSetup[In, Out, M](
     stream: Flow[In, In, NotUsed] => Flow[In, Out, M],
     val settings: ActorMaterializerSettings,

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ScriptedTest.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/ScriptedTest.scala
@@ -15,13 +15,10 @@ package org.apache.pekko.stream.testkit
 
 import java.util.concurrent.ThreadLocalRandom
 
+import scala.annotation.nowarn
 import scala.annotation.tailrec
 import scala.concurrent.duration._
 
-import scala.annotation.nowarn
-import org.reactivestreams.Publisher
-import org.scalatest.matchers.should.Matchers
-
 import org.apache.pekko
 import pekko.NotUsed
 import pekko.actor.ActorSystem
@@ -34,6 +31,10 @@ import pekko.stream.scaladsl.Source
 import pekko.stream.testkit.TestPublisher._
 import pekko.stream.testkit.TestSubscriber._
 
+import org.reactivestreams.Publisher
+
+import org.scalatest.matchers.should.Matchers
+
 trait ScriptedTest extends Matchers {
 
   class ScriptException(msg: String) extends RuntimeException(msg)

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/StreamSpec.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/StreamSpec.scala
@@ -16,18 +16,19 @@ package org.apache.pekko.stream.testkit
 import scala.concurrent.Future
 import scala.concurrent.duration._
 
-import com.typesafe.config.{ Config, ConfigFactory }
-import org.scalatest.Failed
-
 import org.apache.pekko
 import pekko.actor.{ ActorRef, ActorSystem }
+import pekko.stream.Materializer
+import pekko.stream.impl.PhasedFusingActorMaterializer
 import pekko.stream.impl.StreamSupervisor
 import pekko.stream.snapshot.{ MaterializerState, StreamSnapshotImpl }
+import pekko.stream.testkit.scaladsl.StreamTestKit.{ assertNoChildren, stopAllChildren }
 import pekko.testkit.{ PekkoSpec, TestProbe }
 import pekko.testkit.TestKitUtils
-import pekko.stream.impl.PhasedFusingActorMaterializer
-import pekko.stream.testkit.scaladsl.StreamTestKit.{ assertNoChildren, stopAllChildren }
-import pekko.stream.Materializer
+
+import org.scalatest.Failed
+
+import com.typesafe.config.{ Config, ConfigFactory }
 
 abstract class StreamSpec(_system: ActorSystem) extends PekkoSpec(_system) {
   def this(config: Config) =

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/StreamTestDefaultMailbox.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/StreamTestDefaultMailbox.scala
@@ -13,8 +13,6 @@
 
 package org.apache.pekko.stream.testkit
 
-import com.typesafe.config.Config
-
 import org.apache.pekko
 import pekko.actor.Actor
 import pekko.actor.ActorRef
@@ -26,6 +24,8 @@ import pekko.dispatch.ProducesMessageQueue
 import pekko.dispatch.UnboundedMailbox
 import pekko.stream.impl.MaterializerGuardian
 
+import com.typesafe.config.Config
+
 /**
  * INTERNAL API
  * This mailbox is only used in tests to verify that stream actors are using

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/StreamTestKitSpec.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/StreamTestKitSpec.scala
@@ -13,16 +13,17 @@
 
 package org.apache.pekko.stream.testkit
 
+import java.util
+
 import scala.concurrent.duration._
+
 import org.apache.pekko
 import pekko.stream.scaladsl.Source
 import pekko.stream.testkit.scaladsl.TestSink
 import pekko.testkit._
 import pekko.testkit.TestEvent.Mute
 import pekko.testkit.TestEvent.UnMute
 
-import java.util
-
 class StreamTestKitSpec extends PekkoSpec {
 
   val ex = new Exception("Boom!")

diff --git a/...-testkit/src/test/scala/org/apache/pekko/stream/testkit/TestPublisherSubscriberSpec.scala b/...-testkit/src/test/scala/org/apache/pekko/stream/testkit/TestPublisherSubscriberSpec.scala
@@ -13,8 +13,6 @@
 
 package org.apache.pekko.stream.testkit
 
-import org.reactivestreams.Subscription
-
 import org.apache.pekko
 import pekko.stream.scaladsl.Sink
 import pekko.stream.scaladsl.Source
@@ -23,6 +21,8 @@ import pekko.stream.testkit.TestSubscriber._
 import pekko.stream.testkit.scaladsl.StreamTestKit._
 import pekko.testkit.PekkoSpec
 
+import org.reactivestreams.Subscription
+
 class TestPublisherSubscriberSpec extends PekkoSpec("""
     pekko.stream.materializer.initial-input-buffer-size = 2
     pekko.stream.materializer.max-input-buffer-size = 2

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/TwoStreamsSetup.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/TwoStreamsSetup.scala
@@ -13,12 +13,12 @@
 
 package org.apache.pekko.stream.testkit
 
-import org.reactivestreams.Publisher
-
 import org.apache.pekko
 import pekko.stream._
 import pekko.stream.scaladsl._
 
+import org.reactivestreams.Publisher
+
 abstract class TwoStreamsSetup extends BaseTwoStreamsSetup {
 
   abstract class Fixture {

diff --git a/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/Utils.scala b/stream-testkit/src/test/scala/org/apache/pekko/stream/testkit/Utils.scala
@@ -15,12 +15,12 @@ package org.apache.pekko.stream.testkit
 
 import scala.util.control.NoStackTrace
 
-import com.typesafe.config.ConfigFactory
-
 import org.apache.pekko
 import pekko.actor.ActorRef
 import pekko.actor.ActorRefWithCell
 
+import com.typesafe.config.ConfigFactory
+
 object Utils {
 
   /** Sets the default-mailbox to the usual [[pekko.dispatch.UnboundedMailbox]] instead of [[StreamTestDefaultMailbox]]. */

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 {