chore: sort imports for pekko-stream

apache · Jan 13, 2024 · 764d307 · 764d307
1 parent 651437e
commit 764d307
Show file tree

Hide file tree

Showing 66 changed files with 155 additions and 139 deletions.
diff --git a/stream/src/main/scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala b/stream/src/main/scala/com/typesafe/sslconfig/pekko/PekkoSSLConfig.scala
@@ -15,14 +15,17 @@ package com.typesafe.sslconfig.pekko
 
 import java.util.Collections
 import javax.net.ssl._
-import com.typesafe.sslconfig.pekko.util.PekkoLoggerFactory
-import com.typesafe.sslconfig.ssl._
-import com.typesafe.sslconfig.util.LoggerFactory
+
+import scala.annotation.nowarn
+
 import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.InternalApi
 import pekko.event.Logging
-import scala.annotation.nowarn
+
+import com.typesafe.sslconfig.pekko.util.PekkoLoggerFactory
+import com.typesafe.sslconfig.ssl._
+import com.typesafe.sslconfig.util.LoggerFactory
 
 @deprecated("Use Tcp and TLS with SSLEngine parameters instead. Setup the SSLEngine with needed parameters.",
   "Akka 2.6.0")

diff --git a/stream/src/main/scala/com/typesafe/sslconfig/pekko/util/PekkoLoggerBridge.scala b/stream/src/main/scala/com/typesafe/sslconfig/pekko/util/PekkoLoggerBridge.scala
@@ -13,13 +13,13 @@
 
 package com.typesafe.sslconfig.pekko.util
 
-import com.typesafe.sslconfig.util.{ LoggerFactory, NoDepsLogger }
-
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.event.{ DummyClassForStringSources, EventStream }
 import pekko.event.Logging._
 
+import com.typesafe.sslconfig.util.{ LoggerFactory, NoDepsLogger }
+
 final class PekkoLoggerFactory(system: ActorSystem) extends LoggerFactory {
   override def apply(clazz: Class[_]): NoDepsLogger = new PekkoLoggerBridge(system.eventStream, clazz)
 

diff --git a/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala b/stream/src/main/scala/org/apache/pekko/stream/ActorMaterializer.scala
@@ -15,13 +15,10 @@ package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
+import scala.annotation.nowarn
 import scala.concurrent.duration._
 import scala.util.control.NoStackTrace
 
-import scala.annotation.nowarn
-import com.typesafe.config.Config
-import com.typesafe.config.ConfigFactory
-
 import org.apache.pekko
 import pekko.actor.ActorContext
 import pekko.actor.ActorRef
@@ -36,6 +33,9 @@ import pekko.stream.impl._
 import pekko.stream.stage.GraphStageLogic
 import pekko.util.Helpers.toRootLowerCase
 
+import com.typesafe.config.Config
+import com.typesafe.config.ConfigFactory
+
 object ActorMaterializer {
 
   /**

diff --git a/stream/src/main/scala/org/apache/pekko/stream/IOResult.scala b/stream/src/main/scala/org/apache/pekko/stream/IOResult.scala
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.stream
 
+import scala.annotation.nowarn
 import scala.util.{ Failure, Success, Try }
 import scala.util.control.NoStackTrace
 
-import scala.annotation.nowarn
-
 import org.apache.pekko
 import pekko.Done
 

diff --git a/stream/src/main/scala/org/apache/pekko/stream/MapAsyncPartitioned.scala b/stream/src/main/scala/org/apache/pekko/stream/MapAsyncPartitioned.scala
@@ -19,8 +19,8 @@ package org.apache.pekko.stream
 
 import scala.collection.mutable
 import scala.concurrent.Future
-import scala.util.control.{ NoStackTrace, NonFatal }
 import scala.util.{ Failure, Success, Try }
+import scala.util.control.{ NoStackTrace, NonFatal }
 
 import org.apache.pekko
 import pekko.annotation.InternalApi

diff --git a/stream/src/main/scala/org/apache/pekko/stream/Materializer.scala b/stream/src/main/scala/org/apache/pekko/stream/Materializer.scala
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.stream
 
+import scala.annotation.{ implicitNotFound, nowarn }
 import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.duration.FiniteDuration
 
-import scala.annotation.{ implicitNotFound, nowarn }
-
 import org.apache.pekko
 import pekko.actor.ActorRef
 import pekko.actor.ActorSystem

diff --git a/stream/src/main/scala/org/apache/pekko/stream/RestartSettings.scala b/stream/src/main/scala/org/apache/pekko/stream/RestartSettings.scala
@@ -14,6 +14,7 @@
 package org.apache.pekko.stream
 
 import scala.concurrent.duration.FiniteDuration
+
 import org.apache.pekko
 import pekko.event.Logging
 import pekko.event.Logging.LogLevel

diff --git a/stream/src/main/scala/org/apache/pekko/stream/StreamRefSettings.scala b/stream/src/main/scala/org/apache/pekko/stream/StreamRefSettings.scala
@@ -15,16 +15,16 @@ package org.apache.pekko.stream
 
 import java.util.concurrent.TimeUnit
 
-import scala.concurrent.duration._
-
 import scala.annotation.nowarn
-import com.typesafe.config.Config
+import scala.concurrent.duration._
 
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.annotation.DoNotInherit
 import pekko.stream.impl.streamref.StreamRefSettingsImpl
 
+import com.typesafe.config.Config
+
 @nowarn("msg=deprecated")
 object StreamRefSettings {
 

diff --git a/stream/src/main/scala/org/apache/pekko/stream/StreamTimeoutException.scala b/stream/src/main/scala/org/apache/pekko/stream/StreamTimeoutException.scala
@@ -17,12 +17,12 @@
 
 package org.apache.pekko.stream
 
-import org.apache.pekko
-import pekko.annotation.DoNotInherit
-
 import scala.concurrent.TimeoutException
 import scala.util.control.NoStackTrace
 
+import org.apache.pekko
+import pekko.annotation.DoNotInherit
+
 /**
  * Base class for timeout exceptions specific to Pekko Streams
  *

diff --git a/stream/src/main/scala/org/apache/pekko/stream/SubscriptionWithCancelException.scala b/stream/src/main/scala/org/apache/pekko/stream/SubscriptionWithCancelException.scala
@@ -15,10 +15,10 @@ package org.apache.pekko.stream
 
 import scala.util.control.NoStackTrace
 
-import org.reactivestreams.Subscription
-
 import org.apache.pekko.annotation.DoNotInherit
 
+import org.reactivestreams.Subscription
+
 /**
  * Extension of Subscription that allows to pass a cause when a subscription is cancelled.
  *

diff --git a/stream/src/main/scala/org/apache/pekko/stream/SubstreamCancelStrategy.scala b/stream/src/main/scala/org/apache/pekko/stream/SubstreamCancelStrategy.scala
@@ -13,10 +13,10 @@
 
 package org.apache.pekko.stream
 
-import SubstreamCancelStrategies._
-
 import scala.annotation.nowarn
 
+import SubstreamCancelStrategies._
+
 /**
  * Represents a strategy that decides how to deal with substream events.
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/SystemMaterializer.scala b/stream/src/main/scala/org/apache/pekko/stream/SystemMaterializer.scala
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.stream
 
+import scala.annotation.nowarn
 import scala.concurrent.Await
 import scala.concurrent.Promise
 
-import scala.annotation.nowarn
-
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.actor.ClassicActorSystemProvider

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorMaterializerImpl.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorMaterializerImpl.scala
@@ -15,10 +15,11 @@ package org.apache.pekko.stream.impl
 
 import java.util.concurrent.atomic.AtomicBoolean
 
+import scala.annotation.nowarn
 import scala.collection.immutable
 import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.duration._
-import scala.annotation.nowarn
+
 import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.DoNotInherit

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorProcessor.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorProcessor.scala
@@ -13,8 +13,6 @@
 
 package org.apache.pekko.stream.impl
 
-import org.reactivestreams.{ Processor, Subscriber, Subscription }
-
 import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.InternalApi
@@ -24,6 +22,8 @@ import pekko.stream.ActorAttributes
 import pekko.stream.impl.ActorSubscriberMessage.{ OnComplete, OnError, OnNext, OnSubscribe }
 import pekko.util.unused
 
+import org.reactivestreams.{ Processor, Subscriber, Subscription }
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorPublisher.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorPublisher.scala
@@ -19,13 +19,13 @@ import scala.annotation.tailrec
 import scala.collection.immutable
 import scala.util.control.NoStackTrace
 
-import org.reactivestreams.{ Publisher, Subscriber }
-import org.reactivestreams.Subscription
-
 import org.apache.pekko
 import pekko.actor.{ Actor, ActorRef, Terminated }
 import pekko.annotation.InternalApi
 
+import org.reactivestreams.{ Publisher, Subscriber }
+import org.reactivestreams.Subscription
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorRefBackpressureSinkStage.scala
@@ -13,16 +13,16 @@
 
 package org.apache.pekko.stream.impl
 
+import java.util
+
 import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.InternalApi
-import pekko.stream.Attributes.InputBuffer
 import pekko.stream._
+import pekko.stream.Attributes.InputBuffer
 import pekko.stream.impl.Stages.DefaultAttributes
 import pekko.stream.stage._
 
-import java.util
-
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/ActorSubscriberMessage.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/ActorSubscriberMessage.scala
@@ -13,13 +13,13 @@
 
 package org.apache.pekko.stream.impl
 
-import org.reactivestreams.Subscription
-
 import org.apache.pekko
 import pekko.actor.DeadLetterSuppression
 import pekko.actor.NoSerializationVerificationNeeded
 import pekko.annotation.InternalApi
 
+import org.reactivestreams.Subscription
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/Buffers.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/Buffers.scala
@@ -14,6 +14,7 @@
 package org.apache.pekko.stream.impl
 
 import java.{ util => ju }
+
 import org.apache.pekko
 import pekko.annotation.{ InternalApi, InternalStableApi }
 import pekko.stream._

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/CompletedPublishers.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/CompletedPublishers.scala
@@ -13,10 +13,10 @@
 
 package org.apache.pekko.stream.impl
 
-import org.reactivestreams.{ Publisher, Subscriber, Subscription }
-
 import org.apache.pekko.annotation.InternalApi
 
+import org.reactivestreams.{ Publisher, Subscriber, Subscription }
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/FanIn.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/FanIn.scala
@@ -13,8 +13,6 @@
 
 package org.apache.pekko.stream.impl
 
-import org.reactivestreams.{ Subscriber, Subscription }
-
 import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.{ DoNotInherit, InternalApi }
@@ -23,6 +21,8 @@ import pekko.stream.ActorAttributes
 import pekko.stream.Attributes
 import pekko.util.unused
 
+import org.reactivestreams.{ Subscriber, Subscription }
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/FanOut.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/FanOut.scala
@@ -15,8 +15,6 @@ package org.apache.pekko.stream.impl
 
 import scala.collection.immutable
 
-import org.reactivestreams.Subscription
-
 import org.apache.pekko
 import pekko.actor._
 import pekko.annotation.{ DoNotInherit, InternalApi }
@@ -25,6 +23,8 @@ import pekko.stream.ActorAttributes
 import pekko.stream.Attributes
 import pekko.util.unused
 
+import org.reactivestreams.Subscription
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/FanoutProcessor.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/FanoutProcessor.scala
@@ -13,8 +13,6 @@
 
 package org.apache.pekko.stream.impl
 
-import org.reactivestreams.Subscriber
-
 import org.apache.pekko
 import pekko.actor.Actor
 import pekko.actor.ActorRef
@@ -26,6 +24,8 @@ import pekko.stream.Attributes
 import pekko.stream.StreamSubscriptionTimeoutTerminationMode
 import pekko.util.OptionVal
 
+import org.reactivestreams.Subscriber
+
 /**
  * INTERNAL API
  */

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/JsonObjectParser.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/JsonObjectParser.scala
@@ -14,6 +14,7 @@
 package org.apache.pekko.stream.impl
 
 import scala.annotation.switch
+
 import org.apache.pekko
 import pekko.annotation.InternalApi
 import pekko.stream.scaladsl.Framing.FramingException

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/LazySource.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/LazySource.scala
@@ -15,10 +15,11 @@ package org.apache.pekko.stream.impl
 
 import scala.concurrent.{ Future, Promise }
 import scala.util.control.NonFatal
+
 import org.apache.pekko
 import pekko.annotation.InternalApi
-import pekko.stream.Attributes.SourceLocation
 import pekko.stream._
+import pekko.stream.Attributes.SourceLocation
 import pekko.stream.impl.Stages.DefaultAttributes
 import pekko.stream.scaladsl.{ Keep, Source }
 import pekko.stream.stage._

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/MaterializerGuardian.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/MaterializerGuardian.scala
@@ -13,9 +13,8 @@
 
 package org.apache.pekko.stream.impl
 
-import scala.concurrent.Promise
-
 import scala.annotation.nowarn
+import scala.concurrent.Promise
 
 import org.apache.pekko
 import pekko.actor.Actor

diff --git a/stream/src/main/scala/org/apache/pekko/stream/impl/Modules.scala b/stream/src/main/scala/org/apache/pekko/stream/impl/Modules.scala
@@ -15,15 +15,15 @@ package org.apache.pekko.stream.impl
 
 import scala.annotation.unchecked.uncheckedVariance
 
-import org.reactivestreams._
-
 import org.apache.pekko
 import pekko.NotUsed
 import pekko.annotation.{ DoNotInherit, InternalApi }
 import pekko.event.Logging
 import pekko.stream._
 import pekko.stream.impl.StreamLayout.AtomicModule
 
+import org.reactivestreams._
+
 /**
  * INTERNAL API
  */