diff --git a/.scalafix.conf b/.scalafix.conf index 50c6e050c2..c4c957b7a4 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -1,6 +1,7 @@ // .scalafix.conf rules = [ RemoveUnused + SortImports ExplicitResultTypes "github:ohze/scalafix-rules/ExplicitNonNullaryApply" "github:ohze/scalafix-rules/ConstructorProcedureSyntax" @@ -21,7 +22,11 @@ ignored-files = [ "FlowPrependSpec.scala", "FlowZipSpec.scala", "FlowZipWithSpec.scala", - "FlowZipWithIndexSpec.scala" + "FlowZipWithIndexSpec.scala", + "SourceSpec.scala", + "StatsSampleSpec.scala", + "ActorFlowSpec.scala", + "FSMTimingSpec.scala" ] //ignored packages @@ -29,3 +34,13 @@ ignored-packages = [ "doc", "jdoc" ] + +//sort imports, see https://github.com/NeQuissimus/sort-imports +SortImports.asciiSort = false +SortImports.blocks = [ + "java.", + "scala.", + "*", + "com.sun." + "akka." +] \ No newline at end of file diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala index c53e677d6c..da032cdec0 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala @@ -6,13 +6,14 @@ package akka.actor.testkit.typed import java.util.Optional -import akka.annotation.InternalApi -import akka.util.OptionVal import scala.compat.java8.OptionConverters._ import org.slf4j.Marker import org.slf4j.event.Level +import akka.annotation.InternalApi +import akka.util.OptionVal + /** * Representation of a Log Event issued by a [[akka.actor.typed.Behavior]] * when testing with [[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala index 9c68fa826c..7cb74717e6 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/Effect.scala @@ -4,14 +4,14 @@ package akka.actor.testkit.typed +import scala.compat.java8.FunctionConverters._ +import scala.concurrent.duration.FiniteDuration + import akka.actor.typed.{ ActorRef, Behavior, Props } import akka.annotation.{ DoNotInherit, InternalApi } import akka.util.JavaDurationConverters._ import akka.util.unused -import scala.compat.java8.FunctionConverters._ -import scala.concurrent.duration.FiniteDuration - /** * All tracked effects for the [[akka.actor.testkit.typed.scaladsl.BehaviorTestKit]] and * [[akka.actor.testkit.typed.javadsl.BehaviorTestKit]] must extend this type. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala index fe3284b42d..58b2aae3f7 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/LoggingEvent.scala @@ -4,14 +4,15 @@ package akka.actor.testkit.typed -import scala.compat.java8.OptionConverters._ -import akka.util.ccompat.JavaConverters._ - import java.util.Optional +import scala.compat.java8.OptionConverters._ + import org.slf4j.Marker import org.slf4j.event.Level +import akka.util.ccompat.JavaConverters._ + object LoggingEvent { /** diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala index 149447d039..ddbcae89cf 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/TestKitSettings.scala @@ -4,14 +4,15 @@ package akka.actor.testkit.typed -import com.typesafe.config.Config import scala.concurrent.duration.{ Duration, FiniteDuration } -import akka.util.JavaDurationConverters._ -import akka.util.Timeout +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.actor.typed.Extension import akka.actor.typed.ExtensionId +import akka.util.JavaDurationConverters._ +import akka.util.Timeout object TestKitSettings { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala index a430472f1c..035befd6d0 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ActorSystemStub.scala @@ -6,7 +6,17 @@ package akka.actor.testkit.typed.internal import java.util.concurrent.{ CompletionStage, ThreadFactory } -import akka.actor.typed.internal.ActorRefImpl +import scala.compat.java8.FutureConverters +import scala.concurrent._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +import akka.{ actor => classic } +import akka.Done +import akka.actor.{ ActorPath, ActorRefProvider, Address, ReflectiveDynamicAccess } import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior @@ -17,18 +27,9 @@ import akka.actor.typed.ExtensionId import akka.actor.typed.Props import akka.actor.typed.Scheduler import akka.actor.typed.Settings -import akka.annotation.InternalApi -import akka.{ actor => classic } -import akka.Done -import com.typesafe.config.ConfigFactory - -import scala.compat.java8.FutureConverters -import scala.concurrent._ -import akka.actor.{ ActorPath, ActorRefProvider, Address, ReflectiveDynamicAccess } +import akka.actor.typed.internal.ActorRefImpl import akka.actor.typed.internal.InternalRecipientRef -import com.github.ghik.silencer.silent -import org.slf4j.Logger -import org.slf4j.LoggerFactory +import akka.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala index 45dc04c406..776bfd7ed4 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/BehaviorTestKitImpl.scala @@ -6,19 +6,19 @@ package akka.actor.testkit.typed.internal import java.util -import akka.actor.ActorPath -import akka.actor.typed.{ ActorRef, Behavior, PostStop, Signal } -import akka.annotation.InternalApi -import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } -import akka.actor.testkit.typed.Effect._ - import scala.annotation.tailrec -import akka.util.ccompat.JavaConverters._ import scala.collection.immutable import scala.reflect.ClassTag import scala.util.control.Exception.Catcher import scala.util.control.NonFatal +import akka.actor.ActorPath +import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } +import akka.actor.testkit.typed.Effect._ +import akka.actor.typed.{ ActorRef, Behavior, PostStop, Signal } +import akka.annotation.InternalApi +import akka.util.ccompat.JavaConverters._ + /** * INTERNAL API */ diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala index 24388d2035..e3cdbf4b27 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/CapturingAppender.scala @@ -4,10 +4,11 @@ package akka.actor.testkit.typed.internal -import akka.annotation.InternalApi import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.core.AppenderBase +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala index 3c3b20f393..dcfdc8823f 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/ControlledExecutor.scala @@ -6,10 +6,10 @@ package akka.actor.testkit.typed.internal import java.util.LinkedList -import akka.annotation.InternalApi - import scala.concurrent.ExecutionContextExecutor +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala index cdc867c034..dc495f176a 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/DebugRef.scala @@ -6,14 +6,14 @@ package akka.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.typed.ActorRef -import akka.actor.typed.internal.{ ActorRefImpl, SystemMessage } -import akka.annotation.InternalApi -import akka.{ actor => classic } import scala.annotation.tailrec +import akka.{ actor => classic } import akka.actor.ActorRefProvider +import akka.actor.typed.ActorRef +import akka.actor.typed.internal.{ ActorRefImpl, SystemMessage } import akka.actor.typed.internal.InternalRecipientRef +import akka.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala index 246af6185c..dd9d867428 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/EffectfulActorContext.scala @@ -6,15 +6,15 @@ package akka.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.{ ActorPath, Cancellable } -import akka.actor.typed.{ ActorRef, Behavior, Props } -import akka.annotation.InternalApi -import akka.actor.testkit.typed.Effect -import akka.actor.testkit.typed.Effect._ - import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag +import akka.actor.{ ActorPath, Cancellable } +import akka.actor.testkit.typed.Effect +import akka.actor.testkit.typed.Effect._ +import akka.actor.typed.{ ActorRef, Behavior, Props } +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala index 99ec00665f..9d6c683c59 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LogbackUtil.scala @@ -4,10 +4,11 @@ package akka.actor.testkit.typed.internal -import akka.annotation.InternalApi import org.slf4j.LoggerFactory import org.slf4j.event.Level +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala index 37c8a1edad..1b2bf7c4ce 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/LoggingTestKitImpl.scala @@ -10,6 +10,8 @@ import scala.concurrent.duration.Duration import scala.reflect.ClassTag import scala.util.matching.Regex +import org.slf4j.event.Level + import akka.actor.testkit.typed.LoggingEvent import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.javadsl @@ -17,7 +19,6 @@ import akka.actor.testkit.typed.scaladsl import akka.actor.typed.ActorSystem import akka.annotation.InternalApi import akka.testkit.TestKit -import org.slf4j.event.Level /** * INTERNAL API diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala index 18f4f3b6fb..f6fe6e083a 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/StubbedActorContext.scala @@ -4,25 +4,26 @@ package akka.actor.testkit.typed.internal -import akka.actor.typed._ -import akka.actor.typed.internal._ -import akka.actor.testkit.typed.CapturedLogEvent -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.{ ActorPath, InvalidMessageException } -import akka.annotation.InternalApi -import akka.util.Helpers -import akka.{ actor => classic } import java.util.concurrent.ThreadLocalRandom.{ current => rnd } import scala.collection.immutable.TreeMap import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration.FiniteDuration -import akka.actor.ActorRefProvider import org.slf4j.Logger import org.slf4j.helpers.MessageFormatter import org.slf4j.helpers.SubstituteLoggerFactory +import akka.{ actor => classic } +import akka.actor.{ ActorPath, InvalidMessageException } +import akka.actor.ActorRefProvider +import akka.actor.testkit.typed.CapturedLogEvent +import akka.actor.testkit.typed.scaladsl.TestInbox +import akka.actor.typed._ +import akka.actor.typed.internal._ +import akka.annotation.InternalApi +import akka.util.Helpers + /** * INTERNAL API * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala index 558847ed2d..9e9a68bbd5 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestAppender.scala @@ -4,12 +4,13 @@ package akka.actor.testkit.typed.internal -import akka.actor.testkit.typed.LoggingEvent -import akka.annotation.InternalApi import ch.qos.logback.classic.spi.ILoggingEvent import ch.qos.logback.classic.spi.ThrowableProxy import ch.qos.logback.core.AppenderBase +import akka.actor.testkit.typed.LoggingEvent +import akka.annotation.InternalApi + /** * INTERNAL API * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala index 89e56ec163..14b55987fc 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestInboxImpl.scala @@ -6,13 +6,13 @@ package akka.actor.testkit.typed.internal import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.typed.ActorRef -import akka.actor.ActorPath -import akka.annotation.InternalApi - import scala.annotation.tailrec import scala.collection.immutable +import akka.actor.ActorPath +import akka.actor.typed.ActorRef +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala index 88fb2d1ec5..4f9f3e58d0 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestKitUtils.scala @@ -4,16 +4,15 @@ package akka.actor.testkit.typed.internal -import scala.util.control.Exception.Catcher - -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props } -import akka.annotation.InternalApi import scala.concurrent.{ Await, TimeoutException } import scala.concurrent.duration.Duration +import scala.util.control.Exception.Catcher import scala.util.control.NonFatal +import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Props } import akka.actor.typed.scaladsl.ActorContext +import akka.actor.typed.scaladsl.Behaviors +import akka.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala index 39d827a4a0..0639203e28 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/internal/TestProbeImpl.scala @@ -5,23 +5,22 @@ package akka.actor.testkit.typed.internal import java.time.{ Duration => JDuration } +import java.util.{ List => JList } import java.util.concurrent.BlockingDeque import java.util.concurrent.LinkedBlockingDeque import java.util.function.Supplier -import java.util.{ List => JList } import scala.annotation.tailrec -import akka.util.ccompat.JavaConverters._ - import scala.collection.immutable import scala.concurrent.duration._ import scala.reflect.ClassTag import scala.util.control.NonFatal + import akka.actor.testkit.typed.FishingOutcome import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.javadsl.{ TestProbe => JavaTestProbe } -import akka.actor.testkit.typed.scaladsl.TestDuration import akka.actor.testkit.typed.scaladsl.{ TestProbe => ScalaTestProbe } +import akka.actor.testkit.typed.scaladsl.TestDuration import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior @@ -32,6 +31,7 @@ import akka.annotation.InternalApi import akka.util.BoxedType import akka.util.JavaDurationConverters._ import akka.util.PrettyDuration._ +import akka.util.ccompat.JavaConverters._ @InternalApi private[akka] object TestProbeImpl { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala index d84b411dd9..ca30ea4e53 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ActorTestKit.scala @@ -6,6 +6,8 @@ package akka.actor.testkit.typed.javadsl import java.time.Duration +import com.typesafe.config.Config + import akka.actor.DeadLetter import akka.actor.Dropped import akka.actor.UnhandledMessage @@ -19,7 +21,6 @@ import akka.actor.typed.Props import akka.actor.typed.Scheduler import akka.util.JavaDurationConverters._ import akka.util.Timeout -import com.typesafe.config.Config object ActorTestKit { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala index 090e39bf37..07b79bcac4 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/BehaviorTestKit.scala @@ -4,11 +4,12 @@ package akka.actor.testkit.typed.javadsl -import akka.actor.testkit.typed.internal.BehaviorTestKitImpl +import java.util.concurrent.ThreadLocalRandom + import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } +import akka.actor.testkit.typed.internal.BehaviorTestKitImpl import akka.actor.typed.{ ActorRef, Behavior, Signal } import akka.annotation.{ ApiMayChange, DoNotInherit } -import java.util.concurrent.ThreadLocalRandom object BehaviorTestKit { import akka.actor.testkit.typed.scaladsl.TestInbox.address diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala index 419c2a7940..4d0eec7d73 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LogCapturing.scala @@ -6,12 +6,13 @@ package akka.actor.testkit.typed.javadsl import scala.util.control.NonFatal -import akka.actor.testkit.typed.internal.CapturingAppender import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement import org.slf4j.LoggerFactory +import akka.actor.testkit.typed.internal.CapturingAppender + /** * JUnit `TestRule` to make log lines appear only when the test failed. * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala index 9e716d3786..f913b21cbc 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/LoggingTestKit.scala @@ -6,11 +6,12 @@ package akka.actor.testkit.typed.javadsl import java.util.function.Supplier +import org.slf4j.event.Level + import akka.actor.testkit.typed.LoggingEvent import akka.actor.testkit.typed.internal.LoggingTestKitImpl import akka.actor.typed.ActorSystem import akka.annotation.DoNotInherit -import org.slf4j.event.Level /** * Facilities for verifying logs. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala index 71733ebcce..8313ec479b 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/ManualTime.scala @@ -6,13 +6,14 @@ package akka.actor.testkit.typed.javadsl import java.time.Duration +import scala.annotation.varargs + +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.actor.typed.internal.adapter.SchedulerAdapter -import com.typesafe.config.Config import akka.util.JavaDurationConverters._ -import scala.annotation.varargs - /** * Manual time allows you to do async tests while controlling the scheduler of the system. * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala index 3ba7441c43..e1cb6c5a73 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestInbox.scala @@ -4,15 +4,15 @@ package akka.actor.testkit.typed.javadsl -import akka.actor.typed.ActorRef -import akka.annotation.DoNotInherit -import akka.actor.testkit.typed.internal.TestInboxImpl - import java.util.concurrent.ThreadLocalRandom -import akka.util.ccompat.JavaConverters._ import scala.collection.immutable +import akka.actor.testkit.typed.internal.TestInboxImpl +import akka.actor.typed.ActorRef +import akka.annotation.DoNotInherit +import akka.util.ccompat.JavaConverters._ + object TestInbox { import akka.actor.testkit.typed.scaladsl.TestInbox.address diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala index 60646ea605..2cadbaee84 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestKitJunitResource.scala @@ -6,6 +6,11 @@ package akka.actor.testkit.typed.javadsl import java.time.Duration +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.junit.Rule +import org.junit.rules.ExternalResource + import akka.actor.DeadLetter import akka.actor.Dropped import akka.actor.UnhandledMessage @@ -17,10 +22,6 @@ import akka.actor.typed.Behavior import akka.actor.typed.Props import akka.actor.typed.Scheduler import akka.util.Timeout -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.junit.Rule -import org.junit.rules.ExternalResource /** * A Junit external resource for the [[ActorTestKit]], making it possible to have Junit manage the lifecycle of the testkit. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala index d05f0c2eb7..b726374630 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/javadsl/TestProbe.scala @@ -5,8 +5,8 @@ package akka.actor.testkit.typed.javadsl import java.time.Duration -import java.util.function.Supplier import java.util.{ List => JList } +import java.util.function.Supplier import akka.actor.testkit.typed.FishingOutcome import akka.actor.testkit.typed.TestKitSettings diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala index ca5c366857..45109abb42 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKit.scala @@ -6,6 +6,14 @@ package akka.actor.testkit.typed.scaladsl import java.util.concurrent.TimeoutException +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.reflect.ClassTag + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.slf4j.LoggerFactory + import akka.actor.DeadLetter import akka.actor.DeadLetterSuppression import akka.actor.Dropped @@ -23,13 +31,6 @@ import akka.actor.typed.scaladsl.AskPattern._ import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi import akka.util.Timeout -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.slf4j.LoggerFactory - -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.reflect.ClassTag object ActorTestKit { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala index fe64196e9e..c980972255 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitBase.scala @@ -4,6 +4,9 @@ package akka.actor.testkit.typed.scaladsl +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.DeadLetter import akka.actor.Dropped import akka.actor.UnhandledMessage @@ -14,8 +17,6 @@ import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Props import akka.util.Timeout -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory object ActorTestKitBase { def testNameFromCallStack(): String = TestKitUtils.testNameFromCallStack(classOf[ActorTestKitBase]) diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala index 36159d38a0..5eb4e71c53 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKit.scala @@ -4,15 +4,16 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.testkit.typed.internal.BehaviorTestKitImpl -import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } -import akka.actor.typed.{ ActorRef, Behavior, Signal, TypedActorContext } -import akka.annotation.{ ApiMayChange, DoNotInherit } import java.util.concurrent.ThreadLocalRandom import scala.collection.immutable import scala.reflect.ClassTag +import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } +import akka.actor.testkit.typed.internal.BehaviorTestKitImpl +import akka.actor.typed.{ ActorRef, Behavior, Signal, TypedActorContext } +import akka.annotation.{ ApiMayChange, DoNotInherit } + @ApiMayChange object BehaviorTestKit { import akka.actor.testkit.typed.scaladsl.TestInbox.address diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala index f3b94d8c67..4aa94a5a76 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/Effects.scala @@ -4,10 +4,10 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.typed.{ ActorRef, Behavior, Props } - import scala.concurrent.duration.FiniteDuration +import akka.actor.typed.{ ActorRef, Behavior, Props } + /** * Factories for behavior effects for [[BehaviorTestKit]], each effect has a suitable equals and can be used to compare * actual effects to expected ones. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala index b2f3573004..88bc989421 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LogCapturing.scala @@ -6,12 +6,13 @@ package akka.actor.testkit.typed.scaladsl import scala.util.control.NonFatal -import akka.actor.testkit.typed.internal.CapturingAppender import org.scalatest.BeforeAndAfterAll import org.scalatest.Outcome import org.scalatest.TestSuite import org.slf4j.LoggerFactory +import akka.actor.testkit.typed.internal.CapturingAppender + /** * Mixin this trait to a ScalaTest test to make log lines appear only when the test failed. * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala index 9224c16839..db09e2a16d 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/LoggingTestKit.scala @@ -6,11 +6,12 @@ package akka.actor.testkit.typed.scaladsl import scala.reflect.ClassTag +import org.slf4j.event.Level + import akka.actor.testkit.typed.LoggingEvent import akka.actor.testkit.typed.internal.LoggingTestKitImpl import akka.actor.typed.ActorSystem import akka.annotation.DoNotInherit -import org.slf4j.event.Level /** * Facilities for verifying logs. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala index 418d8537be..7941f55fe8 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ManualTime.scala @@ -4,13 +4,14 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.typed.ActorSystem -import akka.actor.typed.internal.adapter.SchedulerAdapter -import com.typesafe.config.{ Config, ConfigFactory } - import scala.annotation.varargs import scala.concurrent.duration.{ Duration, FiniteDuration } +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor.typed.ActorSystem +import akka.actor.typed.internal.adapter.SchedulerAdapter + /** * Manual time allows you to do async tests while controlling the scheduler of the system. * diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala index 675615a094..3a1f31220a 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala @@ -4,15 +4,16 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.typed.ActorSystem import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.scalatest.{ BeforeAndAfterAll, TestSuite } import org.scalatest.concurrent.Eventually import org.scalatest.concurrent.ScalaFutures -import org.scalatest.time.Span import org.scalatest.matchers.should.Matchers +import org.scalatest.time.Span + +import akka.actor.testkit.typed.TestKitSettings +import akka.actor.typed.ActorSystem /** * A ScalaTest base class for the [[ActorTestKit]], making it possible to have ScalaTest manage the lifecycle of the testkit. diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala index b7fcbc94c7..331c4b6020 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/SerializationTestKit.scala @@ -4,8 +4,8 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.typed.scaladsl.adapter._ import akka.actor.typed.ActorSystem +import akka.actor.typed.scaladsl.adapter._ import akka.serialization.SerializationExtension import akka.serialization.Serializers diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala index 42ccbee4c0..b62789b0cb 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestInbox.scala @@ -4,14 +4,15 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.{ Address, RootActorPath } -import akka.actor.typed.ActorRef -import akka.annotation.{ ApiMayChange, DoNotInherit } -import akka.actor.testkit.typed.internal.TestInboxImpl import java.util.concurrent.ThreadLocalRandom import scala.collection.immutable +import akka.actor.{ Address, RootActorPath } +import akka.actor.testkit.typed.internal.TestInboxImpl +import akka.actor.typed.ActorRef +import akka.annotation.{ ApiMayChange, DoNotInherit } + @ApiMayChange object TestInbox { def apply[T](name: String = "inbox"): TestInbox[T] = { diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala index 0e447ab727..1463330201 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/scaladsl/TestProbe.scala @@ -7,6 +7,7 @@ package akka.actor.testkit.typed.scaladsl import scala.collection.immutable import scala.concurrent.duration._ import scala.reflect.ClassTag + import akka.actor.testkit.typed.FishingOutcome import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.internal.TestProbeImpl diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala index c925da538e..c7a9138895 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala @@ -4,20 +4,21 @@ package akka.actor.testkit.typed.scaladsl -import akka.Done -import akka.actor.Dropped -import akka.actor.UnhandledMessage -import akka.actor.typed.eventstream.EventStream -import akka.actor.testkit.typed.internal.ActorTestKitGuardian -import akka.actor.typed.ActorSystem - import scala.concurrent.Promise -import akka.actor.typed.scaladsl.Behaviors + import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } +import akka.Done +import akka.actor.Dropped +import akka.actor.UnhandledMessage +import akka.actor.testkit.typed.internal.ActorTestKitGuardian +import akka.actor.typed.ActorSystem +import akka.actor.typed.eventstream.EventStream +import akka.actor.typed.scaladsl.Behaviors + class ActorTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { "the Scala testkit" should { diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala index dd6e3cc114..21452dfe30 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala @@ -4,19 +4,20 @@ package akka.actor.testkit.typed.scaladsl +import scala.reflect.ClassTag + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec +import org.slf4j.event.Level + import akka.Done import akka.actor.Address -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorRef, Behavior, Props } import akka.actor.testkit.typed.{ CapturedLogEvent, Effect } import akka.actor.testkit.typed.Effect._ import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.{ Child, Parent } import akka.actor.testkit.typed.scaladsl.BehaviorTestKitSpec.Parent._ - -import scala.reflect.ClassTag -import org.slf4j.event.Level -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec +import akka.actor.typed.{ ActorRef, Behavior, Props } +import akka.actor.typed.scaladsl.Behaviors object BehaviorTestKitSpec { object Parent { diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala index 11461d633f..33031715e1 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala @@ -4,9 +4,10 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.testkit.typed.LoggingEvent -import org.slf4j.event.Level import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.event.Level + +import akka.actor.testkit.typed.LoggingEvent class LoggingTestKitSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala index ca8940f813..6bacc882e2 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestAppenderSpec.scala @@ -8,9 +8,10 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Future -import akka.actor.testkit.typed.TestException -import org.slf4j.LoggerFactory import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.LoggerFactory + +import akka.actor.testkit.typed.TestException class TestAppenderSpec extends ScalaTestWithActorTestKit( diff --git a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala index 7a64e74062..986f811f6d 100644 --- a/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala +++ b/akka-actor-testkit-typed/src/test/scala/akka/actor/testkit/typed/scaladsl/TestProbeSpec.scala @@ -4,12 +4,13 @@ package akka.actor.testkit.typed.scaladsl -import akka.actor.typed.scaladsl.Behaviors -import com.typesafe.config.ConfigFactory - import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.typed.scaladsl.Behaviors + class TestProbeSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { import TestProbeSpec._ diff --git a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala b/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala index 05cccafb0e..32c100fceb 100644 --- a/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/AkkaExceptionSpec.scala @@ -4,10 +4,11 @@ package akka -import akka.actor._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor._ + /** * A spec that verified that the AkkaException has at least a single argument constructor of type String. * diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala index d9988adcc0..7fe616cc61 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorConfigurationVerificationSpec.scala @@ -4,15 +4,16 @@ package akka.actor -import language.postfixOps +import scala.concurrent.duration._ +import language.postfixOps +import org.scalatest.BeforeAndAfterEach + +import akka.ConfigurationException +import akka.routing._ import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ -import scala.concurrent.duration._ -import akka.routing._ -import org.scalatest.BeforeAndAfterEach -import akka.ConfigurationException object ActorConfigurationVerificationSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala index 112d923e93..4c3f8c0afd 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorCreationPerfSpec.scala @@ -4,15 +4,16 @@ package akka.actor +import scala.concurrent.duration._ import scala.language.postfixOps -import akka.testkit.{ AkkaSpec, ImplicitSender, PerformanceTest } -import scala.concurrent.duration._ -import akka.testkit.metrics._ -import org.scalatest.BeforeAndAfterAll -import akka.testkit.metrics.HeapMemoryUsage -import com.codahale.metrics.{ Histogram } +import com.codahale.metrics.Histogram import com.typesafe.config.ConfigFactory +import org.scalatest.BeforeAndAfterAll + +import akka.testkit.{ AkkaSpec, ImplicitSender, PerformanceTest } +import akka.testkit.metrics._ +import akka.testkit.metrics.HeapMemoryUsage object ActorCreationPerfSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala index 7b1fc0f88d..6e344a941f 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorLifeCycleSpec.scala @@ -4,14 +4,16 @@ package akka.actor +import java.util.UUID.{ randomUUID => newUuid } +import java.util.concurrent.atomic._ + +import scala.concurrent.Await + import org.scalatest.BeforeAndAfterEach import akka.actor.Actor._ -import akka.testkit._ -import java.util.concurrent.atomic._ -import scala.concurrent.Await import akka.pattern.ask -import java.util.UUID.{ randomUUID => newUuid } +import akka.testkit._ object ActorLifeCycleSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala index 6cedc04a78..32a5613c60 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorMailboxSpec.scala @@ -4,13 +4,14 @@ package akka.actor -import com.typesafe.config.ConfigFactory -import akka.testkit._ -import akka.dispatch._ - import scala.concurrent.duration.{ Duration, FiniteDuration } -import akka.ConfigurationException + import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + +import akka.ConfigurationException +import akka.dispatch._ +import akka.testkit._ import akka.util.Helpers.ConfigOps import akka.util.unused diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala index d1346370b8..a1862296fa 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala @@ -4,16 +4,18 @@ package akka.actor +import java.lang.IllegalStateException + +import scala.concurrent.Await +import scala.concurrent.Promise +import scala.concurrent.duration._ + import language.postfixOps -import akka.testkit._ -import akka.util.Timeout -import scala.concurrent.duration._ -import scala.concurrent.Await -import java.lang.IllegalStateException -import scala.concurrent.Promise import akka.pattern.ask import akka.serialization.JavaSerializer +import akka.testkit._ +import akka.util.Timeout object ActorRefSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala index 46ba83709a..f5ffcf6547 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSelectionSpec.scala @@ -4,10 +4,11 @@ package akka.actor -import akka.testkit._ -import scala.concurrent.duration._ import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.pattern.ask +import akka.testkit._ object ActorSelectionSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala index 3a9593e609..dab0ece506 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemDispatcherSpec.scala @@ -4,14 +4,15 @@ package akka.actor +import scala.concurrent.ExecutionContext +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.ConfigurationException import akka.actor.setup.ActorSystemSetup import akka.dispatch.{ Dispatchers, ExecutionContexts } import akka.testkit.{ AkkaSpec, ImplicitSender, TestActors, TestProbe } -import com.typesafe.config.ConfigFactory - -import scala.concurrent.ExecutionContext -import scala.concurrent.duration._ object ActorSystemDispatchersSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala index c93feb3ebc..86725f0394 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorSystemSpec.scala @@ -4,22 +4,23 @@ package akka.actor -import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.{ ConcurrentLinkedQueue, RejectedExecutionException } +import java.util.concurrent.atomic.AtomicInteger + +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory } import akka.actor.setup.ActorSystemSetup import akka.dispatch._ import akka.japi.Util.immutableSeq import akka.pattern.ask import akka.testkit.{ TestKit, _ } -import akka.util.Helpers.ConfigOps import akka.util.{ Switch, Timeout } -import com.github.ghik.silencer.silent -import com.typesafe.config.{ Config, ConfigFactory } - -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future } -import scala.language.postfixOps +import akka.util.Helpers.ConfigOps object ActorSystemSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala index 0002314c17..2fa1a3e27c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorTimeoutSpec.scala @@ -4,12 +4,13 @@ package akka.actor +import scala.concurrent.Await import scala.concurrent.duration._ + +import akka.pattern.{ ask, AskTimeoutException } import akka.testkit._ import akka.testkit.TestEvent._ -import scala.concurrent.Await import akka.util.Timeout -import akka.pattern.{ ask, AskTimeoutException } class ActorTimeoutSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala index ae0070a51c..d8a7cef42d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithBoundedStashSpec.scala @@ -4,17 +4,18 @@ package akka.actor +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } import language.postfixOps +import org.scalatest.BeforeAndAfterEach + +import akka.actor.ActorSystem.Settings +import akka.dispatch.BoundedDequeBasedMailbox import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ -import akka.dispatch.BoundedDequeBasedMailbox - -import scala.concurrent.duration._ -import akka.actor.ActorSystem.Settings import akka.util.unused -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.BeforeAndAfterEach object ActorWithBoundedStashSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala index af413e5a74..9bf7ff714b 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorWithStashSpec.scala @@ -4,19 +4,19 @@ package akka.actor +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent import language.postfixOps +import org.scalatest.BeforeAndAfterEach +import org.scalatestplus.junit.JUnitSuiteLike + +import akka.pattern.ask import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.TestEvent._ -import scala.concurrent.Await -import akka.pattern.ask -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ -import org.scalatest.BeforeAndAfterEach -import org.scalatestplus.junit.JUnitSuiteLike - object ActorWithStashSpec { class StashingActor extends Actor with Stash { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala index 6de4762033..fed483f1d2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ConsistencySpec.scala @@ -4,11 +4,12 @@ package akka.actor +import scala.concurrent.duration._ + import language.postfixOps +import akka.dispatch.ThreadPoolConfig import akka.testkit.AkkaSpec -import akka.dispatch.{ ThreadPoolConfig } -import scala.concurrent.duration._ object ConsistencySpec { val minThreads = 1 diff --git a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala index 65c9897d6e..074af76513 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/CoordinatedShutdownSpec.scala @@ -5,19 +5,20 @@ package akka.actor import java.util -import scala.concurrent.duration._ -import scala.concurrent.{ Await, ExecutionContext, Future, Promise } - -import akka.Done -import akka.testkit.{ AkkaSpec, EventFilter, TestKit, TestProbe } -import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor.CoordinatedShutdown.Phase -import akka.actor.CoordinatedShutdown.UnknownReason -import akka.util.ccompat.JavaConverters._ import java.util.concurrent.{ Executors, TimeoutException } +import scala.concurrent.{ Await, ExecutionContext, Future, Promise } +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.ConfigurationException +import akka.Done +import akka.actor.CoordinatedShutdown.Phase +import akka.actor.CoordinatedShutdown.UnknownReason import akka.dispatch.ExecutionContexts +import akka.testkit.{ AkkaSpec, EventFilter, TestKit, TestProbe } +import akka.util.ccompat.JavaConverters._ class CoordinatedShutdownSpec extends AkkaSpec(ConfigFactory.parseString(""" diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala index 9a19099fa0..a3f003cb78 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeadLetterSupressionSpec.scala @@ -4,14 +4,14 @@ package akka.actor +import scala.concurrent.duration._ + import akka.event.Logging import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.TestActors import akka.testkit.TestProbe -import scala.concurrent.duration._ - object DeadLetterSupressionSpec { case object NormalMsg diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala index ee60730f83..2f9808744b 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeathWatchSpec.scala @@ -4,16 +4,16 @@ package akka.actor -import akka.actor.Props.EmptyActor +import scala.concurrent.Await +import scala.concurrent.duration._ +import com.github.ghik.silencer.silent import language.postfixOps + +import akka.actor.Props.EmptyActor import akka.dispatch.sysmsg.{ DeathWatchNotification, Failed } import akka.pattern.ask import akka.testkit._ -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ -import scala.concurrent.Await class LocalDeathWatchSpec extends AkkaSpec with ImplicitSender with DefaultTimeout with DeathWatchSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala index b0f060ecb3..a7f53dc261 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DeployerSpec.scala @@ -4,13 +4,14 @@ package akka.actor -import language.postfixOps +import scala.concurrent.duration._ -import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigParseOptions +import language.postfixOps + import akka.routing._ -import scala.concurrent.duration._ +import akka.testkit.AkkaSpec object DeployerSpec { val deployerConf = ConfigFactory.parseString( diff --git a/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala index d6d093ef9f..57fabb0bd8 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/DynamicAccessSpec.scala @@ -4,15 +4,15 @@ package akka.actor -import org.scalatest.BeforeAndAfterAll -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec - import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.{ Failure, Success, Try } +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + abstract class TestSuperclass { def name: String } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala index 58d0cb19c7..1996020497 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ExtensionSpec.scala @@ -6,15 +6,16 @@ package akka.actor import java.util.concurrent.atomic.AtomicInteger -import akka.testkit.EventFilter -import akka.testkit.TestKit._ -import com.typesafe.config.ConfigFactory - import scala.util.control.NoStackTrace + import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.scalatestplus.junit.JUnitSuiteLike + +import akka.testkit.EventFilter +import akka.testkit.TestKit._ @silent class JavaExtensionSpec extends JavaExtension with JUnitSuiteLike diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala index 1c66a7f289..d94d269dfd 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMActorSpec.scala @@ -4,14 +4,14 @@ package akka.actor -import language.postfixOps -import akka.testkit._ - -import scala.concurrent.duration._ -import akka.event._ -import com.typesafe.config.ConfigFactory - import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import language.postfixOps + +import akka.event._ +import akka.testkit._ import akka.util.{ unused, Timeout } object FSMActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala index 35738e45e0..af324aad77 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTransitionSpec.scala @@ -4,11 +4,11 @@ package akka.actor -import akka.testkit._ - import scala.concurrent.duration._ import scala.language.postfixOps +import akka.testkit._ + object FSMTransitionSpec { class Supervisor extends Actor { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala index 207bd40565..e4d5d197a2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ForwardActorSpec.scala @@ -4,12 +4,13 @@ package akka.actor +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration._ + import language.postfixOps -import akka.testkit._ -import scala.concurrent.duration._ import akka.pattern.{ ask, pipe } -import scala.concurrent.ExecutionContextExecutor +import akka.testkit._ object ForwardActorSpec { val ExpectedMessage = "FOO" diff --git a/akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala index 6f7462870b..30c2478a2d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/FunctionRefSpec.scala @@ -4,10 +4,10 @@ package akka.actor -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import akka.testkit.EventFilter import akka.actor.dungeon.SerializationCheckFailedException +import akka.testkit.AkkaSpec +import akka.testkit.EventFilter +import akka.testkit.ImplicitSender object FunctionRefSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala index 9b7e287fd5..af9dfa77d2 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/LocalActorRefProviderSpec.scala @@ -4,17 +4,17 @@ package akka.actor -import language.postfixOps -import akka.testkit._ - import scala.concurrent.Await -import scala.concurrent.duration._ -import akka.util.Timeout -import com.github.ghik.silencer.silent - import scala.concurrent.Future -import scala.util.Success +import scala.concurrent.duration._ import scala.util.Failure +import scala.util.Success + +import com.github.ghik.silencer.silent +import language.postfixOps + +import akka.testkit._ +import akka.util.Timeout object LocalActorRefProviderSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala index 21595d10e3..13b3ffdb94 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/PropsCreationSpec.scala @@ -4,9 +4,10 @@ package akka.actor +import com.github.ghik.silencer.silent + import akka.testkit.AkkaSpec import akka.util.unused -import com.github.ghik.silencer.silent object PropsCreationSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala index 5207b16e39..c16d863bc9 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ProviderSelectionSpec.scala @@ -4,11 +4,12 @@ package akka.actor +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSystem.Settings import akka.actor.ActorSystem.findClassLoader import akka.actor.setup.ActorSystemSetup import akka.testkit.AbstractSpec -import com.typesafe.config.ConfigFactory class ProviderSelectionSpec extends AbstractSpec { import ProviderSelection.{ ClusterActorRefProvider, RemoteActorRefProvider } diff --git a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala index fdb5b47e68..454835ab47 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ReceiveTimeoutSpec.scala @@ -4,15 +4,16 @@ package akka.actor -import language.postfixOps -import akka.testkit._ - -import scala.concurrent.duration._ +import java.util.concurrent.TimeoutException +import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await -import java.util.concurrent.TimeoutException -import java.util.concurrent.atomic.AtomicBoolean +import scala.concurrent.duration._ + +import language.postfixOps + +import akka.testkit._ object ReceiveTimeoutSpec { case object Tick diff --git a/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala index e3601e4383..28083ddd23 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/RelativeActorPathSpec.scala @@ -5,7 +5,9 @@ package akka.actor import java.net.URLEncoder + import scala.collection.immutable + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala index 941340036b..780a69504b 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/RestartStrategySpec.scala @@ -4,20 +4,21 @@ package akka.actor -import language.postfixOps import java.lang.Thread.sleep import scala.concurrent.Await -import akka.testkit.TestEvent._ -import akka.testkit.EventFilter +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import language.postfixOps + +import akka.pattern.ask import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout +import akka.testkit.EventFilter +import akka.testkit.TestEvent._ import akka.testkit.TestLatch -import scala.concurrent.duration._ -import akka.pattern.ask -import com.github.ghik.silencer.silent - @silent class RestartStrategySpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala index 5ec64dd108..73cf005604 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala @@ -4,24 +4,24 @@ package akka.actor -import language.postfixOps import java.io.Closeable import java.util.concurrent._ -import atomic.{ AtomicInteger, AtomicReference } +import java.util.concurrent.ThreadLocalRandom import scala.concurrent.{ Await, ExecutionContext, Future } import scala.concurrent.duration._ -import java.util.concurrent.ThreadLocalRandom - import scala.util.Try +import scala.util.control.NoStackTrace import scala.util.control.NonFatal -import org.scalatest.BeforeAndAfterEach + +import atomic.{ AtomicInteger, AtomicReference } +import com.github.ghik.silencer.silent import com.typesafe.config.{ Config, ConfigFactory } +import language.postfixOps +import org.scalatest.BeforeAndAfterEach + import akka.pattern.ask import akka.testkit._ -import com.github.ghik.silencer.silent - -import scala.util.control.NoStackTrace object SchedulerSpec { val testConfRevolver = diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala index 27699f5266..bd4e6954e0 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala @@ -4,31 +4,31 @@ package akka.actor -import language.postfixOps +import java.lang.System.identityHashCode +import java.lang.ref.WeakReference import java.util.concurrent.{ CountDownLatch, TimeUnit } +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Random import scala.util.control.NoStackTrace -import com.typesafe.config.{ Config, ConfigFactory } + import SupervisorStrategy.{ Directive, Restart, Resume, Stop } +import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory } +import language.postfixOps + import akka.actor.SupervisorStrategy.seqThrowable2Decider import akka.dispatch.{ Dispatcher, DispatcherConfigurator, DispatcherPrerequisites, MessageDispatcher } +import akka.event.Logging import akka.pattern.ask import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } import akka.testkit.{ filterEvents, filterException, TestDuration, TestLatch } -import akka.testkit.TestEvent.Mute -import java.util.concurrent.ConcurrentHashMap -import java.lang.ref.WeakReference - -import akka.event.Logging -import java.util.concurrent.atomic.AtomicInteger -import java.lang.System.identityHashCode - -import akka.util.Helpers.ConfigOps import akka.testkit.LongRunningTest -import com.github.ghik.silencer.silent +import akka.testkit.TestEvent.Mute +import akka.util.Helpers.ConfigOps object SupervisorHierarchySpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala index 2746f16227..b739255306 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorMiscSpec.scala @@ -4,20 +4,20 @@ package akka.actor -import language.postfixOps -import akka.testkit.{ filterEvents, EventFilter } - -import scala.concurrent.Await import java.util.concurrent.{ CountDownLatch, TimeUnit } -import akka.testkit.AkkaSpec -import akka.testkit.DefaultTimeout -import akka.pattern.ask -import com.github.ghik.silencer.silent - +import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NonFatal +import com.github.ghik.silencer.silent +import language.postfixOps + +import akka.pattern.ask +import akka.testkit.{ filterEvents, EventFilter } +import akka.testkit.AkkaSpec +import akka.testkit.DefaultTimeout + object SupervisorMiscSpec { val config = """ pinned-dispatcher { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala index b4d8d5c74a..7e4c118f5a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorSpec.scala @@ -4,23 +4,24 @@ package akka.actor -import language.postfixOps -import org.scalatest.BeforeAndAfterEach - -import scala.concurrent.duration._ -import akka.{ Die, Ping } -import akka.testkit.TestEvent._ -import akka.testkit._ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await -import akka.pattern.ask +import scala.concurrent.duration._ + +import com.typesafe.config.Config import com.typesafe.config.ConfigFactory +import language.postfixOps +import org.scalatest.BeforeAndAfterEach + +import akka.{ Die, Ping } +import akka.ConfigurationException import akka.dispatch.MailboxType import akka.dispatch.MessageQueue -import com.typesafe.config.Config -import akka.ConfigurationException +import akka.pattern.ask import akka.routing.RoundRobinPool +import akka.testkit._ +import akka.testkit.TestEvent._ import akka.util.unused object SupervisorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala index 565576bc55..1677d38223 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SupervisorTreeSpec.scala @@ -4,12 +4,13 @@ package akka.actor -import language.postfixOps - import scala.concurrent.Await import scala.concurrent.duration._ -import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } + +import language.postfixOps + import akka.pattern.ask +import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender } class SupervisorTreeSpec extends AkkaSpec with ImplicitSender with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala index 64ca158c39..8f1b55916a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/Ticket669Spec.scala @@ -4,16 +4,17 @@ package akka.actor -import language.postfixOps +import scala.concurrent.Await +import scala.concurrent.duration._ +import language.postfixOps import org.scalatest.BeforeAndAfterAll + +import akka.pattern.ask import akka.testkit.{ filterEvents, EventFilter } import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender import akka.testkit.DefaultTimeout -import scala.concurrent.Await -import akka.pattern.ask -import scala.concurrent.duration._ +import akka.testkit.ImplicitSender class Ticket669Spec extends AkkaSpec with BeforeAndAfterAll with ImplicitSender with DefaultTimeout { import Ticket669Spec._ diff --git a/akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala index 0caee03c8f..e14638a5f6 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TimerSpec.scala @@ -6,10 +6,11 @@ package akka.actor import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace + import akka.testkit._ -import scala.concurrent.Await object TimerSpec { sealed trait Command diff --git a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala index 7d0ce425e5..5c8bb4970d 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/TypedActorSpec.scala @@ -4,8 +4,17 @@ package akka.actor -import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.{ CountDownLatch, TimeUnit, TimeoutException } +import java.util.concurrent.atomic.AtomicReference + +import scala.annotation.tailrec +import scala.collection.immutable +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.github.ghik.silencer.silent +import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } import akka.actor.TypedActor._ import akka.japi.{ Option => JOption } @@ -14,14 +23,6 @@ import akka.routing.RoundRobinGroup import akka.serialization.{ JavaSerializer, SerializerWithStringManifest } import akka.testkit.{ filterEvents, AkkaSpec, DefaultTimeout, EventFilter, TimingTest } import akka.util.Timeout -import com.github.ghik.silencer.silent -import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } - -import scala.annotation.tailrec -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future } -import scala.language.postfixOps object TypedActorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala b/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala index 950cfde03c..bef0f6994a 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/UidClashTest.scala @@ -4,11 +4,12 @@ package akka.actor -import akka.testkit.{ AkkaSpec, TestProbe } +import scala.util.control.NoStackTrace + import akka.actor.SupervisorStrategy.{ Restart, Stop } import akka.dispatch.sysmsg.SystemMessage import akka.event.EventStream -import scala.util.control.NoStackTrace +import akka.testkit.{ AkkaSpec, TestProbe } object UidClashTest { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala index a5e9aa1608..f05fd0fc1c 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/ActorModelSpec.scala @@ -4,25 +4,26 @@ package akka.actor.dispatch -import language.postfixOps import java.rmi.RemoteException import java.util.concurrent.{ ConcurrentHashMap, CountDownLatch, TimeUnit } import java.util.concurrent.atomic.{ AtomicInteger, AtomicLong } -import org.scalatest.Assertions._ +import scala.annotation.tailrec +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent import com.typesafe.config.Config +import language.postfixOps +import org.scalatest.Assertions._ + import akka.actor._ -import akka.dispatch.sysmsg.SystemMessageList import akka.dispatch._ +import akka.dispatch.sysmsg.SystemMessageList import akka.event.Logging.Error import akka.pattern.ask import akka.testkit._ import akka.util.Switch -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future } -import scala.annotation.tailrec object ActorModelSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala index 75dcb22163..e16ff0b453 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorSpec.scala @@ -4,16 +4,18 @@ package akka.actor.dispatch -import language.postfixOps - import java.util.concurrent.{ CountDownLatch, TimeUnit } import java.util.concurrent.atomic.AtomicBoolean -import akka.testkit.AkkaSpec -import akka.actor.{ Actor, Props } + import scala.concurrent.Await import scala.concurrent.duration._ -import akka.testkit.DefaultTimeout + +import language.postfixOps + +import akka.actor.{ Actor, Props } import akka.pattern.ask +import akka.testkit.AkkaSpec +import akka.testkit.DefaultTimeout object DispatcherActorSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala index d226594515..b176e35bce 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatcherActorsSpec.scala @@ -5,6 +5,7 @@ package akka.actor.dispatch import java.util.concurrent.CountDownLatch + import akka.actor._ import akka.testkit.AkkaSpec diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala index 2432f0d953..6fe9190251 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/DispatchersSpec.scala @@ -4,17 +4,19 @@ package akka.actor.dispatch -import scala.reflect.ClassTag -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import akka.ConfigurationException -import akka.actor._ -import akka.dispatch._ -import akka.testkit.{ AkkaSpec, ImplicitSender } -import akka.routing.FromConfig import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicBoolean +import scala.reflect.ClassTag + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + +import akka.ConfigurationException +import akka.actor._ +import akka.dispatch._ +import akka.routing.FromConfig +import akka.testkit.{ AkkaSpec, ImplicitSender } import akka.util.unused object DispatchersSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala index eb6f86c4eb..1522d2c936 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dispatch/PinnedActorSpec.scala @@ -6,12 +6,14 @@ package akka.actor.dispatch import java.util.concurrent.{ CountDownLatch, TimeUnit } -import akka.testkit._ -import akka.actor.{ Actor, Props } -import akka.testkit.AkkaSpec -import org.scalatest.BeforeAndAfterEach import scala.concurrent.Await + +import org.scalatest.BeforeAndAfterEach + +import akka.actor.{ Actor, Props } import akka.pattern.ask +import akka.testkit._ +import akka.testkit.AkkaSpec object PinnedActorSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala index 6697baecb5..17a7c9aedf 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/dungeon/DispatchSpec.scala @@ -6,7 +6,6 @@ package akka.actor.dungeon import akka.actor.Actor import akka.actor.Props - import akka.testkit._ object DispatchSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala index 31a87001f8..d8fccb6208 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/routing/ListenerSpec.scala @@ -4,11 +4,13 @@ package akka.actor.routing -import akka.testkit._ +import java.util.concurrent.atomic.AtomicInteger + +import scala.concurrent.Await + import akka.actor._ import akka.routing._ -import java.util.concurrent.atomic.AtomicInteger -import scala.concurrent.Await +import akka.testkit._ class ListenerSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala index 2acc8374cf..b8e6670cd7 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/setup/ActorSystemSetupSpec.scala @@ -4,11 +4,12 @@ package akka.actor.setup -import akka.actor.ActorSystem -import akka.testkit.TestKit import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem +import akka.testkit.TestKit + case class DummySetup(name: String) extends Setup case class DummySetup2(name: String) extends Setup case class DummySetup3(name: String) extends Setup diff --git a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala index 10be20760f..eb5a574315 100644 --- a/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/config/ConfigSpec.scala @@ -6,15 +6,16 @@ package akka.config import java.util.concurrent.TimeUnit +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.scalatest.Assertions + import akka.actor.ActorSystem +import akka.actor.ExtendedActorSystem import akka.event.DefaultLoggingFilter import akka.event.Logging.DefaultLogger import akka.testkit.AkkaSpec -import com.typesafe.config.ConfigFactory -import org.scalatest.Assertions -import scala.concurrent.duration._ - -import akka.actor.ExtendedActorSystem class ConfigSpec extends AkkaSpec(ConfigFactory.defaultReference(ActorSystem.findClassLoader())) with Assertions { diff --git a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala index 6143fa4ef6..5222e3963a 100644 --- a/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala +++ b/akka-actor-tests/src/test/scala/akka/dataflow/Future2Actor.scala @@ -4,17 +4,18 @@ package akka.dataflow +import scala.concurrent.Await +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.ExecutionException +import scala.concurrent.Future +import scala.concurrent.duration._ + import language.postfixOps import akka.actor.{ Actor, Props } import akka.actor.ActorRef -import scala.concurrent.Future -import scala.concurrent.Await -import scala.concurrent.duration._ -import akka.testkit.{ AkkaSpec, DefaultTimeout } import akka.pattern.{ ask, pipe } -import scala.concurrent.ExecutionException -import scala.concurrent.ExecutionContextExecutor +import akka.testkit.{ AkkaSpec, DefaultTimeout } class Future2ActorSpec extends AkkaSpec with DefaultTimeout { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala index 6bebaee31e..0f19d1bf0a 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ControlAwareDispatcherSpec.scala @@ -4,8 +4,8 @@ package akka.dispatch -import akka.testkit.{ AkkaSpec, DefaultTimeout } import akka.actor.{ Actor, Props } +import akka.testkit.{ AkkaSpec, DefaultTimeout } object ControlAwareDispatcherSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala index 7aa060c842..1af32e2ca3 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/DispatcherShutdownSpec.scala @@ -4,14 +4,17 @@ package akka.dispatch -import akka.actor.ActorSystem -import akka.testkit.TestKit import java.lang.management.ManagementFactory + import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem +import akka.testkit.TestKit + class DispatcherShutdownSpec extends AnyWordSpec with Matchers { "akka dispatcher" should { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala index 9d9a85a374..1d7eb236fd 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ExecutionContextSpec.scala @@ -6,16 +6,18 @@ package akka.dispatch import java.util.concurrent.{ Executor, ExecutorService, Executors } import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService } import scala.concurrent.{ blocking, Await, Future, Promise } import scala.concurrent.duration._ -import akka.testkit.{ AkkaSpec, DefaultTimeout, TestLatch } -import akka.util.SerializedSuspendableExecutionContext -import akka.testkit.TestActorRef -import akka.actor.Props + import akka.actor.Actor -import akka.testkit.TestProbe +import akka.actor.Props +import akka.testkit.{ AkkaSpec, DefaultTimeout, TestLatch } import akka.testkit.CallingThreadDispatcher +import akka.testkit.TestActorRef +import akka.testkit.TestProbe +import akka.util.SerializedSuspendableExecutionContext class ExecutionContextSpec extends AkkaSpec with DefaultTimeout { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala index 6abc70cd93..36b11f0e5a 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/ForkJoinPoolStarvationSpec.scala @@ -4,9 +4,10 @@ package akka.dispatch +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, Props } import akka.testkit.{ AkkaSpec, ImplicitSender } -import com.typesafe.config.ConfigFactory object ForkJoinPoolStarvationSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala index baee353ac5..b0ea9fd9bc 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/MailboxConfigSpec.scala @@ -4,18 +4,19 @@ package akka.dispatch -import language.postfixOps import java.util.concurrent.{ BlockingQueue, ConcurrentLinkedQueue } -import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } -import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor._ -import akka.testkit.{ AkkaSpec, EventFilter } -import akka.util.unused - import scala.concurrent.{ Await, ExecutionContext, Future } import scala.concurrent.duration._ +import com.typesafe.config.{ Config, ConfigFactory } +import language.postfixOps +import org.scalatest.{ BeforeAndAfterAll, BeforeAndAfterEach } + +import akka.actor._ +import akka.testkit.{ AkkaSpec, EventFilter } +import akka.util.unused + abstract class MailboxSpec extends AkkaSpec with BeforeAndAfterAll with BeforeAndAfterEach { def name: String diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala index 437b86819c..bfcf33566d 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/PriorityDispatcherSpec.scala @@ -4,14 +4,15 @@ package akka.dispatch -import language.postfixOps +import scala.concurrent.duration._ + import com.typesafe.config.Config +import language.postfixOps + import akka.actor.{ Actor, ActorSystem, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout } import akka.util.unused -import scala.concurrent.duration._ - object PriorityDispatcherSpec { case object Result diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala index 2ab1ef2f3a..5c2c1da64a 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/SameThreadExecutionContextSpec.scala @@ -4,13 +4,14 @@ package akka.dispatch +import scala.concurrent.ExecutionContext +import scala.concurrent.Promise + +import org.scalatest.matchers.should.Matchers + import akka.Done import akka.dispatch.internal.SameThreadExecutionContext import akka.testkit.AkkaSpec -import org.scalatest.matchers.should.Matchers - -import scala.concurrent.ExecutionContext -import scala.concurrent.Promise class SameThreadExecutionContextSpec extends AkkaSpec with Matchers { diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala index 5f887ada8d..508a419e0f 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/StablePriorityDispatcherSpec.scala @@ -4,14 +4,15 @@ package akka.dispatch -import language.postfixOps +import scala.concurrent.duration._ + import com.typesafe.config.Config +import language.postfixOps + import akka.actor.{ Actor, ActorSystem, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout } import akka.util.unused -import scala.concurrent.duration._ - object StablePriorityDispatcherSpec { case object Result diff --git a/akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala b/akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala index 6b2f953ab7..768541e6c2 100644 --- a/akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/dispatch/sysmsg/SystemMessageListSpec.scala @@ -4,12 +4,12 @@ package akka.dispatch.sysmsg -import akka.testkit.AkkaSpec import akka.actor.Props +import akka.testkit.AkkaSpec class SystemMessageListSpec extends AkkaSpec { - import SystemMessageList.LNil import SystemMessageList.ENil + import SystemMessageList.LNil val child = system.actorOf(Props.empty, "dummy") // need an ActorRef for the Failed msg diff --git a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala b/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala index c4f3ba2671..2fe6601f18 100644 --- a/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/AddressTerminatedTopicBenchSpec.scala @@ -5,6 +5,7 @@ package akka.event import scala.concurrent.duration._ + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.ActorSystem diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala index ce135661b6..3e6c6fca20 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala @@ -4,15 +4,15 @@ package akka.event -import language.postfixOps - -import org.scalatest.BeforeAndAfterEach -import akka.testkit._ import scala.concurrent.duration._ -import akka.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props } -import akka.japi.{ Procedure } import com.typesafe.config.{ Config, ConfigFactory } +import language.postfixOps +import org.scalatest.BeforeAndAfterEach + +import akka.actor.{ Actor, ActorRef, ActorSystem, PoisonPill, Props } +import akka.japi.Procedure +import akka.testkit._ object EventBusSpec { class TestActorWrapperActor(testActor: ActorRef) extends Actor { @@ -169,9 +169,10 @@ object ActorEventBusSpec { } class ActorEventBusSpec(conf: Config) extends EventBusSpec("ActorEventBus", conf) { - import akka.event.ActorEventBusSpec._ import EventBusSpec.TestActorWrapperActor + import akka.event.ActorEventBusSpec._ + def this() = this(ConfigFactory.parseString("akka.actor.debug.event-stream = on").withFallback(AkkaSpec.testConf)) diff --git a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala index 528ecaf8f2..ef54e2f748 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventStreamSpec.scala @@ -4,11 +4,12 @@ package akka.event +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import language.postfixOps -import scala.concurrent.duration._ import akka.actor._ -import com.typesafe.config.ConfigFactory import akka.testkit.{ AkkaSpec, TestProbe } object EventStreamSpec { diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala index fae97a472b..f67c879f1f 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala @@ -4,26 +4,27 @@ package akka.event -import akka.testkit._ - -import scala.util.control.NoStackTrace -import scala.concurrent.duration._ -import com.typesafe.config.{ Config, ConfigFactory } -import akka.actor._ import java.nio.charset.StandardCharsets -import java.util.{ Calendar, Date, GregorianCalendar, TimeZone } - -import org.scalatest.wordspec.AnyWordSpec -import org.scalatest.matchers.should.Matchers -import akka.serialization.SerializationExtension -import akka.event.Logging._ -import akka.util.Helpers -import akka.event.Logging.InitializeLogger -import akka.event.Logging.Warning import java.text.SimpleDateFormat import java.time.{ LocalDateTime, ZoneOffset } +import java.util.{ Calendar, Date, GregorianCalendar, TimeZone } import java.util.concurrent.TimeUnit +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + +import akka.actor._ +import akka.event.Logging._ +import akka.event.Logging.InitializeLogger +import akka.event.Logging.Warning +import akka.serialization.SerializationExtension +import akka.testkit._ +import akka.util.Helpers + object LoggerSpec { val defaultConfig = ConfigFactory.parseString(""" diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala index b1eac39922..6ab38898b7 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/LoggingReceiveSpec.scala @@ -4,16 +4,17 @@ package akka.event -import language.postfixOps - -import org.scalatest.BeforeAndAfterAll -import scala.concurrent.duration._ -import akka.testkit._ -import org.scalatest.wordspec.AnyWordSpec -import com.typesafe.config.ConfigFactory -import akka.util.ccompat.JavaConverters._ -import akka.actor._ import scala.annotation.tailrec +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import language.postfixOps +import org.scalatest.BeforeAndAfterAll +import org.scalatest.wordspec.AnyWordSpec + +import akka.actor._ +import akka.testkit._ +import akka.util.ccompat.JavaConverters._ object LoggingReceiveSpec { class TestLogActor extends Actor { diff --git a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala index ca9726c6ec..faab35c229 100644 --- a/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/jul/JavaLoggerSpec.scala @@ -4,11 +4,14 @@ package akka.event.jul +import java.util.logging + +import scala.util.control.NoStackTrace + import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorLogging, Props } import akka.testkit.AkkaSpec -import java.util.logging -import scala.util.control.NoStackTrace @deprecated("Use SLF4J instead.", "2.6.0") object JavaLoggerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala b/akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala index 0ffc890bde..645585e882 100644 --- a/akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/CapacityLimitSpec.scala @@ -4,9 +4,10 @@ package akka.io +import Tcp._ + import akka.testkit.{ AkkaSpec, TestProbe } import akka.testkit.SocketUtil.temporaryServerAddresses -import Tcp._ class CapacityLimitSpec extends AkkaSpec(""" akka.loglevel = ERROR diff --git a/akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala b/akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala index 86c66d1421..00f465fc93 100644 --- a/akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/InetAddressDnsResolverSpec.scala @@ -7,9 +7,10 @@ package akka.io import java.security.Security import java.util.concurrent.TimeUnit +import com.github.ghik.silencer.silent + import akka.actor.Props import akka.testkit.{ AkkaSpec, TestActorRef } -import com.github.ghik.silencer.silent @silent class InetAddressDnsResolverSpec extends AkkaSpec(""" diff --git a/akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala b/akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala index 6d1dc80584..02ac00bed8 100644 --- a/akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/SimpleDnsCacheSpec.scala @@ -7,16 +7,17 @@ package akka.io import java.net.InetAddress import java.util.concurrent.atomic.AtomicLong +import scala.collection.immutable +import scala.concurrent.duration._ + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.io.dns.ARecord import akka.io.dns.CachePolicy.Ttl import akka.io.dns.DnsProtocol import akka.io.dns.DnsProtocol.Ip -import scala.concurrent.duration._ -import scala.collection.immutable -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec - class SimpleDnsCacheSpec extends AnyWordSpec with Matchers { "Cache" should { "not reply with expired but not yet swept out entries" in { diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala index e68142258f..9656208005 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala @@ -6,33 +6,32 @@ package akka.io import java.io.IOException import java.net.{ InetSocketAddress, ServerSocket } +import java.net.SocketTimeoutException import java.nio.ByteBuffer import java.nio.channels._ -import java.nio.channels.spi.SelectorProvider import java.nio.channels.SelectionKey._ - -import com.typesafe.config.ConfigFactory +import java.nio.channels.spi.SelectorProvider +import java.nio.file.Files +import java.util.Random import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ -import scala.util.control.NonFatal -import org.scalatest.matchers._ -import akka.io.Tcp._ -import akka.io.SelectionHandler._ -import akka.io.Inet.SocketOption -import akka.actor._ -import akka.testkit.{ AkkaSpec, EventFilter, SocketUtil, TestActorRef, TestProbe } -import akka.util.{ ByteString, Helpers } -import akka.testkit.SocketUtil.temporaryServerAddress -import java.util.Random -import java.net.SocketTimeoutException -import java.nio.file.Files - -import akka.testkit.WithLogCapturing -import com.google.common.jimfs.{ Configuration, Jimfs } - import scala.util.Try +import scala.util.control.NonFatal + +import com.google.common.jimfs.{ Configuration, Jimfs } +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers._ + +import akka.actor._ +import akka.io.Inet.SocketOption +import akka.io.SelectionHandler._ +import akka.io.Tcp._ +import akka.testkit.{ AkkaSpec, EventFilter, SocketUtil, TestActorRef, TestProbe } +import akka.testkit.SocketUtil.temporaryServerAddress +import akka.testkit.WithLogCapturing +import akka.util.{ ByteString, Helpers } object TcpConnectionSpec { case class Ack(i: Int) extends Event diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala index 644de4f08d..c4cb1dbd4d 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpec.scala @@ -4,19 +4,20 @@ package akka.io -import akka.actor.{ ActorRef, PoisonPill } -import akka.io.Tcp._ -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.util.ByteString import java.io.IOException import java.net.{ InetSocketAddress, ServerSocket } -import akka.testkit.WithLogCapturing -import org.scalatest.concurrent.TimeLimits - import scala.concurrent.duration._ import scala.language.postfixOps +import org.scalatest.concurrent.TimeLimits + +import akka.actor.{ ActorRef, PoisonPill } +import akka.io.Tcp._ +import akka.testkit.{ AkkaSpec, TestProbe } +import akka.testkit.WithLogCapturing +import akka.util.ByteString + class TcpIntegrationSpec extends AkkaSpec(""" akka.loglevel = debug akka.loggers = ["akka.testkit.SilenceAllTestEventListener"] diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala index 67b7e6a9b2..fd81dc99e5 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpIntegrationSpecSupport.scala @@ -6,13 +6,15 @@ package akka.io import scala.annotation.tailrec import scala.collection.immutable -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.actor.ActorRef -import akka.io.Inet.SocketOption -import akka.testkit.SocketUtil.temporaryServerAddress + import Tcp._ + +import akka.actor.ActorRef import akka.actor.ActorSystem import akka.dispatch.ExecutionContexts +import akka.io.Inet.SocketOption +import akka.testkit.{ AkkaSpec, TestProbe } +import akka.testkit.SocketUtil.temporaryServerAddress trait TcpIntegrationSpecSupport { _: AkkaSpec => diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala index bbcf104f54..b6830aaf86 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpListenerSpec.scala @@ -9,13 +9,15 @@ import java.nio.channels.{ SelectableChannel, SocketChannel } import java.nio.channels.SelectionKey.OP_ACCEPT import scala.concurrent.duration._ -import akka.actor._ -import akka.testkit.{ AkkaSpec, EventFilter, TestActorRef, TestProbe } -import akka.io.TcpListener.{ FailedRegisterIncoming, RegisterIncoming } -import akka.io.SelectionHandler._ -import akka.testkit.SocketUtil + import Tcp._ + +import akka.actor._ +import akka.io.SelectionHandler._ +import akka.io.TcpListener.{ FailedRegisterIncoming, RegisterIncoming } import akka.io.TcpListenerSpec.RegisterChannel +import akka.testkit.{ AkkaSpec, EventFilter, TestActorRef, TestProbe } +import akka.testkit.SocketUtil class TcpListenerSpec extends AkkaSpec(""" akka.io.tcp.batch-accept-limit = 2 diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala index 91ec67679a..042f3ee7f6 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala @@ -6,16 +6,16 @@ package akka.io import java.net.InetSocketAddress +import scala.concurrent.duration._ + import akka.actor.ActorRef -import akka.testkit.SocketUtil.temporaryServerAddresses -import akka.testkit.WithLogCapturing import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender +import akka.testkit.SocketUtil.temporaryServerAddresses import akka.testkit.TestProbe +import akka.testkit.WithLogCapturing import akka.util.ByteString -import scala.concurrent.duration._ - class UdpConnectedIntegrationSpec extends AkkaSpec(""" akka.loglevel = DEBUG akka.actor.debug.lifecycle = on diff --git a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala index def979d2b8..6f6d8af2c2 100644 --- a/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala @@ -4,15 +4,15 @@ package akka.io +import java.net.DatagramSocket import java.net.InetSocketAddress -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import akka.util.ByteString import akka.actor.ActorRef -import akka.io.Udp._ import akka.io.Inet._ +import akka.io.Udp._ +import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } import akka.testkit.SocketUtil.temporaryServerAddresses -import java.net.DatagramSocket +import akka.util.ByteString class UdpIntegrationSpec extends AkkaSpec(""" akka.loglevel = INFO diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala index 9a524ff946..401c61e317 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/AsyncDnsResolverIntegrationSpec.scala @@ -6,17 +6,18 @@ package akka.io.dns import java.net.InetAddress -import akka.io.dns.DnsProtocol.{ Ip, RequestType, Srv } -import akka.io.{ Dns, IO } +import scala.concurrent.duration._ + import CachePolicy.Ttl + +import akka.io.{ Dns, IO } +import akka.io.dns.DnsProtocol.{ Ip, RequestType, Srv } import akka.pattern.ask +import akka.testkit.{ AkkaSpec, SocketUtil } import akka.testkit.SocketUtil.Both import akka.testkit.WithLogCapturing -import akka.testkit.{ AkkaSpec, SocketUtil } import akka.util.Timeout -import scala.concurrent.duration._ - /* These tests rely on a DNS server with 2 zones configured, foo.test and bar.example. diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala index 0a7cab7fa7..9c089fd7e6 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/DnsSettingsSpec.scala @@ -6,11 +6,12 @@ package akka.io.dns import java.net.InetAddress -import akka.actor.ExtendedActorSystem -import akka.testkit.AkkaSpec +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ +import akka.actor.ExtendedActorSystem +import akka.testkit.AkkaSpec class DnsSettingsSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala b/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala index e1eeb0644a..90e95a1083 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/DockerBindDnsService.scala @@ -4,16 +4,17 @@ package akka.io.dns -import akka.util.ccompat.JavaConverters._ -import akka.testkit.AkkaSpec +import scala.concurrent.duration._ +import scala.util.Try +import scala.util.control.NonFatal + import com.spotify.docker.client.DefaultDockerClient import com.spotify.docker.client.DockerClient.{ ListContainersParam, LogsParam } import com.spotify.docker.client.messages.{ ContainerConfig, HostConfig, PortBinding } import org.scalatest.concurrent.Eventually -import scala.concurrent.duration._ -import scala.util.Try -import scala.util.control.NonFatal +import akka.testkit.AkkaSpec +import akka.util.ccompat.JavaConverters._ trait DockerBindDnsService extends Eventually { self: AkkaSpec => val client = DefaultDockerClient.fromEnv().build() diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala index 5cc071caad..36e013f6c4 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsManagerSpec.scala @@ -6,15 +6,16 @@ package akka.io.dns.internal import java.net.InetAddress -import akka.io.Dns -import akka.io.dns.AAAARecord -import akka.io.dns.DnsProtocol.{ Resolve, Resolved } -import akka.io.dns.CachePolicy.Ttl -import akka.testkit.WithLogCapturing -import akka.testkit.{ AkkaSpec, ImplicitSender } +import scala.collection.immutable.Seq + import com.github.ghik.silencer.silent -import scala.collection.immutable.Seq +import akka.io.Dns +import akka.io.dns.AAAARecord +import akka.io.dns.CachePolicy.Ttl +import akka.io.dns.DnsProtocol.{ Resolve, Resolved } +import akka.testkit.{ AkkaSpec, ImplicitSender } +import akka.testkit.WithLogCapturing // tests deprecated DNS API @silent("deprecated") diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala index 3e7f6afc10..76b41a7995 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/AsyncDnsResolverSpec.scala @@ -6,19 +6,20 @@ package akka.io.dns.internal import java.net.{ Inet6Address, InetAddress } -import akka.actor.Status.Failure +import scala.collection.{ immutable => im } +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory, ConfigValueFactory } + import akka.actor.{ ActorRef, ExtendedActorSystem, Props } +import akka.actor.Status.Failure import akka.io.SimpleDnsCache +import akka.io.dns.{ AAAARecord, ARecord, DnsSettings, SRVRecord } import akka.io.dns.CachePolicy.Ttl import akka.io.dns.DnsProtocol._ import akka.io.dns.internal.AsyncDnsResolver.ResolveFailedException import akka.io.dns.internal.DnsClient.{ Answer, Question4, Question6, SrvQuestion } -import akka.io.dns.{ AAAARecord, ARecord, DnsSettings, SRVRecord } import akka.testkit.{ AkkaSpec, TestProbe, WithLogCapturing } -import com.typesafe.config.{ Config, ConfigFactory, ConfigValueFactory } - -import scala.collection.{ immutable => im } -import scala.concurrent.duration._ class AsyncDnsResolverSpec extends AkkaSpec(""" akka.loglevel = DEBUG diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala index bbca6a357e..9eee8e113f 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/DnsClientSpec.scala @@ -8,6 +8,7 @@ import java.net.InetSocketAddress import java.util.concurrent.atomic.AtomicBoolean import scala.collection.immutable.Seq + import akka.actor.Props import akka.io.Udp import akka.io.dns.{ RecordClass, RecordType } diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala index 67aeb8cc85..56c9a13dac 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/MessageSpec.scala @@ -4,11 +4,12 @@ package akka.io.dns.internal -import akka.io.dns.{ RecordClass, RecordType } -import akka.util.ByteString import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.io.dns.{ RecordClass, RecordType } +import akka.util.ByteString + class MessageSpec extends AnyWordSpec with Matchers { "The Message" should { "parse a response that is truncated mid-message" in { diff --git a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala b/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala index 58bdd0a64a..c021b7c80b 100644 --- a/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/dns/internal/TcpDnsClientSpec.scala @@ -6,6 +6,8 @@ package akka.io.dns.internal import java.net.InetSocketAddress +import scala.collection.immutable.Seq + import akka.actor.Props import akka.io.Tcp import akka.io.Tcp.{ Connected, PeerClosed, Register } @@ -13,8 +15,6 @@ import akka.io.dns.{ RecordClass, RecordType } import akka.io.dns.internal.DnsClient.Answer import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import scala.collection.immutable.Seq - class TcpDnsClientSpec extends AkkaSpec with ImplicitSender { import TcpDnsClient._ diff --git a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala index 2cbbe97609..e8a0bde681 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/AskSpec.scala @@ -4,16 +4,17 @@ package akka.pattern -import akka.actor._ -import akka.testkit.{ AkkaSpec, TestProbe } -import akka.util.Timeout -import com.github.ghik.silencer.silent - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Failure + +import com.github.ghik.silencer.silent import language.postfixOps +import akka.actor._ +import akka.testkit.{ AkkaSpec, TestProbe } +import akka.util.Timeout + @silent class AskSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala index 27d2ceef71..4be5f55f34 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/BackoffOnRestartSupervisorSpec.scala @@ -6,15 +6,15 @@ package akka.pattern import java.util.concurrent.{ CountDownLatch, TimeUnit } -import akka.pattern.TestActor.NormalException -import akka.testkit.{ filterException, AkkaSpec, ImplicitSender, TestProbe } - import scala.concurrent.duration._ -import akka.actor._ -import akka.testkit.WithLogCapturing +import scala.language.postfixOps + import com.github.ghik.silencer.silent -import scala.language.postfixOps +import akka.actor._ +import akka.pattern.TestActor.NormalException +import akka.testkit.{ filterException, AkkaSpec, ImplicitSender, TestProbe } +import akka.testkit.WithLogCapturing object TestActor { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala index be3a2419ed..48039c90fe 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala @@ -4,14 +4,15 @@ package akka.pattern -import akka.actor._ -import akka.testkit._ +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import com.github.ghik.silencer.silent import org.scalatest.concurrent.Eventually import org.scalatest.prop.TableDrivenPropertyChecks._ -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace +import akka.actor._ +import akka.testkit._ object BackoffSupervisorSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala index 9d48b7b3b4..a6e407f201 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerMTSpec.scala @@ -4,11 +4,12 @@ package akka.pattern -import akka.testkit._ import scala.collection.immutable -import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration._ + +import akka.testkit._ class CircuitBreakerMTSpec extends AkkaSpec { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala index 3a6e5420be..49433b5d80 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerSpec.scala @@ -4,11 +4,9 @@ package akka.pattern -import akka.actor.ActorSystem -import akka.testkit._ - import scala.concurrent.Await import scala.concurrent.ExecutionContext +import scala.concurrent.ExecutionContextExecutor import scala.concurrent.Future import scala.concurrent.TimeoutException import scala.concurrent.duration._ @@ -16,7 +14,9 @@ import scala.language.postfixOps import scala.util.Failure import scala.util.Success import scala.util.Try -import scala.concurrent.ExecutionContextExecutor + +import akka.actor.ActorSystem +import akka.testkit._ object CircuitBreakerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala index 4d3d42ff01..32e040a160 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/CircuitBreakerStressSpec.scala @@ -4,16 +4,18 @@ package akka.pattern +import java.util.concurrent.ThreadLocalRandom +import java.util.concurrent.TimeoutException + import scala.concurrent.Promise import scala.concurrent.duration._ -import java.util.concurrent.ThreadLocalRandom + import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.Props import akka.actor.Status.Failure import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import java.util.concurrent.TimeoutException object CircuitBreakerStressSpec { case object JobDone diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala index ccb5628442..0c03a8eb2e 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PatternSpec.scala @@ -4,13 +4,14 @@ package akka.pattern +import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration._ + import language.postfixOps -import akka.testkit.{ AkkaSpec, TestLatch } import akka.actor.{ Actor, Props } -import scala.concurrent.{ Await, Future, Promise } -import scala.concurrent.duration._ -import scala.concurrent.ExecutionContextExecutor +import akka.testkit.{ AkkaSpec, TestLatch } object PatternSpec { final case class Work(duration: Duration) diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala index 98f3ba7dee..7d46323c1c 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PipeToSpec.scala @@ -4,10 +4,11 @@ package akka.pattern +import scala.concurrent.Future + +import akka.actor.Status import akka.testkit.AkkaSpec import akka.testkit.TestProbe -import scala.concurrent.Future -import akka.actor.Status class PipeToSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala index d7b7b38648..4faec03979 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/PromiseRefSpec.scala @@ -4,12 +4,12 @@ package akka.pattern -import akka.actor._ -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } - import scala.concurrent.Promise import scala.concurrent.duration._ +import akka.actor._ +import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } + object PromiseRefSpec { case class Request(replyTo: ActorRef) case object Response @@ -20,6 +20,7 @@ object PromiseRefSpec { class PromiseRefSpec extends AkkaSpec with ImplicitSender { import PromiseRefSpec._ + import akka.pattern._ "The PromiseRef" must { diff --git a/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala index a8225fb875..f079edfb9f 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/RetrySpec.scala @@ -4,14 +4,14 @@ package akka.pattern -import akka.actor.Scheduler - -import language.postfixOps -import akka.testkit.AkkaSpec - import scala.concurrent.{ Await, ExecutionContextExecutor, Future } import scala.concurrent.duration._ +import language.postfixOps + +import akka.actor.Scheduler +import akka.testkit.AkkaSpec + class RetrySpec extends AkkaSpec with RetrySupport { implicit val ec: ExecutionContextExecutor = system.dispatcher implicit val scheduler: Scheduler = system.scheduler diff --git a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala index 55c16b7621..a9f26a2991 100644 --- a/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/pattern/extended/ExplicitAskSpec.scala @@ -4,10 +4,11 @@ package akka.pattern.extended +import scala.concurrent.duration._ + import akka.actor._ import akka.testkit.AkkaSpec import akka.util.Timeout -import scala.concurrent.duration._ object ExplicitAskSpec { case class Request(respondTo: ActorRef) diff --git a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala index 537f002930..ccf4ff57c9 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/BalancingSpec.scala @@ -4,14 +4,17 @@ package akka.routing +import java.net.URLEncoder import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, ImplicitSender, TestLatch } -import akka.actor.ActorRef + import org.scalatest.BeforeAndAfterEach -import java.net.URLEncoder + +import akka.actor.{ Actor, Props } +import akka.actor.ActorRef +import akka.testkit.{ AkkaSpec, ImplicitSender, TestLatch } object BalancingSpec { val counter = new AtomicInteger(1) diff --git a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala index 228764d674..0c4a0a0bf0 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/BroadcastSpec.scala @@ -5,10 +5,12 @@ package akka.routing import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.Await + import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } import akka.pattern.ask +import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } object BroadcastSpec { class TestActor extends Actor { diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala index 1790d43c9e..d3619c55ba 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala @@ -4,23 +4,25 @@ package akka.routing -import language.postfixOps +import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ -import scala.collection.immutable + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import language.postfixOps + import akka.ConfigurationException import akka.actor.{ Actor, ActorRef, Deploy, Props } -import akka.actor.UnstartedCell -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender } -import akka.pattern.gracefulStop -import com.typesafe.config.Config -import akka.actor.ActorSystem -import akka.testkit.TestProbe -import akka.testkit.TestProbe -import akka.actor.ExtendedActorSystem -import akka.testkit.TestActors.echoActorProps import akka.actor.ActorPath -import com.github.ghik.silencer.silent +import akka.actor.ActorSystem +import akka.actor.ExtendedActorSystem +import akka.actor.UnstartedCell +import akka.pattern.gracefulStop +import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender } +import akka.testkit.TestActors.echoActorProps +import akka.testkit.TestProbe +import akka.testkit.TestProbe object ConfiguredLocalRoutingSpec { val config = """ diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala index ca9c482108..fe05533591 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConsistentHashingRouterSpec.scala @@ -5,16 +5,17 @@ package akka.routing import scala.concurrent.Await +import scala.concurrent.ExecutionContextExecutor + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props import akka.pattern.ask +import akka.routing.ConsistentHashingRouter.ConsistentHashMapping import akka.routing.ConsistentHashingRouter.ConsistentHashable import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope -import akka.routing.ConsistentHashingRouter.ConsistentHashMapping -import akka.testkit.AkkaSpec import akka.testkit._ -import scala.concurrent.ExecutionContextExecutor +import akka.testkit.AkkaSpec object ConsistentHashingRouterSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala index e21c091326..c4d5336f55 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/MetricsBasedResizerSpec.scala @@ -6,18 +6,18 @@ package akka.routing import java.time.LocalDateTime -import akka.actor._ -import akka.testkit._ -import akka.testkit.TestEvent._ - -import OptimalSizeExploringResizer._ -import MetricsBasedResizerSpec._ -import akka.util.Timeout - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.{ Random, Try } + +import MetricsBasedResizerSpec._ +import OptimalSizeExploringResizer._ + +import akka.actor._ import akka.pattern.ask +import akka.testkit._ +import akka.testkit.TestEvent._ +import akka.util.Timeout object MetricsBasedResizerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala index 574ae8256b..6ba492d80e 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RandomSpec.scala @@ -4,13 +4,16 @@ package akka.routing -import language.postfixOps import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.Await import scala.concurrent.duration._ + +import language.postfixOps + import akka.actor.{ Actor, Props } -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } import akka.pattern.ask +import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } class RandomSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala index 3688cd5c05..297f702458 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ResizerSpec.scala @@ -4,15 +4,16 @@ package akka.routing -import com.typesafe.config.{ Config, ConfigFactory } - -import language.postfixOps -import akka.actor.{ Actor, ActorRef, ActorSystem, Props } -import akka.testkit._ -import akka.testkit.TestEvent._ import scala.concurrent.Await import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } +import language.postfixOps + +import akka.actor.{ Actor, ActorRef, ActorSystem, Props } import akka.pattern.ask +import akka.testkit._ +import akka.testkit.TestEvent._ object ResizerSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala index 0f15cfa749..29194b7b71 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoundRobinSpec.scala @@ -4,16 +4,19 @@ package akka.routing -import language.postfixOps import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.Props + +import language.postfixOps + import akka.actor.Actor -import akka.testkit._ -import akka.pattern.ask -import akka.actor.Terminated import akka.actor.ActorRef +import akka.actor.Props +import akka.actor.Terminated +import akka.pattern.ask +import akka.testkit._ class RoundRobinSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala index 78c54f0402..1210f8e6a8 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RouteeCreationSpec.scala @@ -4,12 +4,13 @@ package akka.routing -import akka.testkit.AkkaSpec -import akka.actor.Props -import akka.actor.Actor import scala.concurrent.duration._ -import akka.actor.Identify + +import akka.actor.Actor import akka.actor.ActorIdentity +import akka.actor.Identify +import akka.actor.Props +import akka.testkit.AkkaSpec class RouteeCreationSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala index f4a3afe6c4..bbc2859219 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/RoutingSpec.scala @@ -4,17 +4,18 @@ package akka.routing +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import language.postfixOps -import akka.actor._ -import scala.collection.immutable -import akka.testkit._ -import scala.concurrent.duration._ -import scala.concurrent.Await import akka.ConfigurationException -import com.typesafe.config.ConfigFactory +import akka.actor._ import akka.pattern.{ ask, pipe } -import scala.concurrent.ExecutionContextExecutor +import akka.testkit._ object RoutingSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala index f43d642e67..3922e5ffb9 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ScatterGatherFirstCompletedSpec.scala @@ -4,15 +4,17 @@ package akka.routing +import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.Await import scala.concurrent.duration._ + import akka.actor.{ Actor, Props } -import akka.pattern.ask -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } import akka.actor.ActorSystem import akka.actor.Status -import java.util.concurrent.TimeoutException +import akka.pattern.ask +import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } import akka.testkit.TestProbe object ScatterGatherFirstCompletedSpec { diff --git a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala index 6dc9fb0a5d..3da7056566 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/SmallestMailboxSpec.scala @@ -5,7 +5,9 @@ package akka.routing import java.util.concurrent.ConcurrentHashMap + import scala.concurrent.Await + import akka.actor.{ Actor, Props } import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TestLatch } diff --git a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala index f454895731..f53ed44e83 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/TailChoppingSpec.scala @@ -5,10 +5,12 @@ package akka.routing import java.util.concurrent.atomic.AtomicInteger -import akka.actor.Status.Failure + import scala.concurrent.Await import scala.concurrent.duration._ + import akka.actor.{ Actor, ActorRef, ActorSystem, Props } +import akka.actor.Status.Failure import akka.pattern.{ ask, AskTimeoutException } import akka.testkit._ diff --git a/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala index 3772738d33..1c67e68286 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/AsyncSerializeSpec.scala @@ -7,10 +7,12 @@ package akka.serialization import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletionStage +import scala.concurrent.Future + +import com.typesafe.config.ConfigFactory + import akka.actor.ExtendedActorSystem import akka.testkit.{ AkkaSpec, EventFilter } -import com.typesafe.config.ConfigFactory -import scala.concurrent.Future object AsyncSerializeSpec { diff --git a/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala index 1458dad122..595b0bede2 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/DisabledJavaSerializerWarningSpec.scala @@ -6,9 +6,9 @@ package akka.serialization import java.nio.{ ByteBuffer, ByteOrder } -import akka.actor.ExtendedActorSystem - import scala.concurrent.duration._ + +import akka.actor.ExtendedActorSystem import akka.testkit._ object DisabledJavaSerializerWarningSpec { diff --git a/akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala index 71b7e77b67..1c4718b712 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/PrimitivesSerializationSpec.scala @@ -9,9 +9,10 @@ import java.nio.ByteOrder import scala.util.Random +import com.typesafe.config.ConfigFactory + import akka.testkit.AkkaSpec import akka.util.ByteString -import com.typesafe.config.ConfigFactory object PrimitivesSerializationSpec { val serializationTestOverrides = "" diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala index 0140a7f9e1..e118d99dc0 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializationSetupSpec.scala @@ -4,16 +4,17 @@ package akka.serialization -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.atomic.AtomicInteger import java.util.{ BitSet => ProgrammaticJavaDummy } import java.util.{ Date => SerializableDummy } +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.atomic.AtomicInteger -import akka.actor.setup.ActorSystemSetup -import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem } -import akka.testkit.{ AkkaSpec, TestKit } import com.typesafe.config.ConfigFactory +import akka.actor.{ ActorSystem, BootstrapSetup, ExtendedActorSystem } +import akka.actor.setup.ActorSystemSetup +import akka.testkit.{ AkkaSpec, TestKit } + class ConfigurationDummy class ProgrammaticDummy diff --git a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala index 775797ca4d..af8b93291c 100644 --- a/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/serialization/SerializeSpec.scala @@ -4,26 +4,24 @@ package akka.serialization -import language.postfixOps - -import akka.testkit.{ AkkaSpec, EventFilter } -import akka.actor._ import java.io._ +import java.nio.ByteBuffer +import java.nio.ByteOrder import scala.concurrent.Await - -import akka.util.{ unused, Timeout } import scala.concurrent.duration._ -import com.typesafe.config._ -import akka.pattern.ask -import java.nio.ByteOrder -import java.nio.ByteBuffer - -import akka.actor.dungeon.SerializationCheckFailedException -import com.github.ghik.silencer.silent -import test.akka.serialization.NoVerification import SerializationTests._ +import com.github.ghik.silencer.silent +import com.typesafe.config._ +import language.postfixOps +import test.akka.serialization.NoVerification + +import akka.actor._ +import akka.actor.dungeon.SerializationCheckFailedException +import akka.pattern.ask +import akka.testkit.{ AkkaSpec, EventFilter } +import akka.util.{ unused, Timeout } import akka.util.ByteString object SerializationTests { diff --git a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala b/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala index 5051441d4b..cede5a8f14 100644 --- a/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/testkit/CallingThreadDispatcherModelSpec.scala @@ -5,8 +5,10 @@ package akka.testkit import java.util.concurrent.atomic.AtomicInteger -import akka.actor.dispatch.ActorModelSpec + import com.typesafe.config.Config + +import akka.actor.dispatch.ActorModelSpec import akka.dispatch.DispatcherPrerequisites import akka.dispatch.MessageDispatcher import akka.dispatch.MessageDispatcherConfigurator diff --git a/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala b/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala index 8fe3d12563..e1c31f6993 100644 --- a/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/BoundedBlockingQueueSpec.scala @@ -8,20 +8,21 @@ import java.util import java.util.concurrent._ import java.util.concurrent.locks.{ Condition, LockSupport, ReentrantLock } -import akka.util.DefaultExecutionContext._ +import scala.collection.mutable +import scala.concurrent.{ Await, ExecutionContext, ExecutionContextExecutor, Future } +import scala.util.control.Exception + import org.scalactic.source.Position import org.scalatest.concurrent.{ Signaler, ThreadSignaler } import org.scalatest.exceptions.TestFailedDueToTimeoutException import org.scalatest.matchers.{ MatchResult, Matcher } +import org.scalatest.matchers.should.Matchers import org.scalatest.time.Span import org.scalatest.time.SpanSugar._ -import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.util.DefaultExecutionContext._ import akka.util.ccompat.JavaConverters._ -import scala.collection.mutable -import scala.concurrent.{ Await, ExecutionContext, ExecutionContextExecutor, Future } -import scala.util.control.Exception class BoundedBlockingQueueSpec extends AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala index 3a676e6655..8d96a395e4 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ByteIteratorSpec.scala @@ -4,10 +4,11 @@ package akka.util -import akka.util.ByteIterator.ByteArrayIterator import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.util.ByteIterator.ByteArrayIterator + class ByteIteratorSpec extends AnyWordSpec with Matchers { "A ByteIterator" should { diff --git a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala index d12c25bffb..c01f3d68a8 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ByteStringSpec.scala @@ -10,16 +10,17 @@ import java.lang.Float.floatToRawIntBits import java.nio.{ ByteBuffer, ByteOrder } import java.nio.ByteOrder.{ BIG_ENDIAN, LITTLE_ENDIAN } -import akka.util.ByteString.{ ByteString1, ByteString1C, ByteStrings } +import scala.collection.mutable.Builder + import com.github.ghik.silencer.silent import org.apache.commons.codec.binary.Hex.encodeHex -import org.scalacheck.Arbitrary.arbitrary import org.scalacheck.{ Arbitrary, Gen } +import org.scalacheck.Arbitrary.arbitrary import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec import org.scalatestplus.scalacheck.Checkers -import scala.collection.mutable.Builder +import akka.util.ByteString.{ ByteString1, ByteString1C, ByteStrings } class ByteStringSpec extends AnyWordSpec with Matchers with Checkers { diff --git a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala b/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala index bc7adeb9f4..723784b118 100644 --- a/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/DurationSpec.scala @@ -4,10 +4,10 @@ package akka.util -import language.postfixOps - import scala.concurrent.duration._ +import language.postfixOps + import akka.testkit.AkkaSpec class DurationSpec extends AkkaSpec { diff --git a/akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala index a1004ae22c..c58a01249d 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ImmutableIntMapSpec.scala @@ -5,6 +5,7 @@ package akka.util import scala.util.Random + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala b/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala index 32c5d44041..0463c984da 100644 --- a/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/IndexSpec.scala @@ -5,13 +5,16 @@ package akka.util import java.util.Comparator -import scala.concurrent.Future -import akka.testkit.AkkaSpec + import scala.concurrent.Await -import scala.util.Random -import akka.testkit.DefaultTimeout -import org.scalatest.matchers.should.Matchers import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.Future +import scala.util.Random + +import org.scalatest.matchers.should.Matchers + +import akka.testkit.AkkaSpec +import akka.testkit.DefaultTimeout class IndexSpec extends AkkaSpec with Matchers with DefaultTimeout { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala index 2c61b0d67a..9fcf883dcc 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ManifestInfoSpec.scala @@ -4,8 +4,8 @@ package akka.util -import akka.util.ManifestInfo.Version import akka.testkit.AkkaSpec +import akka.util.ManifestInfo.Version class ManifestInfoSpec extends AkkaSpec { "ManifestInfo" should { diff --git a/akka-actor-tests/src/test/scala/akka/util/ManifestInfoVersionSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ManifestInfoVersionSpec.scala index 7cdfd24cd4..19aab3c4dc 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ManifestInfoVersionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ManifestInfoVersionSpec.scala @@ -4,10 +4,11 @@ package akka.util -import akka.util.ManifestInfo.Version import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.util.ManifestInfo.Version + class ManifestInfoVersionSpec extends AnyWordSpec with Matchers { "Version" should { diff --git a/akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala b/akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala index fd7f173280..c25d207241 100644 --- a/akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/MessageBufferSpec.scala @@ -4,10 +4,11 @@ package akka.util -import akka.actor.{ ActorPath, ActorRef, ActorRefProvider, MinimalActorRef } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.{ ActorPath, ActorRef, ActorRefProvider, MinimalActorRef } + class MessageBufferSpec extends AnyWordSpec with Matchers { import MessageBufferSpec._ diff --git a/akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala b/akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala index 70a6ff56d0..89d7c322ec 100644 --- a/akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/PrettyDurationSpec.scala @@ -9,10 +9,10 @@ import org.scalatest.wordspec.AnyWordSpec class PrettyDurationSpec extends AnyWordSpec with Matchers { - import akka.util.PrettyDuration._ - import scala.concurrent.duration._ + import akka.util.PrettyDuration._ + val cases: Seq[(Duration, String)] = 9.nanos -> "9.000 ns" :: 95.nanos -> "95.00 ns" :: diff --git a/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala index 5b203eecdc..c653234e20 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala @@ -5,6 +5,7 @@ package akka.util import scala.collection.immutable + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala b/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala index 04cefc7e55..d4c458a080 100644 --- a/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/SwitchSpec.scala @@ -6,6 +6,7 @@ package akka.util import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala b/akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala index 2670b9be42..20c7323d11 100644 --- a/akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/TokenBucketSpec.scala @@ -4,10 +4,10 @@ package akka.util -import akka.testkit.AkkaSpec - import scala.util.Random +import akka.testkit.AkkaSpec + class TokenBucketSpec extends AkkaSpec { class TestBucket(_cap: Long, _period: Long) extends TokenBucket(_cap, _period) { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala index 16e9f680a2..6e59e15eb9 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorContextSpec.scala @@ -4,6 +4,11 @@ package akka.actor.typed +import scala.concurrent.duration._ +import scala.reflect.ClassTag + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.InvalidMessageException import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.LogCapturing @@ -11,10 +16,6 @@ import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.duration._ -import scala.reflect.ClassTag object ActorSpecMessages { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala index d227a1f192..650ac6f12d 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefIgnoreSpec.scala @@ -6,17 +6,18 @@ package akka.actor.typed import java.util.concurrent.TimeoutException -import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.wordspec.AnyWordSpecLike -import org.scalatest.concurrent.PatienceConfiguration.{ Timeout => PatienceTimeout } -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.scaladsl.adapter._ -import akka.actor.typed.scaladsl.AskPattern._ -import akka.util.Timeout - import scala.concurrent.duration._ import scala.util.{ Failure, Success } +import org.scalatest.concurrent.PatienceConfiguration.{ Timeout => PatienceTimeout } +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import akka.actor.typed.scaladsl.AskPattern._ +import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.adapter._ +import akka.util.Timeout + class ActorRefIgnoreSpec extends ScalaTestWithActorTestKit() with AnyWordSpecLike { case class Request(replyTo: ActorRef[Int]) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala index 586392d7ba..11afc59f8c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ActorRefResolverSpec.scala @@ -4,15 +4,16 @@ package akka.actor.typed +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.ActorPath import akka.actor.ActorRefProvider import akka.actor.ActorSystemImpl import akka.actor.MinimalActorRef import akka.actor.RootActorPath import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.concurrent.ScalaFutures -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class ActorRefResolverSpec extends AnyWordSpec with ScalaFutures with Matchers { "ActorRefResolver" should { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala index 407499c6ee..649a4a7e13 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/AskSpec.scala @@ -4,6 +4,14 @@ package akka.actor.typed +import scala.concurrent.ExecutionContext +import scala.concurrent.Future +import scala.concurrent.TimeoutException +import scala.concurrent.duration._ +import scala.util.Success + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit @@ -13,13 +21,6 @@ import akka.actor.typed.scaladsl.AskPattern._ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.Behaviors._ import akka.util.Timeout -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.concurrent.ExecutionContext -import scala.concurrent.TimeoutException -import scala.util.Success object AskSpec { sealed trait Msg @@ -125,8 +126,9 @@ class AskSpec extends ScalaTestWithActorTestKit(""" val legacyActor = classicSystem.actorOf(akka.actor.Props(new LegacyActor)) - import akka.actor.typed.scaladsl.adapter._ import scaladsl.AskPattern._ + + import akka.actor.typed.scaladsl.adapter._ implicit val timeout: Timeout = 3.seconds val typedLegacy: ActorRef[AnyRef] = legacyActor (typedLegacy.ask(Ping)).failed.futureValue should ===(ex) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala index 9879948a66..9f5ec3c8a1 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/BehaviorSpec.scala @@ -4,21 +4,22 @@ package akka.actor.typed -import akka.actor.typed.scaladsl.{ Behaviors => SBehaviors } -import akka.actor.typed.scaladsl.{ AbstractBehavior => SAbstractBehavior } -import akka.actor.typed.javadsl.{ Behaviors => JBehaviors } -import akka.japi.pf.{ FI, PFBuilder } import java.util.function.{ Function => F1 } -import akka.Done -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox } -import org.scalactic.TypeCheckedTripleEquals import com.github.ghik.silencer.silent +import org.scalactic.TypeCheckedTripleEquals import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike +import akka.Done +import akka.actor.testkit.typed.scaladsl.{ BehaviorTestKit, TestInbox } +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.typed.javadsl.{ Behaviors => JBehaviors } +import akka.actor.typed.scaladsl.{ AbstractBehavior => SAbstractBehavior } +import akka.actor.typed.scaladsl.{ Behaviors => SBehaviors } +import akka.japi.pf.{ FI, PFBuilder } + object BehaviorSpec { sealed trait Command { @silent diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala index 55070c98d7..8631fd6470 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/DeferredSpec.scala @@ -4,16 +4,17 @@ package akka.actor.typed -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.scaladsl._ import scala.util.control.NoStackTrace -import akka.actor.ActorInitializationException -import akka.actor.testkit.typed.scaladsl.LoggingTestKit import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } +import akka.actor.ActorInitializationException +import akka.actor.testkit.typed.TestKitSettings +import akka.actor.testkit.typed.scaladsl._ +import akka.actor.testkit.typed.scaladsl.LoggingTestKit +import akka.actor.typed.scaladsl.Behaviors + object DeferredSpec { sealed trait Command case object Ping extends Command diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala index cadbb790ab..326fd3b48a 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/ExtensionsSpec.scala @@ -6,17 +6,18 @@ package akka.actor.typed import java.util.concurrent.atomic.AtomicInteger -import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.Future +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.BootstrapSetup import akka.actor.setup.ActorSystemSetup -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.receptionist.Receptionist import akka.actor.typed.receptionist.ServiceKey import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.wordspec.AnyWordSpecLike class DummyExtension1 extends Extension object DummyExtension1 extends ExtensionId[DummyExtension1] { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala index ba6ce40d5e..cb593a955c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/InterceptSpec.scala @@ -6,17 +6,18 @@ package akka.actor.typed import java.util.concurrent.atomic.AtomicBoolean -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors import scala.concurrent.duration._ +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorInitializationException +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.internal.PoisonPill import akka.actor.typed.internal.PoisonPillInterceptor -import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.typed.scaladsl.Behaviors object InterceptSpec { final case class Msg(hello: String, replyTo: ActorRef[String]) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala index c896571230..bbcbda23aa 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/LogMessagesSpec.scala @@ -4,14 +4,15 @@ package akka.actor.typed +import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.event.Level + import akka.actor +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ -import org.slf4j.event.Level -import org.scalatest.wordspec.AnyWordSpecLike class LogMessagesSpec extends ScalaTestWithActorTestKit(""" akka.loglevel = DEBUG # test verifies debug diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala index 7e1f8e2edc..31e1422041 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MailboxSelectorSpec.scala @@ -7,10 +7,12 @@ package akka.actor.typed import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorCell +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.internal.adapter.ActorContextAdapter import akka.actor.typed.scaladsl.AskPattern._ import akka.actor.typed.scaladsl.Behaviors @@ -18,7 +20,6 @@ import akka.dispatch.BoundedMessageQueueSemantics import akka.dispatch.BoundedNodeMessageQueue import akka.dispatch.MessageQueue import akka.dispatch.UnboundedMessageQueueSemantics -import org.scalatest.wordspec.AnyWordSpecLike class MailboxSelectorSpec extends ScalaTestWithActorTestKit(""" specific-mailbox { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala index 5ed04d106c..69d8f22258 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/MonitorSpec.scala @@ -4,11 +4,12 @@ package akka.actor.typed +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.wordspec.AnyWordSpecLike class MonitorSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala index b247dd534b..93b7abef36 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/OrElseSpec.scala @@ -6,11 +6,12 @@ package akka.actor.typed import scala.annotation.tailrec -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.typed.scaladsl.Behaviors import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.testkit.typed.scaladsl._ +import akka.actor.typed.scaladsl.Behaviors + /** * Background: Originally there was an `OrElseBehavior` that could compose two `Behavior`, but that * wasn't safe when used together with narrow so `OrElseBehavior` was removed. Kept this diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala index ddf3081658..588e5ee0a8 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/PropsSpec.scala @@ -4,10 +4,11 @@ package akka.actor.typed -import akka.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.testkit.typed.scaladsl.LogCapturing + class PropsSpec extends AnyWordSpec with Matchers with LogCapturing { val dispatcherFirst = Props.empty.withDispatcherFromConfig("pool").withDispatcherDefault diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala index af7f1ebb3b..f7c0b37875 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SpawnProtocolSpec.scala @@ -4,16 +4,17 @@ package akka.actor.typed +import scala.concurrent.Future import scala.concurrent.duration._ + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } + import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.scaladsl.Behaviors import akka.util.Timeout -import scala.concurrent.Future -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } - object SpawnProtocolSpec { sealed trait Message final case class Ping(replyTo: ActorRef[Pong.type]) extends Message diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala index e0a9b9aa5b..17dd79df29 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/SupervisionSpec.scala @@ -10,27 +10,28 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicInteger -import akka.actor.ActorInitializationException -import akka.actor.Dropped -import akka.actor.testkit.typed._ -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl._ -import akka.actor.typed.SupervisorStrategy.Resume -import akka.actor.typed.scaladsl.AbstractBehavior -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.Behaviors._ -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec -import org.scalatest.wordspec.AnyWordSpecLike -import org.slf4j.event.Level - import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success import scala.util.control.NoStackTrace +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec +import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.event.Level + +import akka.actor.ActorInitializationException +import akka.actor.Dropped +import akka.actor.testkit.typed._ +import akka.actor.testkit.typed.scaladsl._ +import akka.actor.testkit.typed.scaladsl.LoggingTestKit +import akka.actor.typed.SupervisorStrategy.Resume +import akka.actor.typed.scaladsl.AbstractBehavior +import akka.actor.typed.scaladsl.ActorContext +import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.Behaviors._ + object SupervisionSpec { sealed trait Command diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala index e7739609c3..ee3f43511a 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TerminatedSpec.scala @@ -4,11 +4,12 @@ package akka.actor.typed -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.TestInbox + class TerminatedSpec extends AnyWordSpec with Matchers with LogCapturing { "Child Failed" must { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala index e957858294..187a357735 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TimerSpec.scala @@ -8,17 +8,18 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.DeadLetter import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl._ +import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.TimerScheduler import akka.testkit.TimingTest -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace class TimerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala index 9af30609d0..77b77e9f1f 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/TransformMessagesSpec.scala @@ -6,17 +6,18 @@ package akka.actor.typed import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.duration._ + +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor import akka.actor.ActorInitializationException +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ -import scala.concurrent.duration._ - -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor object TransformMessagesSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala index d2960095b9..8727ee887f 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/WatchSpec.scala @@ -4,20 +4,21 @@ package akka.actor.typed -import akka.Done -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.AbstractBehavior -import akka.actor.typed.scaladsl.adapter._ -import akka.actor.testkit.typed.scaladsl.TestProbe import scala.concurrent._ import scala.concurrent.duration._ +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.Done +import akka.actor import akka.actor.testkit.typed.TestException +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor +import akka.actor.testkit.typed.scaladsl.TestProbe +import akka.actor.typed.scaladsl.AbstractBehavior +import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.adapter._ object WatchSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala index 818785b33f..c0f5ed80fd 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala @@ -3,6 +3,11 @@ */ package akka.actor.typed.coexistence +import com.typesafe.config.ConfigFactory +import org.scalatest.BeforeAndAfterAll +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.{ actor => u } import akka.actor.Actor import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.LogCapturing @@ -10,10 +15,6 @@ import akka.actor.typed._ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.testkit.TestProbe -import akka.{ actor => u } -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfterAll -import org.scalatest.wordspec.AnyWordSpecLike object ProbedBehavior { def behavior(probe: u.ActorRef): Behavior[String] = { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala index 8b086e2ead..11ec5af56c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/coexistence/TypedSupervisingClassicSpec.scala @@ -3,15 +3,16 @@ */ package akka.actor.typed.coexistence +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.{ actor => classic } import akka.actor.Actor import akka.actor.testkit.typed.TestException -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorRef import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ -import akka.{ actor => classic } -import org.scalatest.wordspec.AnyWordSpecLike object TypedSupervisingClassicSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala index 12aa14fca7..32f15a4677 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala @@ -4,12 +4,13 @@ package akka.actor.typed.delivery +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.delivery.ConsumerController.DeliverThenStop import akka.actor.typed.delivery.internal.ConsumerControllerImpl import akka.actor.typed.delivery.internal.ProducerControllerImpl -import org.scalatest.wordspec.AnyWordSpecLike class ConsumerControllerSpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala index ba1eb6b0ae..d09a8aa488 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableProducerControllerSpec.scala @@ -8,21 +8,22 @@ import java.util.concurrent.atomic.AtomicReference import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import DurableProducerQueue.MessageSent import ProducerController.MessageWithConfirmation -import akka.actor.typed.delivery.internal.ProducerControllerImpl import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.typed.delivery.internal.ProducerControllerImpl + class DurableProducerControllerSpec extends ScalaTestWithActorTestKit(""" akka.reliable-delivery.consumer-controller.flow-control-window = 20 """) with AnyWordSpecLike with LogCapturing { - import TestConsumer.sequencedMessage import DurableProducerQueue.NoQualifier + import TestConsumer.sequencedMessage import TestDurableProducerQueue.TestTimestamp private var idCount = 0 diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala index 082d5c1bee..8cb63f6281 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/DurableWorkPullingSpec.scala @@ -8,15 +8,16 @@ import java.util.concurrent.atomic.AtomicReference import scala.concurrent.duration._ +import DurableProducerQueue.MessageSent +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.ActorRef -import DurableProducerQueue.MessageSent import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.actor.typed.receptionist.Receptionist import akka.actor.typed.receptionist.ServiceKey -import org.scalatest.wordspec.AnyWordSpecLike class DurableWorkPullingSpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala index 0dda08546b..e2b930d093 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ProducerControllerSpec.scala @@ -6,11 +6,12 @@ package akka.actor.typed.delivery import scala.concurrent.duration._ +import ProducerController.MessageWithConfirmation +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import ProducerController.MessageWithConfirmation import akka.actor.typed.delivery.internal.ProducerControllerImpl -import org.scalatest.wordspec.AnyWordSpecLike class ProducerControllerSpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala index 2432fbc5ba..ff7839ae79 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliveryRandomSpec.scala @@ -9,6 +9,8 @@ import java.util.concurrent.atomic.AtomicReference import scala.concurrent.duration._ import scala.util.Random +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.Behavior @@ -17,7 +19,6 @@ import akka.actor.typed.TypedActorContext import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.LoggerOps -import org.scalatest.wordspec.AnyWordSpecLike object ReliableDeliveryRandomSpec { object RandomFlakyNetwork { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala index 83057b71a2..c81a56f296 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ReliableDeliverySpec.scala @@ -6,9 +6,10 @@ package akka.actor.typed.delivery import scala.concurrent.duration._ +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import org.scalatest.wordspec.AnyWordSpecLike class ReliableDeliverySpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala index bac1a3b18d..d71ef74971 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestConsumer.scala @@ -4,13 +4,14 @@ package akka.actor.typed.delivery +import scala.concurrent.duration._ import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import scala.concurrent.duration._ + +import ConsumerController.SequencedMessage import akka.actor.typed.ActorRef import akka.actor.typed.Behavior -import ConsumerController.SequencedMessage import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.actor.typed.scaladsl.ActorContext import akka.actor.typed.scaladsl.Behaviors diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala index 9f0c1ab931..5b8a2049da 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducer.scala @@ -4,9 +4,9 @@ package akka.actor.typed.delivery +import scala.concurrent.duration._ import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import scala.concurrent.duration._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala index 8f9afa1337..9b02332ccc 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/TestProducerWithAsk.scala @@ -4,8 +4,8 @@ package akka.actor.typed.delivery -import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration._ +import scala.concurrent.duration.FiniteDuration import scala.util.Failure import scala.util.Success diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala index 6ece36f5de..09a3198f62 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/WorkPullingSpec.scala @@ -6,6 +6,8 @@ package akka.actor.typed.delivery import scala.concurrent.duration._ +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit @@ -13,7 +15,6 @@ import akka.actor.typed.ActorRef import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.actor.typed.receptionist.Receptionist import akka.actor.typed.receptionist.ServiceKey -import org.scalatest.wordspec.AnyWordSpecLike class WorkPullingSpec extends ScalaTestWithActorTestKit(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala index 6cd723c3fa..8c88de2b70 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/eventstream/EventStreamSpec.scala @@ -6,14 +6,15 @@ package akka.actor.typed.eventstream import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import akka.actor.testkit.typed.scaladsl.LogCapturing + class EventStreamSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { - import EventStreamSpec._ import EventStream._ + import EventStreamSpec._ private final val ShortWait = 100.millis diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala index 01dc803ee9..5d3fad71ca 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorRefSerializationSpec.scala @@ -4,14 +4,15 @@ package akka.actor.typed.internal -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.ActorRef -import akka.serialization.{ JavaSerializer, SerializationExtension } -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.typed.ActorRef +import akka.actor.typed.scaladsl.Behaviors +import akka.serialization.{ JavaSerializer, SerializationExtension } + object ActorRefSerializationSpec { def config = ConfigFactory.parseString(""" akka.actor { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala index 3fee397c65..416611b8b7 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/ActorSystemSpec.scala @@ -9,17 +9,19 @@ import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.control.NonFatal -import akka.Done -import akka.actor.{ Address, CoordinatedShutdown, InvalidMessageException } -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.scaladsl.Behaviors + import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.Eventually import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.Done +import akka.actor.{ Address, CoordinatedShutdown, InvalidMessageException } +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.TestInbox +import akka.actor.typed.scaladsl.Behaviors + class ActorSystemSpec extends AnyWordSpec with Matchers diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala index d9786277a6..c2f5970800 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/adpater/PropsAdapterSpec.scala @@ -4,12 +4,13 @@ package akka.actor.typed.internal.adpater +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor import akka.actor.typed.Props import akka.actor.typed.internal.adapter.PropsAdapter import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class PropsAdapterSpec extends AnyWordSpec with Matchers { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala index b041bd4fc2..5c30b64421 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/LocalReceptionistSpec.scala @@ -6,19 +6,20 @@ package akka.actor.typed.internal.receptionist import scala.concurrent.Future -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } + import akka.actor.testkit.typed.scaladsl.BehaviorTestKit +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestInbox import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed._ import akka.actor.typed.receptionist.Receptionist import akka.actor.typed.receptionist.Receptionist._ import akka.actor.typed.receptionist.ServiceKey import akka.actor.typed.scaladsl.AskPattern._ import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.{ AnyWordSpec, AnyWordSpecLike } object LocalReceptionistSpec { trait ServiceA diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala index b395d65c14..d3d0c66d25 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala @@ -4,12 +4,13 @@ package akka.actor.typed.internal.receptionist +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.internal.ActorRefSerializationSpec import akka.actor.typed.receptionist.ServiceKey import akka.serialization.SerializationExtension -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike class ServiceKeySerializationSpec extends ScalaTestWithActorTestKit(ActorRefSerializationSpec.config) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala index 827c32b54e..14f3b71ebb 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/PoolRouterSpec.scala @@ -4,10 +4,11 @@ package akka.actor.typed.internal.routing +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit } import akka.actor.typed.{ ActorRef, Behavior, DispatcherSelector } import akka.actor.typed.scaladsl.{ Behaviors, Routers } -import org.scalatest.wordspec.AnyWordSpecLike object PoolRouterSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala index 411f162e84..8d8eb93140 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/internal/routing/RoutingLogicSpec.scala @@ -4,14 +4,15 @@ package akka.actor.typed.internal.routing -import akka.actor.Address -import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.internal.routing.RoutingLogics.ConsistentHashingLogic -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorSystem, Behavior } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.Address +import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit, TestProbe } +import akka.actor.typed.{ ActorSystem, Behavior } +import akka.actor.typed.internal.routing.RoutingLogics.ConsistentHashingLogic +import akka.actor.typed.scaladsl.Behaviors + class RoutingLogicSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Matchers with LogCapturing { val emptyMessage: Any = "" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala index 0204232c27..3a5b11d9e1 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/javadsl/AdaptationFailureSpec.scala @@ -4,6 +4,10 @@ package akka.actor.typed.javadsl +import scala.concurrent.Promise + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.LogCapturing @@ -12,9 +16,6 @@ import akka.actor.typed.Behavior import akka.actor.typed.MessageAdaptionFailure import akka.actor.typed.PreRestart import akka.actor.typed.Terminated -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.Promise object AdaptationFailureSpec { def emptyAbstractBehavior: Behavior[Any] = Behaviors.setup(new EmptyAbstractBehavior(_)) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala index 4d2d4774a9..eee5e7985e 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/pubsub/LocalPubSubSpec.scala @@ -4,13 +4,14 @@ package akka.actor.typed.pubsub -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.typed.internal.pubsub.TopicImpl +import scala.concurrent.duration._ + import org.scalatest.wordspec.AnyWordSpecLike -import scala.concurrent.duration._ +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.LoggingTestKit +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.typed.internal.pubsub.TopicImpl class LocalPubSubSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala index 17912dc553..334ecb41f1 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/receptionist/ReceptionistApiSpec.scala @@ -4,15 +4,15 @@ package akka.actor.typed.receptionist +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.Success + import akka.actor.typed.{ ActorRef, ActorSystem } import akka.actor.typed.scaladsl.AskPattern._ import akka.actor.typed.scaladsl.Behaviors import akka.util.Timeout -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.Success - object ReceptionistApiSpec { def compileOnlySpec(): Unit = { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala index 04d4365440..30ee43d410 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextAskSpec.scala @@ -4,18 +4,19 @@ package akka.actor.typed.scaladsl -import akka.actor.typed.{ ActorRef, PostStop, Props } -import akka.actor.testkit.typed.scaladsl.TestProbe -import com.typesafe.config.ConfigFactory import scala.concurrent.TimeoutException import scala.concurrent.duration._ import scala.reflect.ClassTag import scala.util.{ Failure, Success } +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.TestProbe +import akka.actor.typed.{ ActorRef, PostStop, Props } object ActorContextAskSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala index 25bbdfa13f..d035933382 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala @@ -5,16 +5,17 @@ package akka.actor.typed.scaladsl import scala.concurrent.Future -import scala.util.control.NoStackTrace +import scala.concurrent.Promise import scala.util.{ Failure, Success } -import akka.actor.testkit.typed.scaladsl.LoggingTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.Props +import scala.util.control.NoStackTrace + import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike -import scala.concurrent.Promise +import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.LoggingTestKit +import akka.actor.typed.Props object ActorContextPipeToSelfSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala index b62d77e55c..1cef1367b3 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala @@ -7,14 +7,21 @@ package akka.actor.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReference +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.LoggerFactory +import org.slf4j.MDC +import org.slf4j.helpers.BasicMarkerFactory + import akka.actor.ActorPath +import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem import akka.actor.testkit.typed.LoggingEvent import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.ActorTestKit +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorTags import akka.actor.typed.Behavior import akka.actor.typed.internal.ActorMdc @@ -23,12 +30,6 @@ import akka.event.DefaultLoggingFilter import akka.event.Logging.DefaultLogger import akka.event.slf4j.Slf4jLogger import akka.event.slf4j.Slf4jLoggingFilter -import com.typesafe.config.ConfigFactory -import org.slf4j.LoggerFactory -import org.slf4j.MDC -import org.slf4j.helpers.BasicMarkerFactory -import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.ActorSystem class SomeClass @@ -279,9 +280,9 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit(""" } "SLF4J Settings" must { - import akka.actor.typed.scaladsl.adapter._ - import akka.actor.ExtendedActorSystem import akka.actor.{ ActorSystem => ClassicActorSystem } + import akka.actor.ExtendedActorSystem + import akka.actor.typed.scaladsl.adapter._ "by default be amended to use Slf4jLogger" in { system.settings.config.getStringList("akka.loggers").size() should ===(1) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala index 36d3098ac0..653b0556f4 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/AdaptationFailureSpec.scala @@ -4,6 +4,10 @@ package akka.actor.typed.scaladsl +import scala.concurrent.Promise + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.LogCapturing @@ -13,9 +17,6 @@ import akka.actor.typed.MessageAdaptionFailure import akka.actor.typed.PreRestart import akka.actor.typed.Signal import akka.actor.typed.Terminated -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.Promise object AdaptationFailureSpec { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala index a9585006d7..f22c27f81c 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/DispatcherSelectorSpec.scala @@ -4,21 +4,22 @@ package akka.actor.typed.scaladsl +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.BootstrapSetup import akka.actor.setup.ActorSystemSetup import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Props import akka.actor.typed.SpawnProtocol -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object DispatcherSelectorSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala index 60a88e8763..d63dd6271a 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/GracefulStopSpec.scala @@ -5,12 +5,13 @@ package akka.actor.typed package scaladsl +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.NotUsed +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike final class GracefulStopSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala index 21a46adb97..b664fcc120 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/LoggerOpsSpec.scala @@ -4,11 +4,12 @@ package akka.actor.typed.scaladsl +import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.LoggerFactory + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.slf4j.LoggerFactory -import org.scalatest.wordspec.AnyWordSpecLike object LoggerOpsSpec { case class Value1(i: Int) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala index fe52bdb539..0e0280f3fd 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala @@ -4,6 +4,10 @@ package akka.actor.typed.scaladsl +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.event.Level + import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit @@ -13,9 +17,6 @@ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior import akka.actor.typed.PostStop import akka.actor.typed.Props -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike -import org.slf4j.event.Level object MessageAdapterSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala index 58f1e8bbf4..f17b26993f 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/OnSignalSpec.scala @@ -5,12 +5,13 @@ package akka.actor.typed package scaladsl +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done +import akka.actor.testkit.typed.scaladsl.ActorTestKit +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.testkit.typed.scaladsl.ActorTestKit final class OnSignalSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala index 7bc2896b8f..5ac7e970b8 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ReceivePartialSpec.scala @@ -5,11 +5,13 @@ package akka.actor.typed package scaladsl +import scala.concurrent.ExecutionContextExecutor + +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike -import scala.concurrent.ExecutionContextExecutor class ReceivePartialSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala index cd5d344f50..6ce527e426 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/RoutersSpec.scala @@ -5,6 +5,9 @@ package akka.actor.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorSystem import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit @@ -16,8 +19,6 @@ import akka.actor.typed.internal.routing.RoutingLogics import akka.actor.typed.receptionist.Receptionist import akka.actor.typed.receptionist.ServiceKey import akka.actor.typed.scaladsl.adapter._ -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike class RoutersSpec extends ScalaTestWithActorTestKit(""" akka.loglevel=debug diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala index 9f648144df..bc56511023 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashBufferSpec.scala @@ -4,13 +4,14 @@ package akka.actor.typed.scaladsl -import akka.actor.typed.Behavior -import akka.actor.testkit.typed.internal.StubbedActorContext -import akka.actor.testkit.typed.scaladsl.TestInbox -import akka.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.testkit.typed.internal.StubbedActorContext +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.TestInbox +import akka.actor.typed.Behavior + class StashBufferSpec extends AnyWordSpec with Matchers with LogCapturing { val context = new StubbedActorContext[String]( diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala index 14ed700f16..9b2b7ad359 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StashSpec.scala @@ -8,14 +8,15 @@ package scaladsl import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.duration._ + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.duration._ object AbstractStashSpec { sealed trait Command diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala index 26533a1e78..c5cb2df912 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/StopSpec.scala @@ -4,15 +4,16 @@ package akka.actor.typed.scaladsl +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed import akka.actor.typed.Behavior import akka.actor.typed.BehaviorInterceptor import akka.actor.typed.PostStop -import org.scalatest.wordspec.AnyWordSpecLike class StopSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { import BehaviorInterceptor._ 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 04c579c75b..2f79e69b43 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 @@ -5,25 +5,27 @@ package akka.actor.typed.scaladsl.adapter import scala.util.control.NoStackTrace + +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + +import akka.{ actor => classic } +import akka.Done +import akka.NotUsed +import akka.actor.ActorInitializationException import akka.actor.InvalidMessageException import akka.actor.testkit.typed.TestException -import akka.actor.typed.scaladsl.Behaviors +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Terminated -import akka.testkit._ -import akka.Done -import akka.NotUsed -import akka.actor.ActorInitializationException -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.typed.internal.adapter.SchedulerAdapter +import akka.actor.typed.scaladsl.Behaviors import akka.serialization.SerializationExtension -import akka.{ actor => classic } -import org.scalatest.BeforeAndAfterAll -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec +import akka.testkit._ object AdapterSpec { val classic1: classic.Props = classic.Props(new Classic1) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala index 31b442f6ad..d925085896 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala @@ -7,14 +7,15 @@ package akka.actor.typed.scaladsl.adapter import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.ActorSystemImpl import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorSystem import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.concurrent.ScalaFutures -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class GuardianStartupSpec extends AnyWordSpec with Matchers with ScalaFutures with LogCapturing { diff --git a/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala b/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala index 18e9020caa..625b3657f9 100644 --- a/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala +++ b/akka-actor-typed/src/main/scala-jdk-9/akka/actor/typed/internal/jfr/Events.scala @@ -4,13 +4,14 @@ package akka.actor.typed.internal.jfr -import akka.annotation.InternalApi import jdk.jfr.Category import jdk.jfr.Enabled import jdk.jfr.Event import jdk.jfr.Label import jdk.jfr.StackTrace +import akka.annotation.InternalApi + // requires jdk9+ to compile // for editing these in IntelliJ, open module settings, change JDK dependency to 11 for only this module diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala index cfefcea1eb..e5a10553cb 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/ActorRef.scala @@ -4,10 +4,11 @@ package akka.actor.typed -import akka.annotation.DoNotInherit -import akka.{ actor => classic } import scala.annotation.unchecked.uncheckedVariance + +import akka.{ actor => classic } import akka.actor.typed.internal.InternalRecipientRef +import akka.annotation.DoNotInherit /** * An ActorRef is the identity or address of an Actor instance. It is valid @@ -76,8 +77,8 @@ private[akka] object SerializedActorRef { } def toAddress[T](actorRef: ActorRef[T]) = { - import akka.serialization.JavaSerializer.currentSystem import akka.actor.typed.scaladsl.adapter._ + import akka.serialization.JavaSerializer.currentSystem val resolver = ActorRefResolver(currentSystem.value.toTyped) resolver.toSerializationFormat(actorRef) } @@ -89,8 +90,8 @@ private[akka] object SerializedActorRef { */ @SerialVersionUID(1L) private[akka] final case class SerializedActorRef[T] private (address: String) { - import akka.serialization.JavaSerializer.currentSystem import akka.actor.typed.scaladsl.adapter._ + import akka.serialization.JavaSerializer.currentSystem def this(actorRef: ActorRef[T]) = this(SerializedActorRef.toAddress(actorRef)) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala index ad57858958..8e1570ae94 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/ActorSystem.scala @@ -6,19 +6,20 @@ package akka.actor.typed import java.util.concurrent.{ CompletionStage, ThreadFactory } -import akka.actor.setup.ActorSystemSetup -import akka.actor.typed.eventstream.EventStream -import akka.actor.typed.internal.adapter.{ ActorSystemAdapter, GuardianStartupBehavior, PropsAdapter } -import akka.actor.typed.internal.{ EventStreamExtension, InternalRecipientRef } -import akka.actor.typed.receptionist.Receptionist -import akka.actor.{ Address, BootstrapSetup, ClassicActorSystemProvider } -import akka.annotation.DoNotInherit -import akka.util.Helpers.Requiring -import akka.{ Done, actor => classic } +import scala.concurrent.{ ExecutionContextExecutor, Future } + import com.typesafe.config.{ Config, ConfigFactory } import org.slf4j.Logger -import scala.concurrent.{ ExecutionContextExecutor, Future } +import akka.{ Done, actor => classic } +import akka.actor.{ Address, BootstrapSetup, ClassicActorSystemProvider } +import akka.actor.setup.ActorSystemSetup +import akka.actor.typed.eventstream.EventStream +import akka.actor.typed.internal.{ EventStreamExtension, InternalRecipientRef } +import akka.actor.typed.internal.adapter.{ ActorSystemAdapter, GuardianStartupBehavior, PropsAdapter } +import akka.actor.typed.receptionist.Receptionist +import akka.annotation.DoNotInherit +import akka.util.Helpers.Requiring /** * An ActorSystem is home to a hierarchy of Actors. It is created using diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala index 0754296668..30f8da4937 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Behavior.scala @@ -4,6 +4,10 @@ package akka.actor.typed +import scala.annotation.switch +import scala.annotation.tailrec +import scala.reflect.ClassTag + import akka.actor.InvalidMessageException import akka.actor.typed.internal.BehaviorImpl import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior @@ -13,10 +17,6 @@ import akka.actor.typed.internal.InterceptorImpl import akka.annotation.DoNotInherit import akka.annotation.InternalApi -import scala.annotation.switch -import scala.annotation.tailrec -import scala.reflect.ClassTag - /** * The behavior of an actor defines how it reacts to the messages that it * receives. The message may either be of the type that the Actor declares diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala index c5d4f99b06..c0c4c55cc2 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Dispatchers.scala @@ -4,10 +4,10 @@ package akka.actor.typed -import akka.annotation.InternalApi - import scala.concurrent.ExecutionContextExecutor +import akka.annotation.InternalApi + object Dispatchers { /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala index a07a054b73..624a362679 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Extensions.scala @@ -4,8 +4,8 @@ package akka.actor.typed -import akka.annotation.DoNotInherit import akka.actor.setup.Setup +import akka.annotation.DoNotInherit /** * Marker trait/interface for extensions. An extension can be registered in the ActorSystem and is guaranteed to only diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala index 02ab47bfb9..eb70c31d01 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/LogOptions.scala @@ -6,10 +6,11 @@ package akka.actor.typed import java.util.Optional -import akka.annotation.{ DoNotInherit, InternalApi } import org.slf4j.Logger import org.slf4j.event.Level +import akka.annotation.{ DoNotInherit, InternalApi } + /** * Logging options when using `Behaviors.logMessages`. */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala index dcac621bd0..3172348d15 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Props.scala @@ -4,16 +4,15 @@ package akka.actor.typed +import scala.annotation.tailrec +import scala.annotation.varargs +import scala.reflect.ClassTag + +import akka.actor.typed.internal.PropsImpl._ import akka.annotation.DoNotInherit import akka.annotation.InternalApi - -import scala.annotation.tailrec -import scala.reflect.ClassTag -import akka.actor.typed.internal.PropsImpl._ import akka.util.ccompat.JavaConverters._ -import scala.annotation.varargs - object Props { /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala index 0f235be803..1b2a9a746e 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/Scheduler.scala @@ -4,12 +4,12 @@ package akka.actor.typed -import akka.actor.Cancellable -import akka.annotation.DoNotInherit - import scala.concurrent.ExecutionContext import scala.concurrent.duration.FiniteDuration +import akka.actor.Cancellable +import akka.annotation.DoNotInherit + /** * The ActorSystem facility for scheduling tasks. * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala index c25c8eee5c..7feffeeaac 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/SpawnProtocol.scala @@ -5,6 +5,7 @@ package akka.actor.typed import scala.annotation.tailrec + import akka.actor.typed.scaladsl.Behaviors import akka.annotation.DoNotInherit diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala index b84c6a033e..ed9c46faad 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/SupervisorStrategy.scala @@ -4,13 +4,14 @@ package akka.actor.typed -import akka.annotation.InternalApi - -import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration.Duration -import akka.util.JavaDurationConverters._ +import scala.concurrent.duration.FiniteDuration + import org.slf4j.event.Level +import akka.annotation.InternalApi +import akka.util.JavaDurationConverters._ + object SupervisorStrategy { /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala index 58a0230b66..7b587fc84c 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ConsumerController.scala @@ -8,6 +8,8 @@ import java.time.{ Duration => JavaDuration } import scala.concurrent.duration._ +import com.typesafe.config.Config + import akka.actor.DeadLetterSuppression import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem @@ -21,7 +23,6 @@ import akka.annotation.ApiMayChange import akka.annotation.DoNotInherit import akka.annotation.InternalApi import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config /** * `ConsumerController` and [[ProducerController]] or [[WorkPullingProducerController]] are used diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala index 4f8ce85a4a..38d577ab49 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/DurableProducerQueue.scala @@ -7,11 +7,10 @@ package akka.actor.typed.delivery import scala.collection.immutable import akka.actor.typed.ActorRef +import akka.actor.typed.delivery.internal.DeliverySerializable import akka.annotation.ApiMayChange import akka.annotation.InternalApi -import akka.actor.typed.delivery.internal.DeliverySerializable - /** * Actor message protocol for storing and confirming reliable delivery of messages. A [[akka.actor.typed.Behavior]] * implementation of this protocol can optionally be used with [[ProducerController]] when messages shall survive diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala index 7f25e678f0..c9eca025dd 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/ProducerController.scala @@ -11,6 +11,8 @@ import scala.compat.java8.OptionConverters._ import scala.concurrent.duration._ import scala.reflect.ClassTag +import com.typesafe.config.Config + import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior @@ -20,7 +22,6 @@ import akka.actor.typed.scaladsl.Behaviors import akka.annotation.ApiMayChange import akka.annotation.InternalApi import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config /** * Point-to-point reliable delivery between a single producer actor sending messages and a single consumer diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala index d34ead4cda..9135adf33c 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/WorkPullingProducerController.scala @@ -6,9 +6,11 @@ package akka.actor.typed.delivery import java.util.Optional -import scala.reflect.ClassTag import scala.compat.java8.OptionConverters._ import scala.concurrent.duration.FiniteDuration +import scala.reflect.ClassTag + +import com.typesafe.config.Config import akka.Done import akka.actor.typed.ActorRef @@ -19,7 +21,6 @@ import akka.actor.typed.receptionist.ServiceKey import akka.actor.typed.scaladsl.Behaviors import akka.annotation.ApiMayChange import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config /** * Work pulling is a pattern where several worker actors pull tasks in their own pace from diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala index 01798cbc29..1649ef6bcb 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/delivery/internal/ConsumerControllerImpl.scala @@ -18,8 +18,8 @@ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.LoggerOps import akka.actor.typed.scaladsl.StashBuffer import akka.actor.typed.scaladsl.TimerScheduler -import akka.util.ConstantFun.scalaIdentityFunction import akka.annotation.InternalApi +import akka.util.ConstantFun.scalaIdentityFunction /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala index 97ea12189d..727a927003 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/eventstream/EventStream.scala @@ -4,9 +4,10 @@ package akka.actor.typed.eventstream +import scala.reflect.ClassTag + import akka.actor.typed.ActorRef import akka.annotation.{ DoNotInherit, InternalApi } -import scala.reflect.ClassTag object EventStream { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala index ce71d32ab8..66acdb81c2 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorContextImpl.scala @@ -10,22 +10,23 @@ import java.util.ArrayList import java.util.Optional import java.util.concurrent.CompletionStage -import akka.actor.Address -import akka.actor.typed.internal.adapter.ActorSystemAdapter - import scala.concurrent.{ ExecutionContextExecutor, Future } import scala.reflect.ClassTag import scala.util.Try -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.util.{ BoxedType, Timeout } -import akka.util.Timeout -import akka.util.JavaDurationConverters._ -import akka.util.OptionVal + import com.github.ghik.silencer.silent import org.slf4j.Logger import org.slf4j.LoggerFactory +import akka.actor.Address +import akka.actor.typed.internal.adapter.ActorSystemAdapter +import akka.annotation.InternalApi +import akka.dispatch.ExecutionContexts +import akka.util.{ BoxedType, Timeout } +import akka.util.JavaDurationConverters._ +import akka.util.OptionVal +import akka.util.Timeout + /** * INTERNAL API */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala index f21fa01e78..3e7cf02224 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ActorMdc.scala @@ -4,9 +4,10 @@ package akka.actor.typed.internal -import akka.annotation.InternalApi import org.slf4j.MDC +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala index d1f3788305..fb7646d11c 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/BehaviorImpl.scala @@ -7,10 +7,10 @@ package internal import scala.reflect.ClassTag -import akka.util.LineNumbers -import akka.annotation.InternalApi import akka.actor.typed.{ TypedActorContext => AC } import akka.actor.typed.scaladsl.{ ActorContext => SAC } +import akka.annotation.InternalApi +import akka.util.LineNumbers import akka.util.OptionVal /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala index 469ef1eaec..0ff219371d 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/EventStreamExtension.scala @@ -4,9 +4,9 @@ package akka.actor.typed.internal -import akka.actor.typed.internal.adapter.EventStreamAdapter import akka.actor.typed._ import akka.actor.typed.eventstream.EventStream +import akka.actor.typed.internal.adapter.EventStreamAdapter import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala index 66fe0d477e..11c4dda25f 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/ExtensionsImpl.scala @@ -6,13 +6,13 @@ package akka.actor.typed.internal import java.util.concurrent.{ ConcurrentHashMap, CountDownLatch } -import akka.annotation.InternalApi -import akka.actor.typed.{ ActorSystem, Extension, ExtensionId, Extensions } import scala.annotation.tailrec import scala.util.{ Failure, Success, Try } -import akka.util.ccompat.JavaConverters._ +import akka.actor.typed.{ ActorSystem, Extension, ExtensionId, Extensions } import akka.actor.typed.ExtensionSetup +import akka.annotation.InternalApi +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala index bd3998250c..7f2d5447ad 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/InterceptorImpl.scala @@ -5,15 +5,17 @@ package akka.actor.typed.internal import scala.reflect.ClassTag -import akka.actor.typed -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.LogOptions -import akka.actor.typed._ -import akka.annotation.InternalApi -import akka.util.LineNumbers + import org.slf4j.LoggerFactory import org.slf4j.event.Level +import akka.actor.typed +import akka.actor.typed._ +import akka.actor.typed.LogOptions +import akka.actor.typed.scaladsl.Behaviors +import akka.annotation.InternalApi +import akka.util.LineNumbers + /** * Provides the impl of any behavior that could nest another behavior * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala index 0145ec1147..710498a790 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/LoggerClass.scala @@ -4,11 +4,11 @@ package akka.actor.typed.internal +import scala.util.control.NonFatal + import akka.annotation.InternalApi import akka.util.OptionVal -import scala.util.control.NonFatal - /** * INTERNAL API */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala index e22726b902..a3aa58111d 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PoisonPill.scala @@ -4,11 +4,11 @@ package akka.actor.typed.internal -import akka.actor.typed.TypedActorContext import akka.actor.typed.Behavior import akka.actor.typed.BehaviorInterceptor import akka.actor.typed.BehaviorSignalInterceptor import akka.actor.typed.Signal +import akka.actor.typed.TypedActorContext import akka.annotation.InternalApi /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala index 5be43b12a6..de98b551d2 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/PropsImpl.scala @@ -4,8 +4,8 @@ package akka.actor.typed.internal -import akka.actor.typed.ActorTags import akka.actor.typed.{ DispatcherSelector, MailboxSelector, Props } +import akka.actor.typed.ActorTags import akka.annotation.InternalApi /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala index 1612143ec1..47dab79f59 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/StashBufferImpl.scala @@ -6,10 +6,10 @@ package akka.actor.typed.internal import java.util.function.{ Function => JFunction } -import akka.actor.DeadLetter import scala.annotation.tailrec import scala.util.control.NonFatal +import akka.actor.DeadLetter import akka.actor.typed.Behavior import akka.actor.typed.Signal import akka.actor.typed.TypedActorContext @@ -18,8 +18,8 @@ import akka.actor.typed.scaladsl import akka.actor.typed.scaladsl.ActorContext import akka.annotation.{ InternalApi, InternalStableApi } import akka.japi.function.Procedure -import akka.util.OptionVal import akka.util.{ unused, ConstantFun } +import akka.util.OptionVal /** * INTERNAL API 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 6b0e8a2fb4..506c8b1966 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 @@ -13,6 +13,8 @@ import scala.reflect.ClassTag import scala.util.control.Exception.Catcher import scala.util.control.NonFatal +import org.slf4j.event.Level + import akka.actor.DeadLetterSuppression import akka.actor.Dropped import akka.actor.typed.BehaviorInterceptor.PreStartTarget @@ -25,7 +27,6 @@ import akka.annotation.InternalApi import akka.event.Logging import akka.util.OptionVal import akka.util.unused -import org.slf4j.event.Level /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala index 7b8639d359..affbf8fa1d 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/TimerSchedulerImpl.scala @@ -8,6 +8,9 @@ package internal import java.time.Duration import scala.concurrent.duration.FiniteDuration + +import org.slf4j.Logger + import akka.actor.Cancellable import akka.actor.NotInfluenceReceiveTimeout import akka.actor.typed.scaladsl.ActorContext @@ -16,7 +19,6 @@ import akka.annotation.InternalApi import akka.dispatch.ExecutionContexts import akka.util.JavaDurationConverters._ import akka.util.OptionVal -import org.slf4j.Logger /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala index 0d0b426893..76effd7d69 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/WithMdcBehaviorInterceptor.scala @@ -4,11 +4,12 @@ package akka.actor.typed.internal -import akka.actor.typed.{ Behavior, BehaviorInterceptor, Signal, TypedActorContext } -import akka.annotation.InternalApi +import scala.reflect.ClassTag + import org.slf4j.MDC -import scala.reflect.ClassTag +import akka.actor.typed.{ Behavior, BehaviorInterceptor, Signal, TypedActorContext } +import akka.annotation.InternalApi /** * INTERNAL API diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala index ba7285606a..13ea8e77d9 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorAdapter.scala @@ -8,21 +8,21 @@ package adapter import java.lang.reflect.InvocationTargetException -import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior -import akka.actor.typed.internal.BehaviorImpl.StoppedBehavior -import akka.actor.typed.internal.TimerSchedulerImpl.TimerMsg -import akka.actor.typed.internal.adapter.ActorAdapter.TypedActorFailedException -import akka.actor.ActorInitializationException -import akka.actor.ActorRefWithCell -import akka.annotation.InternalApi -import akka.util.OptionVal -import akka.{ actor => classic } - import scala.annotation.switch import scala.annotation.tailrec import scala.util.control.Exception.Catcher import scala.util.control.NonFatal +import akka.{ actor => classic } +import akka.actor.ActorInitializationException +import akka.actor.ActorRefWithCell +import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior +import akka.actor.typed.internal.BehaviorImpl.StoppedBehavior +import akka.actor.typed.internal.TimerSchedulerImpl.TimerMsg +import akka.actor.typed.internal.adapter.ActorAdapter.TypedActorFailedException +import akka.annotation.InternalApi +import akka.util.OptionVal + /** * INTERNAL API */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala index 38aca106e5..d75edffc68 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorContextAdapter.scala @@ -6,12 +6,12 @@ package akka.actor.typed package internal package adapter -import akka.annotation.InternalApi - -import akka.{ actor => classic } import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration._ +import akka.{ actor => classic } +import akka.annotation.InternalApi + @InternalApi private[akka] object ActorContextAdapter { diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala index 33553620a1..5bd523bec7 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorRefAdapter.scala @@ -6,9 +6,9 @@ package akka.actor.typed package internal package adapter +import akka.{ actor => classic } import akka.actor.ActorRefProvider import akka.actor.InvalidMessageException -import akka.{ actor => classic } import akka.annotation.InternalApi import akka.dispatch.sysmsg diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala index 1a30fe9687..d5318e3c45 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/ActorSystemAdapter.scala @@ -8,6 +8,10 @@ import java.util.concurrent.CompletionStage import scala.compat.java8.FutureConverters import scala.concurrent.ExecutionContextExecutor + +import org.slf4j.{ Logger, LoggerFactory } + +import akka.{ actor => classic } import akka.Done import akka.actor import akka.actor.{ ActorRefProvider, Address, ExtendedActorSystem, InvalidMessageException } @@ -29,8 +33,6 @@ import akka.actor.typed.internal.PropsImpl.DispatcherSameAsParent import akka.actor.typed.internal.SystemMessage import akka.actor.typed.scaladsl.Behaviors import akka.annotation.InternalApi -import akka.{ actor => classic } -import org.slf4j.{ Logger, LoggerFactory } /** * INTERNAL API. Lightweight wrapper for presenting a classic ActorSystem to a Behavior (via the context). diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala index 68cb4cbdd4..5f90975fae 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/adapter/SchedulerAdapter.scala @@ -6,13 +6,13 @@ package akka.actor.typed.internal.adapter import java.time.Duration +import scala.concurrent.ExecutionContext +import scala.concurrent.duration.FiniteDuration + import akka.actor.Cancellable import akka.actor.typed.Scheduler import akka.annotation.InternalApi -import scala.concurrent.ExecutionContext -import scala.concurrent.duration.FiniteDuration - /** * INTERNAL API */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala index d3e276287e..dfa1bb00cd 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/pubsub/TopicImpl.scala @@ -4,6 +4,8 @@ package akka.actor.typed.internal.pubsub +import scala.reflect.ClassTag + import akka.actor.Dropped import akka.actor.typed.ActorRef import akka.actor.typed.Behavior @@ -16,8 +18,6 @@ import akka.actor.typed.scaladsl.LoggerOps import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi -import scala.reflect.ClassTag - /** * INTERNAL API */ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala index 76d9613963..92c507da6a 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/internal/receptionist/ReceptionistMessages.scala @@ -5,8 +5,8 @@ package akka.actor.typed.internal.receptionist import akka.actor.typed.ActorRef -import akka.actor.typed.receptionist.Receptionist.Command import akka.actor.typed.receptionist.{ Receptionist, ServiceKey } +import akka.actor.typed.receptionist.Receptionist.Command import akka.annotation.InternalApi import akka.util.ccompat.JavaConverters._ diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala index 30b36af6f3..87eab9f4dd 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ActorContext.scala @@ -5,16 +5,16 @@ package akka.actor.typed.javadsl import java.time.Duration - -import akka.annotation.DoNotInherit -import akka.actor.ClassicActorContextProvider -import akka.actor.typed._ import java.util.Optional import java.util.concurrent.CompletionStage +import scala.concurrent.ExecutionContextExecutor + import org.slf4j.Logger -import scala.concurrent.ExecutionContextExecutor +import akka.actor.ClassicActorContextProvider +import akka.actor.typed._ +import akka.annotation.DoNotInherit /** * An Actor is given by the combination of a [[Behavior]] and a context in diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala index 530ddbd335..47e0e8732a 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Adapter.scala @@ -5,14 +5,14 @@ package akka.actor.typed.javadsl import akka.actor +import akka.actor.typed.ActorRef +import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Props -import akka.actor.typed.ActorRef -import akka.actor.typed.scaladsl.adapter._ -import akka.actor.typed.ActorSystem import akka.actor.typed.Scheduler import akka.actor.typed.SupervisorStrategy import akka.actor.typed.internal.adapter.ActorContextAdapter +import akka.actor.typed.scaladsl.adapter._ import akka.japi.Creator /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala index fb9fae6c90..22547cd992 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/AskPattern.scala @@ -8,13 +8,13 @@ package javadsl import java.time.Duration import java.util.concurrent.CompletionStage +import scala.compat.java8.FutureConverters._ + import akka.actor.typed.Scheduler import akka.actor.typed.scaladsl.AskPattern._ import akka.japi.function.{ Function => JFunction } import akka.util.JavaDurationConverters._ -import scala.compat.java8.FutureConverters._ - /** * The ask-pattern implements the initiator side of a request–reply protocol. * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala index cd3d182487..470e371c3e 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/BehaviorBuilder.scala @@ -6,15 +6,16 @@ package akka.actor.typed.javadsl import scala.annotation.tailrec -import akka.japi.function.{ Function => JFunction } -import akka.japi.function.Creator -import akka.japi.function.{ Predicate => JPredicate } -import akka.annotation.InternalApi +import BehaviorBuilder._ + import akka.actor.typed.Behavior import akka.actor.typed.ExtensibleBehavior import akka.actor.typed.Signal import akka.actor.typed.TypedActorContext -import BehaviorBuilder._ +import akka.annotation.InternalApi +import akka.japi.function.{ Function => JFunction } +import akka.japi.function.{ Predicate => JPredicate } +import akka.japi.function.Creator import akka.util.OptionVal /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala index 935621039d..301b492ef1 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/Behaviors.scala @@ -7,6 +7,8 @@ package akka.actor.typed.javadsl import java.util.Collections import java.util.function.{ Supplier, Function => JFunction } +import scala.reflect.ClassTag + import akka.actor.typed._ import akka.actor.typed.internal.{ BehaviorImpl, @@ -17,10 +19,8 @@ import akka.actor.typed.internal.{ } import akka.japi.function.{ Effect, Function2 => JapiFunction2 } import akka.japi.pf.PFBuilder -import akka.util.unused import akka.util.ccompat.JavaConverters._ - -import scala.reflect.ClassTag +import akka.util.unused /** * Factories for [[akka.actor.typed.Behavior]]. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala index 2c811a86cb..1ef3509e80 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/javadsl/ReceiveBuilder.scala @@ -4,14 +4,14 @@ package akka.actor.typed.javadsl -import akka.actor.typed.MessageAdaptionFailure - import scala.annotation.tailrec -import akka.japi.function.Creator + +import akka.actor.typed.{ Behavior, Signal } +import akka.actor.typed.MessageAdaptionFailure +import akka.annotation.InternalApi import akka.japi.function.{ Function => JFunction } import akka.japi.function.{ Predicate => JPredicate } -import akka.actor.typed.{ Behavior, Signal } -import akka.annotation.InternalApi +import akka.japi.function.Creator import akka.util.OptionVal /** diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala index e88dc70cff..043ab7f295 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/pubsub/Topic.scala @@ -4,14 +4,14 @@ package akka.actor.typed.pubsub +import scala.reflect.ClassTag + import akka.actor.typed.ActorRef import akka.actor.typed.Behavior import akka.actor.typed.internal.pubsub.TopicImpl import akka.actor.typed.scaladsl.Behaviors import akka.annotation.DoNotInherit -import scala.reflect.ClassTag - /** * A pub sub topic is an actor that handles subscribing to a topic and publishing messages to all subscribed actors. * diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala index 34794597fc..f4ab958ced 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala @@ -4,12 +4,12 @@ package akka.actor.typed.receptionist +import scala.reflect.ClassTag + import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, ExtensionSetup } import akka.actor.typed.internal.receptionist._ import akka.annotation.DoNotInherit - import akka.util.ccompat.JavaConverters._ -import scala.reflect.ClassTag /** * Register and discover actors that implement a service with a protocol defined by a [[ServiceKey]]. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala index c0a2c32d05..0bc42f229b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AbstractBehavior.scala @@ -4,8 +4,8 @@ package akka.actor.typed.scaladsl -import akka.actor.typed.MessageAdaptionFailure import akka.actor.typed.{ Behavior, ExtensibleBehavior, Signal, TypedActorContext } +import akka.actor.typed.MessageAdaptionFailure /** * An actor `Behavior` can be implemented by extending this class and implement the diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala index 587ce1c437..cd5658bfeb 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/ActorContext.scala @@ -4,18 +4,19 @@ package akka.actor.typed.scaladsl -import akka.actor.ClassicActorContextProvider -import akka.actor.typed._ -import akka.annotation.DoNotInherit -import akka.util.Timeout - import scala.concurrent.{ ExecutionContextExecutor, Future } import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag import scala.util.Try -import akka.annotation.InternalApi + import org.slf4j.Logger +import akka.actor.ClassicActorContextProvider +import akka.actor.typed._ +import akka.annotation.DoNotInherit +import akka.annotation.InternalApi +import akka.util.Timeout + /** * An Actor is given by the combination of a [[Behavior]] and a context in * which this behavior is executed. As per the Actor Model an Actor can perform diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala index 9e29e8ac78..60359de5e6 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/AskPattern.scala @@ -7,17 +7,19 @@ package akka.actor.typed.scaladsl import java.util.concurrent.TimeoutException import scala.concurrent.Future + +import com.github.ghik.silencer.silent + import akka.actor.{ Address, RootActorPath } import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem +import akka.actor.typed.RecipientRef import akka.actor.typed.Scheduler import akka.actor.typed.internal.{ adapter => adapt } +import akka.actor.typed.internal.InternalRecipientRef import akka.annotation.InternalApi import akka.pattern.PromiseActorRef import akka.util.Timeout -import akka.actor.typed.RecipientRef -import akka.actor.typed.internal.InternalRecipientRef -import com.github.ghik.silencer.silent /** * The ask-pattern implements the initiator side of a request–reply protocol. diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala index 80eea36d4b..df7ffa8b0b 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/scaladsl/Behaviors.scala @@ -5,11 +5,11 @@ package akka.actor.typed package scaladsl -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.actor.typed.internal._ - import scala.reflect.{ classTag, ClassTag } +import akka.actor.typed.internal._ +import akka.annotation.{ DoNotInherit, InternalApi } + /** * Factories for [[akka.actor.typed.Behavior]]. */ diff --git a/akka-actor/src/main/scala-2.12/akka/compat/Future.scala b/akka-actor/src/main/scala-2.12/akka/compat/Future.scala index 3549b360e3..5d733b8acb 100644 --- a/akka-actor/src/main/scala-2.12/akka/compat/Future.scala +++ b/akka-actor/src/main/scala-2.12/akka/compat/Future.scala @@ -4,13 +4,14 @@ package akka.compat -import akka.annotation.InternalApi - -import scala.concurrent.{ ExecutionContext, Future => SFuture } import scala.collection.immutable -import akka.util.ccompat._ +import scala.concurrent.{ ExecutionContext, Future => SFuture } + import com.github.ghik.silencer.silent +import akka.annotation.InternalApi +import akka.util.ccompat._ + /** * INTERNAL API * diff --git a/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala b/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala index 2f27fb99ad..38aff64431 100644 --- a/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala +++ b/akka-actor/src/main/scala-2.12/akka/dispatch/internal/SameThreadExecutionContext.scala @@ -4,11 +4,11 @@ package akka.dispatch.internal +import scala.concurrent.ExecutionContext + import akka.annotation.InternalApi import akka.dispatch.BatchingExecutor -import scala.concurrent.ExecutionContext - /** * Factory to create same thread ec. Not intended to be called from any other site than to create [[akka.dispatch.ExecutionContexts#parasitic]] * diff --git a/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala b/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala index aaac46b5d5..da0c4eb918 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala +++ b/akka-actor/src/main/scala-2.12/akka/util/ByteIterator.scala @@ -4,8 +4,6 @@ package akka.util -import akka.util.Collections.EmptyImmutableSeq - import java.nio.{ ByteBuffer, ByteOrder } import scala.annotation.tailrec @@ -13,6 +11,8 @@ import scala.collection.LinearSeq import scala.collection.mutable.ListBuffer import scala.reflect.ClassTag +import akka.util.Collections.EmptyImmutableSeq + object ByteIterator { object ByteArrayIterator { diff --git a/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala index 82a3885592..9a6333b39c 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala-2.12/akka/util/ByteString.scala @@ -5,18 +5,18 @@ package akka.util import java.io.{ ObjectInputStream, ObjectOutputStream } -import java.nio.{ ByteBuffer, ByteOrder } import java.lang.{ Iterable => JIterable } +import java.nio.{ ByteBuffer, ByteOrder } +import java.nio.charset.{ Charset, StandardCharsets } import java.util.Base64 import scala.annotation.{ tailrec, varargs } import scala.collection.IndexedSeqOptimized -import scala.collection.mutable.{ Builder, WrappedArray } +import scala.collection.generic.CanBuildFrom import scala.collection.immutable import scala.collection.immutable.{ IndexedSeq, VectorBuilder } -import scala.collection.generic.CanBuildFrom +import scala.collection.mutable.{ Builder, WrappedArray } import scala.reflect.ClassTag -import java.nio.charset.{ Charset, StandardCharsets } object ByteString { diff --git a/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala b/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala index 68b492ea11..d60e398756 100644 --- a/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala +++ b/akka-actor/src/main/scala-2.12/akka/util/ccompat/package.scala @@ -4,11 +4,11 @@ package akka.util -import scala.language.implicitConversions -import scala.language.higherKinds -import scala.collection.{ GenTraversable, immutable => i, mutable => m } import scala.{ collection => c } +import scala.collection.{ GenTraversable, immutable => i, mutable => m } import scala.collection.generic.{ CanBuildFrom, GenericCompanion, Sorted, SortedSetFactory } +import scala.language.higherKinds +import scala.language.implicitConversions /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/Done.scala b/akka-actor/src/main/scala/akka/Done.scala index 4e823ac768..1f236e1c6f 100644 --- a/akka-actor/src/main/scala/akka/Done.scala +++ b/akka-actor/src/main/scala/akka/Done.scala @@ -5,6 +5,7 @@ package akka import java.io.Serializable + import akka.annotation.DoNotInherit /** diff --git a/akka-actor/src/main/scala/akka/Main.scala b/akka-actor/src/main/scala/akka/Main.scala index 53cc36c90c..707aecfa45 100644 --- a/akka-actor/src/main/scala/akka/Main.scala +++ b/akka-actor/src/main/scala/akka/Main.scala @@ -4,14 +4,15 @@ package akka +import scala.util.control.NonFatal + +import akka.actor.Actor +import akka.actor.ActorLogging +import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem -import akka.actor.Actor -import akka.actor.Terminated -import akka.actor.ActorLogging import akka.actor.Props -import akka.actor.ActorRef -import scala.util.control.NonFatal +import akka.actor.Terminated /** * Main class to start an [[akka.actor.ActorSystem]] with one diff --git a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala b/akka-actor/src/main/scala/akka/actor/AbstractActor.scala index 3397c34c59..4c7714bb86 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractActor.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractActor.scala @@ -4,17 +4,17 @@ package akka.actor -import akka.annotation.DoNotInherit -import akka.japi.pf.ReceiveBuilder - -import scala.runtime.BoxedUnit import java.util.Optional -import akka.util.JavaDurationConverters -import com.github.ghik.silencer.silent - import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration.Duration +import scala.runtime.BoxedUnit + +import com.github.ghik.silencer.silent + +import akka.annotation.DoNotInherit +import akka.japi.pf.ReceiveBuilder +import akka.util.JavaDurationConverters /** * Java API: compatible with lambda expressions diff --git a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala b/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala index 9aa670ace0..4a44395854 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractFSM.scala @@ -4,9 +4,10 @@ package akka.actor -import akka.util.JavaDurationConverters._ import scala.concurrent.duration.FiniteDuration +import akka.util.JavaDurationConverters._ + /** * Java API: compatible with lambda expressions * @@ -34,8 +35,9 @@ abstract class AbstractFSM[S, D] extends FSM[S, D] { import java.util.{ List => JList } import FSM._ - import akka.japi.pf.FI._ + import akka.japi.pf._ + import akka.japi.pf.FI._ /** * Returns this AbstractActor's ActorContext diff --git a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala index e1284d3bb6..db3a1d2b16 100644 --- a/akka-actor/src/main/scala/akka/actor/AbstractProps.scala +++ b/akka-actor/src/main/scala/akka/actor/AbstractProps.scala @@ -5,11 +5,13 @@ package akka.actor import java.lang.reflect.{ Modifier, ParameterizedType, TypeVariable } +import java.lang.reflect.Constructor + +import scala.annotation.tailrec +import scala.annotation.varargs + import akka.japi.Creator import akka.util.Reflect -import scala.annotation.varargs -import scala.annotation.tailrec -import java.lang.reflect.Constructor /** * diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala index 141adfd082..1f6c0cd137 100644 --- a/akka-actor/src/main/scala/akka/actor/Actor.scala +++ b/akka-actor/src/main/scala/akka/actor/Actor.scala @@ -4,14 +4,15 @@ package akka.actor -import akka.AkkaException -import akka.event.LoggingAdapter import java.util.Optional import scala.annotation.tailrec import scala.beans.BeanProperty import scala.util.control.NoStackTrace + +import akka.AkkaException import akka.annotation.InternalApi +import akka.event.LoggingAdapter import akka.util.unused /** diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala index 55d885f52c..1d2a01f579 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala @@ -12,14 +12,16 @@ import scala.collection.immutable import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration.Duration import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + import akka.actor.dungeon.ChildrenContainer +import akka.annotation.{ InternalApi, InternalStableApi } import akka.dispatch.{ Envelope, MessageDispatcher } import akka.dispatch.sysmsg._ import akka.event.Logging.{ Debug, Error, LogEvent } import akka.japi.Procedure import akka.util.{ unused, Reflect } -import akka.annotation.{ InternalApi, InternalStableApi } -import com.github.ghik.silencer.silent /** * The actor context - the view of the actor cell from the actor. diff --git a/akka-actor/src/main/scala/akka/actor/ActorPath.scala b/akka-actor/src/main/scala/akka/actor/ActorPath.scala index 242778785f..69e7e21dcf 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorPath.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorPath.scala @@ -3,14 +3,16 @@ */ package akka.actor +import java.lang.{ StringBuilder => JStringBuilder } +import java.net.MalformedURLException + import scala.annotation.{ switch, tailrec } import scala.collection.immutable -import akka.japi.Util.immutableSeq -import java.net.MalformedURLException -import java.lang.{ StringBuilder => JStringBuilder } import com.github.ghik.silencer.silent +import akka.japi.Util.immutableSeq + /** * Java API */ diff --git a/akka-actor/src/main/scala/akka/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala index ab00d74c26..1a2b7313bc 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRef.scala @@ -6,12 +6,12 @@ package akka.actor import java.util.concurrent.ConcurrentHashMap -import akka.annotation.InternalApi - import scala.annotation.tailrec import scala.collection.immutable import scala.util.control.NonFatal + import akka.annotation.DoNotInherit +import akka.annotation.InternalApi import akka.dispatch._ import akka.dispatch.sysmsg._ import akka.event.AddressTerminatedTopic diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index 852c88eff2..fcc0c3a850 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -4,23 +4,23 @@ package akka.actor -import akka.dispatch.sysmsg._ -import akka.dispatch.{ Mailboxes, RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.routing._ -import akka.event._ -import akka.util.Helpers -import akka.util.Collections.EmptyImmutableSeq - -import scala.util.control.NonFatal import java.util.concurrent.atomic.AtomicLong -import scala.concurrent.{ ExecutionContextExecutor, Future, Promise } import scala.annotation.implicitNotFound +import scala.concurrent.{ ExecutionContextExecutor, Future, Promise } +import scala.util.control.NonFatal + import akka.ConfigurationException import akka.annotation.DoNotInherit import akka.annotation.InternalApi +import akka.dispatch.{ Mailboxes, RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.dispatch.Dispatchers +import akka.dispatch.sysmsg._ +import akka.event._ +import akka.routing._ import akka.serialization.Serialization +import akka.util.Collections.EmptyImmutableSeq +import akka.util.Helpers import akka.util.OptionVal /** diff --git a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala index 63c371ac3c..52b318531f 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSelection.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSelection.scala @@ -4,26 +4,26 @@ package akka.actor -import scala.language.implicitConversions import java.util.concurrent.CompletionStage +import java.util.regex.Pattern -import scala.language.implicitConversions import scala.annotation.tailrec import scala.collection.immutable +import scala.compat.java8.FutureConverters import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ +import scala.language.implicitConversions +import scala.language.implicitConversions import scala.util.Success -import java.util.regex.Pattern +import com.github.ghik.silencer.silent + +import akka.dispatch.ExecutionContexts import akka.pattern.ask import akka.routing.MurmurHash import akka.util.{ Helpers, JavaDurationConverters, Timeout } -import akka.dispatch.ExecutionContexts - -import scala.compat.java8.FutureConverters import akka.util.ccompat._ -import com.github.ghik.silencer.silent /** * An ActorSelection is a logical view of a section of an ActorSystem's tree of Actors, diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index b823c223fd..d7e358a452 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -9,29 +9,30 @@ import java.util.Optional import java.util.concurrent._ import java.util.concurrent.atomic.AtomicReference -import akka.actor.dungeon.ChildrenContainer -import akka.actor.setup.{ ActorSystemSetup, Setup } -import akka.annotation.InternalApi -import akka.ConfigurationException -import akka.annotation.DoNotInherit -import akka.dispatch._ -import akka.event._ -import akka.japi.Util.immutableSeq -import akka.util.Helpers.toRootLowerCase -import akka.util._ -import com.typesafe.config.{ Config, ConfigFactory } import scala.annotation.tailrec import scala.collection.immutable import scala.compat.java8.FutureConverters import scala.compat.java8.OptionConverters._ -import scala.concurrent.duration.Duration -import scala.concurrent.blocking import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, Future, Promise } -import scala.util.control.{ ControlThrowable, NonFatal } +import scala.concurrent.blocking +import scala.concurrent.duration.Duration import scala.util.{ Failure, Success, Try } +import scala.util.control.{ ControlThrowable, NonFatal } +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.ConfigurationException +import akka.actor.dungeon.ChildrenContainer +import akka.actor.setup.{ ActorSystemSetup, Setup } +import akka.annotation.DoNotInherit +import akka.annotation.InternalApi +import akka.dispatch._ +import akka.event._ import akka.event.Logging.DefaultLogger +import akka.japi.Util.immutableSeq import akka.serialization.SerializationExtension +import akka.util._ +import akka.util.Helpers.toRootLowerCase object BootstrapSetup { @@ -388,9 +389,10 @@ object ActorSystem { cfg } - import akka.util.Helpers.ConfigOps import config._ + import akka.util.Helpers.ConfigOps + final val ConfigVersion: String = getString("akka.version") private final val providerSelectionSetup = setup diff --git a/akka-actor/src/main/scala/akka/actor/Address.scala b/akka-actor/src/main/scala/akka/actor/Address.scala index 6b57f7c4be..ef5c1f11e5 100644 --- a/akka-actor/src/main/scala/akka/actor/Address.scala +++ b/akka-actor/src/main/scala/akka/actor/Address.scala @@ -3,16 +3,17 @@ */ package akka.actor +import java.net.MalformedURLException import java.net.URI import java.net.URISyntaxException -import java.net.MalformedURLException import java.util.Optional import scala.annotation.tailrec import scala.collection.immutable -import akka.annotation.InternalApi import scala.compat.java8.OptionConverters._ +import akka.annotation.InternalApi + /** * The address specifies the physical location under which an Actor can be * reached. Examples are local addresses, identified by the ActorSystem’s diff --git a/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala b/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala index 95859704e3..8985cef7da 100644 --- a/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala +++ b/akka-actor/src/main/scala/akka/actor/CoordinatedShutdown.scala @@ -4,30 +4,29 @@ package akka.actor -import scala.concurrent.duration._ -import scala.compat.java8.FutureConverters._ -import scala.compat.java8.OptionConverters._ +import java.util.Optional import java.util.concurrent._ import java.util.concurrent.TimeUnit.MILLISECONDS -import scala.concurrent.{ Await, ExecutionContext, Future, Promise } - -import akka.Done -import com.typesafe.config.Config -import scala.concurrent.duration.FiniteDuration -import scala.annotation.tailrec - -import com.typesafe.config.ConfigFactory -import akka.pattern.after -import scala.util.control.NonFatal - -import akka.event.Logging -import akka.dispatch.ExecutionContexts -import scala.util.Try import java.util.concurrent.atomic.AtomicReference import java.util.function.Supplier -import java.util.Optional +import scala.annotation.tailrec +import scala.compat.java8.FutureConverters._ +import scala.compat.java8.OptionConverters._ +import scala.concurrent.{ Await, ExecutionContext, Future, Promise } +import scala.concurrent.duration._ +import scala.concurrent.duration.FiniteDuration +import scala.util.Try +import scala.util.control.NonFatal + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + +import akka.Done import akka.annotation.InternalApi +import akka.dispatch.ExecutionContexts +import akka.event.Logging +import akka.pattern.after import akka.util.{ OptionVal, Timeout } object CoordinatedShutdown extends ExtensionId[CoordinatedShutdown] with ExtensionIdProvider { diff --git a/akka-actor/src/main/scala/akka/actor/Deployer.scala b/akka-actor/src/main/scala/akka/actor/Deployer.scala index 12e294275d..c5c0f3fd87 100644 --- a/akka-actor/src/main/scala/akka/actor/Deployer.scala +++ b/akka-actor/src/main/scala/akka/actor/Deployer.scala @@ -6,13 +6,14 @@ package akka.actor import java.util.concurrent.atomic.AtomicReference -import akka.routing._ -import akka.util.WildcardIndex -import com.github.ghik.silencer.silent -import com.typesafe.config._ import scala.annotation.tailrec +import com.github.ghik.silencer.silent +import com.typesafe.config._ + import akka.annotation.InternalApi +import akka.routing._ +import akka.util.WildcardIndex object Deploy { final val NoDispatcherGiven = "" diff --git a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala index 8a5c8b8190..b86ef3170e 100644 --- a/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala +++ b/akka-actor/src/main/scala/akka/actor/DynamicAccess.scala @@ -4,12 +4,12 @@ package akka.actor -import akka.annotation.DoNotInherit - import scala.collection.immutable import scala.reflect.ClassTag import scala.util.Try +import akka.annotation.DoNotInherit + /** * The DynamicAccess implementation is the class which is used for * loading all configurable parts of an actor system (the diff --git a/akka-actor/src/main/scala/akka/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala index 7dcdf38098..91a2eb0ac8 100644 --- a/akka-actor/src/main/scala/akka/actor/FSM.scala +++ b/akka-actor/src/main/scala/akka/actor/FSM.scala @@ -4,16 +4,18 @@ package akka.actor -import language.implicitConversions -import scala.concurrent.duration.Duration import scala.collection.mutable -import scala.concurrent.duration.FiniteDuration -import scala.concurrent.duration._ -import akka.routing.{ Deafen, Listen, Listeners } -import akka.annotation.InternalApi -import akka.util.{ unused, JavaDurationConverters } -import com.github.ghik.silencer.silent import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration._ +import scala.concurrent.duration.Duration +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent +import language.implicitConversions + +import akka.annotation.InternalApi +import akka.routing.{ Deafen, Listen, Listeners } +import akka.util.{ unused, JavaDurationConverters } object FSM { diff --git a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala index be0d456d4f..3b1d3a5fba 100644 --- a/akka-actor/src/main/scala/akka/actor/FaultHandling.scala +++ b/akka-actor/src/main/scala/akka/actor/FaultHandling.scala @@ -4,19 +4,22 @@ package akka.actor -import java.lang.reflect.InvocationTargetException -import language.implicitConversions import java.lang.{ Iterable => JIterable } +import java.lang.reflect.InvocationTargetException import java.util.concurrent.TimeUnit + +import scala.collection.immutable +import scala.collection.mutable.ArrayBuffer +import scala.concurrent.duration.Duration +import scala.util.control.NonFatal + +import language.implicitConversions + +import akka.event.Logging.Error +import akka.event.Logging.LogEvent +import akka.event.Logging.Warning import akka.japi.Util.immutableSeq import akka.util.JavaDurationConverters._ -import scala.collection.mutable.ArrayBuffer -import scala.collection.immutable -import scala.concurrent.duration.Duration -import akka.event.Logging.LogEvent -import akka.event.Logging.Error -import akka.event.Logging.Warning -import scala.util.control.NonFatal import akka.util.ccompat._ /** diff --git a/akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala b/akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala index 6e618a9b4f..9ee941f831 100644 --- a/akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala +++ b/akka-actor/src/main/scala/akka/actor/IndirectActorProducer.scala @@ -4,11 +4,12 @@ package akka.actor -import akka.japi.Creator -import akka.util.Reflect +import scala.collection.immutable + import com.github.ghik.silencer.silent -import scala.collection.immutable +import akka.japi.Creator +import akka.util.Reflect /** * This interface defines a class of actor creation strategies deviating from diff --git a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala b/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala index 61c3401b53..d6d67af03e 100644 --- a/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala +++ b/akka-actor/src/main/scala/akka/actor/LightArrayRevolverScheduler.scala @@ -7,16 +7,19 @@ package akka.actor import java.io.Closeable import java.util.concurrent.ThreadFactory import java.util.concurrent.atomic.{ AtomicLong, AtomicReference } + import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.{ Await, ExecutionContext, Future, Promise } import scala.concurrent.duration._ import scala.util.control.NonFatal + import com.typesafe.config.Config + +import akka.dispatch.AbstractNodeQueue import akka.event.LoggingAdapter import akka.util.Helpers import akka.util.Unsafe.{ instance => unsafe } -import akka.dispatch.AbstractNodeQueue /** * This scheduler implementation is based on a revolving wheel of buckets, @@ -38,8 +41,8 @@ class LightArrayRevolverScheduler(config: Config, log: LoggingAdapter, threadFac extends Scheduler with Closeable { - import Helpers.Requiring import Helpers.ConfigOps + import Helpers.Requiring val WheelSize = config diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala index 6e007f88ce..5dfd752362 100644 --- a/akka-actor/src/main/scala/akka/actor/Props.scala +++ b/akka-actor/src/main/scala/akka/actor/Props.scala @@ -4,14 +4,14 @@ package akka.actor -import akka.actor.Deploy.{ NoDispatcherGiven, NoMailboxGiven } -import akka.dispatch._ -import akka.routing._ - import scala.annotation.varargs import scala.collection.immutable import scala.reflect.ClassTag +import akka.actor.Deploy.{ NoDispatcherGiven, NoMailboxGiven } +import akka.dispatch._ +import akka.routing._ + /** * Factory for Props instances. * diff --git a/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala b/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala index 049c2fe639..ef16eaff97 100644 --- a/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala +++ b/akka-actor/src/main/scala/akka/actor/ReflectiveDynamicAccess.scala @@ -4,15 +4,15 @@ package akka.actor -import scala.collection.immutable import java.lang.reflect.InvocationTargetException -import akka.annotation.DoNotInherit - +import scala.collection.immutable import scala.reflect.ClassTag import scala.util.Failure import scala.util.Try +import akka.annotation.DoNotInherit + /** * This is the default [[akka.actor.DynamicAccess]] implementation used by [[akka.actor.ExtendedActorSystem]] * unless overridden. It uses reflection to turn fully-qualified class names into `Class[_]` objects diff --git a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala index 30fab13023..15999fcaec 100644 --- a/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala +++ b/akka-actor/src/main/scala/akka/actor/RepointableActorRef.scala @@ -9,14 +9,15 @@ import java.util.concurrent.locks.ReentrantLock import scala.annotation.tailrec import scala.collection.immutable -import akka.actor.dungeon.ChildrenContainer -import akka.event.Logging.Warning -import akka.util.{ unused, Unsafe } -import akka.dispatch._ -import akka.dispatch.sysmsg._ +import scala.util.control.NonFatal + import com.github.ghik.silencer.silent -import scala.util.control.NonFatal +import akka.actor.dungeon.ChildrenContainer +import akka.dispatch._ +import akka.dispatch.sysmsg._ +import akka.event.Logging.Warning +import akka.util.{ unused, Unsafe } /** * This actor ref starts out with some dummy cell (by default just enqueuing diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala index 1403ed264c..4d170dd462 100644 --- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala +++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala @@ -7,15 +7,15 @@ package akka.actor import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec - -import akka.util.JavaDurationConverters -import com.github.ghik.silencer.silent import scala.concurrent.ExecutionContext import scala.concurrent.duration._ import scala.util.control.NoStackTrace -import akka.annotation.InternalApi import com.github.ghik.silencer.silent +import com.github.ghik.silencer.silent + +import akka.annotation.InternalApi +import akka.util.JavaDurationConverters /** * This exception is thrown by Scheduler.schedule* when scheduling is not diff --git a/akka-actor/src/main/scala/akka/actor/Stash.scala b/akka-actor/src/main/scala/akka/actor/Stash.scala index 4ac6a5e2c7..14b29d5e19 100644 --- a/akka-actor/src/main/scala/akka/actor/Stash.scala +++ b/akka-actor/src/main/scala/akka/actor/Stash.scala @@ -5,6 +5,8 @@ package akka.actor import scala.collection.immutable +import scala.util.control.NoStackTrace + import akka.AkkaException import akka.annotation.InternalStableApi import akka.dispatch.{ @@ -14,8 +16,6 @@ import akka.dispatch.{ UnboundedDequeBasedMessageQueueSemantics } -import scala.util.control.NoStackTrace - /** * The `Stash` trait enables an actor to temporarily stash away messages that can not or * should not be handled using the actor's current behavior. diff --git a/akka-actor/src/main/scala/akka/actor/Timers.scala b/akka-actor/src/main/scala/akka/actor/Timers.scala index 5f25741e89..d3b021f1f2 100644 --- a/akka-actor/src/main/scala/akka/actor/Timers.scala +++ b/akka-actor/src/main/scala/akka/actor/Timers.scala @@ -4,10 +4,11 @@ package akka.actor -import akka.util.JavaDurationConverters._ import scala.concurrent.duration.FiniteDuration + import akka.annotation.DoNotInherit import akka.dispatch.Envelope +import akka.util.JavaDurationConverters._ import akka.util.OptionVal /** diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala index 5b5ff89dac..02bee1c57b 100644 --- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala +++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala @@ -4,27 +4,28 @@ package akka.actor -import scala.util.control.NonFatal -import scala.util.{ Failure, Success, Try } +import java.io.ObjectStreamException +import java.lang.reflect.{ InvocationHandler, InvocationTargetException, Method, Proxy } +import java.util.concurrent.TimeoutException +import java.util.concurrent.atomic.{ AtomicReference => AtomVar } + import scala.collection.immutable +import scala.concurrent.{ Await, Future } +import scala.concurrent.ExecutionContextExecutor import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag -import scala.concurrent.{ Await, Future } +import scala.util.{ Failure, Success, Try } +import scala.util.control.NonFatal +import com.github.ghik.silencer.silent + +import akka.dispatch._ import akka.japi.{ Creator, Option => JOption } import akka.japi.Util.{ immutableSeq, immutableSingletonSeq } import akka.pattern.AskTimeoutException -import akka.util.Timeout -import akka.util.Reflect.instantiator import akka.serialization.{ JavaSerializer, SerializationExtension, Serializers } -import akka.dispatch._ -import java.util.concurrent.atomic.{ AtomicReference => AtomVar } -import java.util.concurrent.TimeoutException -import java.io.ObjectStreamException -import java.lang.reflect.{ InvocationHandler, InvocationTargetException, Method, Proxy } - -import com.github.ghik.silencer.silent -import scala.concurrent.ExecutionContextExecutor +import akka.util.Reflect.instantiator +import akka.util.Timeout /** * A TypedActorFactory is something that can created TypedActor instances. @@ -688,6 +689,7 @@ class TypedActorExtension(val system: ExtendedActorSystem) extends TypedActorFac protected def typedActor = this import system.settings + import akka.util.Helpers.ConfigOps /** diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala index c2bf27ce16..ced705651f 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/Children.scala @@ -7,12 +7,14 @@ package akka.actor.dungeon import java.util.Optional import scala.annotation.tailrec -import scala.util.control.NonFatal import scala.collection.immutable +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + import akka.actor._ import akka.serialization.{ Serialization, SerializationExtension, Serializers } import akka.util.{ Helpers, Unsafe } -import com.github.ghik.silencer.silent private[akka] object Children { val GetNobody = () => Nobody diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala index 55d0fad98c..cd15ce390f 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/DeathWatch.scala @@ -4,10 +4,10 @@ package akka.actor.dungeon -import akka.dispatch.sysmsg.{ DeathWatchNotification, Unwatch, Watch } -import akka.event.Logging.{ Debug, Warning } import akka.actor.{ Actor, ActorCell, ActorRef, ActorRefScope, Address, InternalActorRef, Terminated } +import akka.dispatch.sysmsg.{ DeathWatchNotification, Unwatch, Watch } import akka.event.AddressTerminatedTopic +import akka.event.Logging.{ Debug, Warning } import akka.util.unused private[akka] trait DeathWatch { this: ActorCell => diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala index 4878d19964..cbfa1509a9 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/Dispatch.scala @@ -5,22 +5,23 @@ package akka.actor.dungeon import scala.annotation.tailrec -import akka.AkkaException -import akka.dispatch.{ Envelope, Mailbox } -import akka.dispatch.sysmsg._ -import akka.event.Logging.Error -import akka.util.Unsafe -import akka.actor._ -import akka.annotation.InternalApi -import akka.serialization.{ DisabledJavaSerializer, SerializationExtension, Serializers } - import scala.util.control.{ NoStackTrace, NonFatal } import scala.util.control.Exception.Catcher + +import com.github.ghik.silencer.silent + +import akka.AkkaException +import akka.actor._ +import akka.annotation.InternalApi +import akka.dispatch.{ Envelope, Mailbox } import akka.dispatch.MailboxType import akka.dispatch.ProducesMessageQueue import akka.dispatch.UnboundedMailbox +import akka.dispatch.sysmsg._ +import akka.event.Logging.Error +import akka.serialization.{ DisabledJavaSerializer, SerializationExtension, Serializers } import akka.serialization.Serialization -import com.github.ghik.silencer.silent +import akka.util.Unsafe @SerialVersionUID(1L) final case class SerializationCheckFailedException private (msg: Object, cause: Throwable) diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala index 0e3bc37ed9..a6ae5a5169 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/FaultHandling.scala @@ -4,21 +4,21 @@ package akka.actor.dungeon +import scala.collection.immutable +import scala.concurrent.duration.Duration +import scala.util.control.Exception._ +import scala.util.control.NonFatal + +import akka.actor.{ Actor, ActorCell, ActorInterruptedException, ActorRef, InternalActorRef } +import akka.actor.ActorRefScope import akka.actor.PostRestartException import akka.actor.PreRestartException -import akka.actor.{ Actor, ActorCell, ActorInterruptedException, ActorRef, InternalActorRef } import akka.dispatch._ import akka.dispatch.sysmsg._ import akka.event.Logging import akka.event.Logging.Debug import akka.event.Logging.Error -import scala.collection.immutable -import scala.concurrent.duration.Duration -import scala.util.control.Exception._ -import scala.util.control.NonFatal -import akka.actor.ActorRefScope - private[akka] trait FaultHandling { this: ActorCell => /* ================= diff --git a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala index f033423ea0..c09be5aac3 100644 --- a/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala +++ b/akka-actor/src/main/scala/akka/actor/dungeon/ReceiveTimeout.scala @@ -17,8 +17,8 @@ private[akka] object ReceiveTimeout { private[akka] trait ReceiveTimeout { this: ActorCell => - import ReceiveTimeout._ import ActorCell._ + import ReceiveTimeout._ private var receiveTimeoutData: (Duration, Cancellable) = emptyReceiveTimeoutData diff --git a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala index 0d765ce551..1c0ed50347 100644 --- a/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/AbstractDispatcher.scala @@ -4,8 +4,16 @@ package akka.dispatch -import java.util.concurrent._ import java.{ util => ju } +import java.util.concurrent._ + +import scala.annotation.tailrec +import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor } +import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config import akka.actor._ import akka.annotation.InternalStableApi @@ -14,13 +22,6 @@ import akka.dispatch.sysmsg._ import akka.event.EventStream import akka.event.Logging.{ Debug, Error, LogEventException } import akka.util.{ unused, Index, Unsafe } -import com.github.ghik.silencer.silent -import com.typesafe.config.Config - -import scala.annotation.tailrec -import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor } -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.util.control.NonFatal final case class Envelope private (val message: Any, val sender: ActorRef) diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala index 5f3e980997..a738defbd2 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala @@ -4,16 +4,18 @@ package akka.dispatch -import akka.actor.ActorCell -import akka.dispatch.sysmsg._ -import scala.annotation.tailrec -import scala.concurrent.duration.Duration -import akka.util.Helpers import java.util.{ Comparator, Iterator } import java.util.concurrent.ConcurrentSkipListSet -import akka.actor.ActorSystemImpl + +import scala.annotation.tailrec +import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration +import akka.actor.ActorCell +import akka.actor.ActorSystemImpl +import akka.dispatch.sysmsg._ +import akka.util.Helpers + /** * INTERNAL API: Use `BalancingPool` instead of this dispatcher directly. * diff --git a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala b/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala index 2dabe1b95b..cd96e3ea11 100644 --- a/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala +++ b/akka-actor/src/main/scala/akka/dispatch/BatchingExecutor.scala @@ -4,10 +4,11 @@ package akka.dispatch -import java.util.concurrent.{ Executor } import java.util.ArrayDeque -import scala.concurrent._ +import java.util.concurrent.Executor + import scala.annotation.tailrec +import scala.concurrent._ /** * All Batchables are automatically batched when submitted to a BatchingExecutor diff --git a/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala b/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala index e742bd5cef..2210b41d55 100644 --- a/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala +++ b/akka-actor/src/main/scala/akka/dispatch/CachingConfig.scala @@ -7,10 +7,10 @@ package akka.dispatch import java.util import java.util.concurrent.{ ConcurrentHashMap, TimeUnit } -import com.typesafe.config._ - import scala.util.{ Failure, Success, Try } +import com.typesafe.config._ + /** * INTERNAL API */ diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala index 7eb7e631d5..7aa810ada0 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala @@ -4,18 +4,19 @@ package akka.dispatch -import akka.event.Logging.Error -import akka.actor.ActorCell -import akka.event.Logging -import akka.dispatch.sysmsg.SystemMessage import java.util.concurrent.{ ExecutorService, RejectedExecutionException } +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import java.util.concurrent.atomic.AtomicReferenceFieldUpdater import com.github.ghik.silencer.silent +import akka.actor.ActorCell +import akka.dispatch.sysmsg.SystemMessage +import akka.event.Logging +import akka.event.Logging.Error + /** * The event-based ``Dispatcher`` binds a set of Actors to a thread pool backed up by a * `BlockingQueue`. diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala index f5d963ed42..85b5f4e83b 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala @@ -6,17 +6,18 @@ package akka.dispatch import java.util.concurrent.{ ConcurrentHashMap, ThreadFactory } -import com.typesafe.config.{ Config, ConfigFactory, ConfigValueType } -import akka.actor.{ ActorSystem, DynamicAccess, Scheduler } -import akka.event.Logging.Warning -import akka.event.{ EventStream, LoggingAdapter } -import akka.ConfigurationException -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.util.Helpers.ConfigOps -import com.github.ghik.silencer.silent - import scala.concurrent.ExecutionContext +import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory, ConfigValueType } + +import akka.ConfigurationException +import akka.actor.{ ActorSystem, DynamicAccess, Scheduler } +import akka.annotation.{ DoNotInherit, InternalApi } +import akka.event.{ EventStream, LoggingAdapter } +import akka.event.Logging.Warning +import akka.util.Helpers.ConfigOps + /** * DispatcherPrerequisites represents useful contextual pieces when constructing a MessageDispatcher */ diff --git a/akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala b/akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala index 61d198376e..2920bf8b70 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala +++ b/akka-actor/src/main/scala/akka/dispatch/ForkJoinExecutorConfigurator.scala @@ -5,6 +5,7 @@ package akka.dispatch import java.util.concurrent.{ ExecutorService, ForkJoinPool, ForkJoinTask, ThreadFactory } + import com.typesafe.config.Config object ForkJoinExecutorConfigurator { diff --git a/akka-actor/src/main/scala/akka/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala index 00e3287731..7e6d6d9010 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Future.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Future.scala @@ -4,24 +4,24 @@ package akka.dispatch -import scala.runtime.{ AbstractPartialFunction, BoxedUnit } -import akka.japi.{ Procedure, Function => JFunc, Option => JOption } - -import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService, Future, Promise } import java.lang.{ Iterable => JIterable } import java.util.{ LinkedList => JLinkedList } import java.util.concurrent.{ Callable, Executor, ExecutorService } - -import scala.util.{ Failure, Success, Try } -import java.util.concurrent.CompletionStage import java.util.concurrent.CompletableFuture +import java.util.concurrent.CompletionStage + +import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, ExecutionContextExecutorService, Future, Promise } +import scala.runtime.{ AbstractPartialFunction, BoxedUnit } +import scala.util.{ Failure, Success, Try } + +import com.github.ghik.silencer.silent import akka.annotation.InternalApi import akka.annotation.InternalStableApi import akka.compat import akka.dispatch.internal.SameThreadExecutionContext +import akka.japi.{ Procedure, Function => JFunc, Option => JOption } import akka.util.unused -import com.github.ghik.silencer.silent /** * ExecutionContexts is the Java API for ExecutionContexts diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala index 9357c960ce..f75930f46f 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala @@ -4,22 +4,23 @@ package akka.dispatch +import java.util.{ Comparator, Deque, PriorityQueue, Queue } import java.util.concurrent._ import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.locks.ReentrantLock -import java.util.{ Comparator, Deque, PriorityQueue, Queue } + +import scala.annotation.tailrec +import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.util.control.NonFatal + +import com.typesafe.config.Config import akka.actor.{ ActorCell, ActorRef, ActorSystem, DeadLetter, InternalActorRef } import akka.annotation.InternalStableApi import akka.dispatch.sysmsg._ import akka.event.Logging.Error -import akka.util.Helpers.ConfigOps import akka.util.{ BoundedBlockingQueue, StablePriorityBlockingQueue, StablePriorityQueue, Unsafe } -import com.typesafe.config.Config - -import scala.annotation.tailrec -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.util.control.NonFatal +import akka.util.Helpers.ConfigOps /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala b/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala index 8a56767b5f..a1dc167e21 100644 --- a/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala +++ b/akka-actor/src/main/scala/akka/dispatch/Mailboxes.scala @@ -8,6 +8,12 @@ import java.lang.reflect.ParameterizedType import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicReference +import scala.annotation.tailrec +import scala.concurrent.duration.Duration +import scala.util.control.NonFatal + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.ConfigurationException import akka.actor.{ Actor, ActorRef, ActorSystem, DeadLetter, Deploy, DynamicAccess, Props } import akka.dispatch.sysmsg.{ @@ -19,11 +25,6 @@ import akka.dispatch.sysmsg.{ import akka.event.EventStream import akka.event.Logging.Warning import akka.util.Reflect -import com.typesafe.config.{ Config, ConfigFactory } - -import scala.util.control.NonFatal -import scala.annotation.tailrec -import scala.concurrent.duration.Duration object Mailboxes { final val DefaultMailboxId = "akka.actor.default-mailbox" diff --git a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala index bd1844ec48..3f0510a4e9 100644 --- a/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala +++ b/akka-actor/src/main/scala/akka/dispatch/PinnedDispatcher.scala @@ -4,10 +4,11 @@ package akka.dispatch -import akka.actor.ActorCell import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration +import akka.actor.ActorCell + /** * Dedicates a unique thread for each actor passed in as reference. Served through its messageQueue. * diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala index fa95e326d1..c7436f3d84 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala +++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala @@ -5,8 +5,6 @@ package akka.dispatch import java.util.Collection -import scala.concurrent.{ BlockContext, CanAwait } -import scala.concurrent.duration.Duration import java.util.concurrent.{ ArrayBlockingQueue, BlockingQueue, @@ -24,6 +22,9 @@ import java.util.concurrent.{ } import java.util.concurrent.atomic.{ AtomicLong, AtomicReference } +import scala.concurrent.{ BlockContext, CanAwait } +import scala.concurrent.duration.Duration + object ThreadPoolConfig { type QueueFactory = () => BlockingQueue[Runnable] diff --git a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala index e252976a1f..918bbd8eac 100644 --- a/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala +++ b/akka-actor/src/main/scala/akka/dispatch/affinity/AffinityPool.scala @@ -4,27 +4,27 @@ package akka.dispatch.affinity +import java.lang.Integer.reverseBytes import java.lang.invoke.MethodHandles import java.lang.invoke.MethodType.methodType import java.util.Collections -import java.util.concurrent.TimeUnit.MICROSECONDS import java.util.concurrent._ +import java.util.concurrent.TimeUnit.MICROSECONDS import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.locks.LockSupport -import java.lang.Integer.reverseBytes - -import akka.dispatch._ -import akka.util.Helpers.Requiring -import com.typesafe.config.Config - -import akka.annotation.{ ApiMayChange, InternalApi } -import akka.event.Logging -import akka.util.{ ImmutableIntMap, OptionVal, ReentrantGuard } import scala.annotation.{ switch, tailrec } import scala.collection.{ immutable, mutable } import scala.util.control.NonFatal +import com.typesafe.config.Config + +import akka.annotation.{ ApiMayChange, InternalApi } +import akka.dispatch._ +import akka.event.Logging +import akka.util.{ ImmutableIntMap, OptionVal, ReentrantGuard } +import akka.util.Helpers.Requiring + @InternalApi @ApiMayChange private[affinity] object AffinityPool { diff --git a/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala b/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala index a3ccdb1d81..3d691699b3 100644 --- a/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala +++ b/akka-actor/src/main/scala/akka/dispatch/sysmsg/SystemMessage.scala @@ -5,6 +5,7 @@ package akka.dispatch.sysmsg import scala.annotation.tailrec + import akka.actor.{ ActorInitializationException, ActorRef, InternalActorRef, PossiblyHarmful } import akka.actor.DeadLetterSuppression import akka.annotation.InternalStableApi diff --git a/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala b/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala index 6d0a76abd8..927147b082 100644 --- a/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala +++ b/akka-actor/src/main/scala/akka/event/ActorClassificationUnsubscriber.scala @@ -4,10 +4,10 @@ package akka.event -import akka.actor._ -import akka.event.Logging.simpleName import java.util.concurrent.atomic.AtomicInteger +import akka.actor._ +import akka.event.Logging.simpleName import akka.util.unused /** diff --git a/akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala b/akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala index 7dd3560a80..316f3ad805 100644 --- a/akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala +++ b/akka-actor/src/main/scala/akka/event/AddressTerminatedTopic.scala @@ -7,6 +7,7 @@ package akka.event import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec + import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.AddressTerminated diff --git a/akka-actor/src/main/scala/akka/event/EventBus.scala b/akka-actor/src/main/scala/akka/event/EventBus.scala index f2f7fd7d80..8b1331efe3 100644 --- a/akka-actor/src/main/scala/akka/event/EventBus.scala +++ b/akka-actor/src/main/scala/akka/event/EventBus.scala @@ -4,13 +4,15 @@ package akka.event -import akka.actor.{ ActorRef, ActorSystem } -import akka.util.Index -import java.util.concurrent.ConcurrentSkipListSet import java.util.Comparator -import akka.util.{ Subclassification, SubclassifiedIndex } +import java.util.concurrent.ConcurrentSkipListSet +import java.util.concurrent.atomic.AtomicReference + import scala.collection.immutable -import java.util.concurrent.atomic.{ AtomicReference } + +import akka.actor.{ ActorRef, ActorSystem } +import akka.util.{ Subclassification, SubclassifiedIndex } +import akka.util.Index /** * Represents the base type for EventBuses diff --git a/akka-actor/src/main/scala/akka/event/EventStream.scala b/akka-actor/src/main/scala/akka/event/EventStream.scala index 456ec8483f..82771cad9c 100644 --- a/akka-actor/src/main/scala/akka/event/EventStream.scala +++ b/akka-actor/src/main/scala/akka/event/EventStream.scala @@ -4,14 +4,15 @@ package akka.event -import akka.actor.{ ActorRef, ActorSystem } -import akka.event.Logging.simpleName -import akka.util.Subclassification import java.util.concurrent.atomic.AtomicReference +import scala.annotation.tailrec + import com.github.ghik.silencer.silent -import scala.annotation.tailrec +import akka.actor.{ ActorRef, ActorSystem } +import akka.event.Logging.simpleName +import akka.util.Subclassification /** * An Akka EventStream is a pub-sub stream of events both system and user generated, diff --git a/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala b/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala index 7b240c661f..52598fc6a1 100644 --- a/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala +++ b/akka-actor/src/main/scala/akka/event/EventStreamUnsubscriber.scala @@ -4,11 +4,11 @@ package akka.event -import akka.actor._ -import akka.event.Logging.simpleName import java.util.concurrent.atomic.AtomicInteger +import akka.actor._ import akka.dispatch.Dispatchers +import akka.event.Logging.simpleName /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala b/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala index 3cd59721cb..926b79a5ab 100644 --- a/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala +++ b/akka-actor/src/main/scala/akka/event/LoggerMailbox.scala @@ -4,13 +4,14 @@ package akka.event -import akka.dispatch.MessageQueue -import akka.dispatch.MailboxType -import akka.dispatch.UnboundedMailbox import com.typesafe.config.Config -import akka.actor.ActorSystem + import akka.actor.ActorRef +import akka.actor.ActorSystem +import akka.dispatch.MailboxType +import akka.dispatch.MessageQueue import akka.dispatch.ProducesMessageQueue +import akka.dispatch.UnboundedMailbox import akka.event.Logging.LogEvent import akka.util.unused diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala index 4e669d2ac4..26621bca24 100644 --- a/akka-actor/src/main/scala/akka/event/Logging.scala +++ b/akka-actor/src/main/scala/akka/event/Logging.scala @@ -7,22 +7,23 @@ package akka.event import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger -import akka.actor.ActorSystem.Settings -import akka.actor._ -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.dispatch.RequiresMessageQueue -import akka.event.Logging._ -import akka.util.unused -import akka.util.{ Helpers, ReentrantGuard } -import akka.{ AkkaException, ConfigurationException } -import com.github.ghik.silencer.silent - import scala.annotation.implicitNotFound import scala.collection.immutable import scala.concurrent.Await import scala.language.existentials import scala.util.control.{ NoStackTrace, NonFatal } + +import com.github.ghik.silencer.silent + +import akka.{ AkkaException, ConfigurationException } +import akka.actor._ +import akka.actor.ActorSystem.Settings +import akka.annotation.{ DoNotInherit, InternalApi } +import akka.dispatch.RequiresMessageQueue +import akka.event.Logging._ +import akka.util.{ Helpers, ReentrantGuard } import akka.util.Timeout +import akka.util.unused /** * This trait brings log level handling to the EventStream: it reads the log diff --git a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala index 15b2a43f4a..9cb0d64e3e 100644 --- a/akka-actor/src/main/scala/akka/event/LoggingReceive.scala +++ b/akka-actor/src/main/scala/akka/event/LoggingReceive.scala @@ -4,14 +4,16 @@ package akka.event +import scala.runtime.BoxedUnit + import language.existentials + +import akka.actor.AbstractActor import akka.actor.Actor.Receive -import akka.actor.ActorContext import akka.actor.ActorCell +import akka.actor.ActorContext import akka.actor.DiagnosticActorLogging import akka.event.Logging.{ LogEvent, LogLevel } -import akka.actor.AbstractActor -import scala.runtime.BoxedUnit object LoggingReceive { diff --git a/akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala b/akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala index d15d6f559a..0de71a0f5c 100644 --- a/akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala +++ b/akka-actor/src/main/scala/akka/event/japi/EventBusJavaAPI.scala @@ -4,8 +4,8 @@ package akka.event.japi -import akka.util.Subclassification import akka.actor.{ ActorRef, ActorSystem } +import akka.util.Subclassification /** * Java API: See documentation for [[akka.event.EventBus]] diff --git a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala b/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala index 075002ff83..287295af30 100644 --- a/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala +++ b/akka-actor/src/main/scala/akka/io/DirectByteBufferPool.scala @@ -5,6 +5,7 @@ package akka.io import java.nio.ByteBuffer + import scala.util.control.NonFatal trait BufferPool { diff --git a/akka-actor/src/main/scala/akka/io/Dns.scala b/akka-actor/src/main/scala/akka/io/Dns.scala index 3d93cde0be..769b61ebea 100644 --- a/akka-actor/src/main/scala/akka/io/Dns.scala +++ b/akka-actor/src/main/scala/akka/io/Dns.scala @@ -6,23 +6,23 @@ package akka.io import java.net.{ Inet4Address, Inet6Address, InetAddress, UnknownHostException } import java.util.concurrent.ConcurrentHashMap - -import akka.actor._ -import akka.annotation.InternalApi -import akka.routing.ConsistentHashingRouter.ConsistentHashable -import com.typesafe.config.Config import java.util.function.{ Function => JFunction } +import scala.collection.immutable + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config + +import akka.actor._ import akka.annotation.DoNotInherit +import akka.annotation.InternalApi +import akka.event.Logging import akka.io.dns.AAAARecord import akka.io.dns.ARecord import akka.io.dns.DnsProtocol -import akka.util.unused -import scala.collection.immutable - -import akka.event.Logging +import akka.routing.ConsistentHashingRouter.ConsistentHashable import akka.util.ccompat._ -import com.github.ghik.silencer.silent +import akka.util.unused /** * Not for user extension. diff --git a/akka-actor/src/main/scala/akka/io/Inet.scala b/akka-actor/src/main/scala/akka/io/Inet.scala index cf6e6e551c..0597ab96fa 100644 --- a/akka-actor/src/main/scala/akka/io/Inet.scala +++ b/akka-actor/src/main/scala/akka/io/Inet.scala @@ -4,10 +4,10 @@ package akka.io -import java.nio.channels.DatagramChannel import java.net.DatagramSocket import java.net.ServerSocket import java.net.Socket +import java.nio.channels.DatagramChannel import akka.util.unused diff --git a/akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala b/akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala index e42adaef07..d30ef9f92b 100644 --- a/akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala +++ b/akka-actor/src/main/scala/akka/io/InetAddressDnsProvider.scala @@ -4,9 +4,10 @@ package akka.io -import akka.annotation.InternalApi import com.github.ghik.silencer.silent +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala b/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala index 601f974c0b..ca8c6b0b8a 100644 --- a/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala +++ b/akka-actor/src/main/scala/akka/io/InetAddressDnsResolver.scala @@ -4,29 +4,30 @@ package akka.io +import java.net.{ InetAddress, UnknownHostException } import java.net.Inet4Address import java.net.Inet6Address -import java.net.{ InetAddress, UnknownHostException } import java.security.Security import java.util.concurrent.TimeUnit -import akka.actor.Status -import akka.io.dns.CachePolicy._ +import scala.collection.immutable +import scala.concurrent.duration._ +import scala.util.{ Failure, Success, Try } + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config + import akka.actor.{ Actor, ActorLogging } +import akka.actor.Status import akka.annotation.InternalApi import akka.io.dns.AAAARecord import akka.io.dns.ARecord +import akka.io.dns.CachePolicy._ import akka.io.dns.DnsProtocol import akka.io.dns.DnsProtocol.Ip import akka.io.dns.DnsProtocol.Srv import akka.io.dns.ResourceRecord import akka.util.Helpers.Requiring -import com.github.ghik.silencer.silent -import com.typesafe.config.Config - -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.util.{ Failure, Success, Try } /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala index 3b9f5df775..08aebfed7e 100644 --- a/akka-actor/src/main/scala/akka/io/SelectionHandler.scala +++ b/akka-actor/src/main/scala/akka/io/SelectionHandler.scala @@ -4,27 +4,27 @@ package akka.io -import java.util.{ Iterator => JIterator } -import java.util.concurrent.atomic.AtomicBoolean import java.nio.channels.{ CancelledKeyException, SelectableChannel, SelectionKey } +import java.nio.channels.ClosedChannelException import java.nio.channels.SelectionKey._ import java.nio.channels.spi.SelectorProvider +import java.util.{ Iterator => JIterator } +import java.util.concurrent.atomic.AtomicBoolean + +import scala.annotation.tailrec +import scala.concurrent.ExecutionContext +import scala.util.Try +import scala.util.control.NonFatal import com.typesafe.config.Config -import scala.annotation.tailrec -import scala.util.control.NonFatal -import scala.concurrent.ExecutionContext -import akka.event.LoggingAdapter +import akka.actor._ import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.event.Logging +import akka.event.LoggingAdapter +import akka.routing.RandomPool import akka.util.Helpers.Requiring import akka.util.SerializedSuspendableExecutionContext -import akka.actor._ -import akka.routing.RandomPool -import akka.event.Logging -import java.nio.channels.ClosedChannelException - -import scala.util.Try abstract class SelectionHandlerSettings(config: Config) { import config._ diff --git a/akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala b/akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala index c982a125cf..ae30331233 100644 --- a/akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala +++ b/akka-actor/src/main/scala/akka/io/SimpleDnsCache.scala @@ -6,19 +6,20 @@ package akka.io import java.util.concurrent.atomic.AtomicReference +import scala.annotation.tailrec +import scala.collection.immutable + +import com.github.ghik.silencer.silent + import akka.actor.NoSerializationVerificationNeeded import akka.annotation.InternalApi +import akka.io.dns.{ AAAARecord, ARecord } import akka.io.dns.CachePolicy.CachePolicy import akka.io.dns.CachePolicy.Forever import akka.io.dns.CachePolicy.Never import akka.io.dns.CachePolicy.Ttl import akka.io.dns.DnsProtocol import akka.io.dns.DnsProtocol.{ Ip, RequestType, Resolved } -import akka.io.dns.{ AAAARecord, ARecord } -import com.github.ghik.silencer.silent - -import scala.annotation.tailrec -import scala.collection.immutable private[io] trait PeriodicCacheCleanup { def cleanup(): Unit diff --git a/akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala b/akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala index e2ea4c1192..aa055ff321 100644 --- a/akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala +++ b/akka-actor/src/main/scala/akka/io/SimpleDnsManager.scala @@ -6,12 +6,12 @@ package akka.io import java.util.concurrent.TimeUnit +import scala.concurrent.duration.Duration + import akka.actor.{ Actor, ActorLogging, Deploy, Props } import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.routing.FromConfig -import scala.concurrent.duration.Duration - final class SimpleDnsManager(val ext: DnsExt) extends Actor with RequiresMessageQueue[UnboundedMessageQueueSemantics] diff --git a/akka-actor/src/main/scala/akka/io/Tcp.scala b/akka-actor/src/main/scala/akka/io/Tcp.scala index 3fd57eed9f..953851ae6e 100644 --- a/akka-actor/src/main/scala/akka/io/Tcp.scala +++ b/akka-actor/src/main/scala/akka/io/Tcp.scala @@ -4,24 +4,24 @@ package akka.io +import java.lang.{ Iterable => JIterable } import java.net.InetSocketAddress import java.net.Socket +import java.nio.file.{ Path, Paths } -import akka.io.Inet._ +import scala.collection.immutable +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent import com.typesafe.config.Config -import scala.concurrent.duration._ -import scala.collection.immutable -import akka.util.ccompat.JavaConverters._ +import akka.actor._ +import akka.annotation.InternalApi +import akka.io.Inet._ import akka.util.{ ByteString, Helpers } import akka.util.Helpers.Requiring import akka.util.JavaDurationConverters._ -import akka.actor._ -import java.lang.{ Iterable => JIterable } -import java.nio.file.{ Path, Paths } - -import akka.annotation.InternalApi -import com.github.ghik.silencer.silent +import akka.util.ccompat.JavaConverters._ /** * TCP Extension for Akka’s IO layer. @@ -597,9 +597,10 @@ class TcpExt(system: ExtendedActorSystem) extends IO.Extension { val Settings = new Settings(system.settings.config.getConfig("akka.io.tcp")) class Settings private[TcpExt] (_config: Config) extends SelectionHandlerSettings(_config) { - import akka.util.Helpers.ConfigOps import _config._ + import akka.util.Helpers.ConfigOps + val NrOfSelectors: Int = getInt("nr-of-selectors").requiring(_ > 0, "nr-of-selectors must be > 0") val BatchAcceptLimit: Int = getInt("batch-accept-limit").requiring(_ > 0, "batch-accept-limit must be > 0") @@ -690,8 +691,8 @@ object TcpSO extends SoJavaFactories { } object TcpMessage { - import language.implicitConversions import Tcp._ + import language.implicitConversions /** * The Connect message is sent to the TCP manager actor, which is obtained via diff --git a/akka-actor/src/main/scala/akka/io/TcpConnection.scala b/akka-actor/src/main/scala/akka/io/TcpConnection.scala index 4384444b0e..d1b8ac5a7f 100644 --- a/akka-actor/src/main/scala/akka/io/TcpConnection.scala +++ b/akka-actor/src/main/scala/akka/io/TcpConnection.scala @@ -7,22 +7,23 @@ package akka.io import java.io.IOException import java.net.{ InetSocketAddress, SocketException } import java.nio.ByteBuffer -import java.nio.channels.SelectionKey._ import java.nio.channels.{ FileChannel, SocketChannel } +import java.nio.channels.SelectionKey._ import java.nio.file.{ Path, Paths } +import scala.annotation.tailrec +import scala.collection.immutable +import scala.concurrent.duration._ +import scala.util.control.{ NoStackTrace, NonFatal } + +import com.github.ghik.silencer.silent + import akka.actor._ import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.io.Inet.SocketOption import akka.io.SelectionHandler._ import akka.io.Tcp._ import akka.util.ByteString -import com.github.ghik.silencer.silent - -import scala.annotation.tailrec -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.util.control.{ NoStackTrace, NonFatal } /** * Base class for TcpIncomingConnection and TcpOutgoingConnection. diff --git a/akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala b/akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala index 76d5532583..ba20bca2ef 100644 --- a/akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala +++ b/akka-actor/src/main/scala/akka/io/TcpIncomingConnection.scala @@ -7,9 +7,11 @@ package akka.io import java.nio.channels.SocketChannel import scala.collection.immutable + +import com.github.ghik.silencer.silent + import akka.actor.ActorRef import akka.io.Inet.SocketOption -import com.github.ghik.silencer.silent /** * An actor handling the connection state machine for an incoming, already connected diff --git a/akka-actor/src/main/scala/akka/io/TcpListener.scala b/akka-actor/src/main/scala/akka/io/TcpListener.scala index 98d93c694a..3a31444b54 100644 --- a/akka-actor/src/main/scala/akka/io/TcpListener.scala +++ b/akka-actor/src/main/scala/akka/io/TcpListener.scala @@ -4,15 +4,16 @@ package akka.io -import java.nio.channels.{ SelectionKey, ServerSocketChannel, SocketChannel } import java.net.InetSocketAddress +import java.nio.channels.{ SelectionKey, ServerSocketChannel, SocketChannel } import scala.annotation.tailrec import scala.util.control.NonFatal + import akka.actor._ +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.io.SelectionHandler._ import akka.io.Tcp._ -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/TcpManager.scala b/akka-actor/src/main/scala/akka/io/TcpManager.scala index b9a9a44dce..65d4e2ea39 100644 --- a/akka-actor/src/main/scala/akka/io/TcpManager.scala +++ b/akka-actor/src/main/scala/akka/io/TcpManager.scala @@ -5,6 +5,7 @@ package akka.io import Tcp._ + import akka.actor.{ ActorLogging, Props } /** diff --git a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala index c3d00383d3..960e894dd6 100644 --- a/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala +++ b/akka-actor/src/main/scala/akka/io/TcpOutgoingConnection.scala @@ -7,15 +7,15 @@ package akka.io import java.net.{ ConnectException, InetSocketAddress } import java.nio.channels.{ SelectionKey, SocketChannel } -import akka.actor.Status.Failure - -import scala.util.control.{ NoStackTrace, NonFatal } import scala.concurrent.duration._ +import scala.util.control.{ NoStackTrace, NonFatal } + import akka.actor.{ ActorRef, ReceiveTimeout } +import akka.actor.Status.Failure import akka.annotation.InternalApi -import akka.io.TcpConnection.CloseInformation import akka.io.SelectionHandler._ import akka.io.Tcp._ +import akka.io.TcpConnection.CloseInformation import akka.io.dns.DnsProtocol /** @@ -35,8 +35,8 @@ private[io] class TcpOutgoingConnection( connect.pullMode) { import TcpOutgoingConnection._ - import context._ import connect._ + import context._ signDeathPact(commander) diff --git a/akka-actor/src/main/scala/akka/io/Udp.scala b/akka-actor/src/main/scala/akka/io/Udp.scala index f8fb701e78..e73915ae03 100644 --- a/akka-actor/src/main/scala/akka/io/Udp.scala +++ b/akka-actor/src/main/scala/akka/io/Udp.scala @@ -7,15 +7,16 @@ package akka.io import java.net.DatagramSocket import java.net.InetSocketAddress +import scala.collection.immutable + +import com.github.ghik.silencer.silent import com.typesafe.config.Config -import scala.collection.immutable -import akka.io.Inet.{ SoJavaFactories, SocketOption } -import akka.util.Helpers.Requiring -import akka.util.ByteString import akka.actor._ +import akka.io.Inet.{ SoJavaFactories, SocketOption } +import akka.util.ByteString +import akka.util.Helpers.Requiring import akka.util.ccompat._ -import com.github.ghik.silencer.silent /** * UDP Extension for Akka’s IO layer. @@ -244,8 +245,10 @@ class UdpExt(system: ExtendedActorSystem) extends IO.Extension { * Java API: factory methods for the message types used when communicating with the Udp service. */ object UdpMessage { - import Udp._ import java.lang.{ Iterable => JIterable } + + import Udp._ + import akka.util.ccompat.JavaConverters._ /** diff --git a/akka-actor/src/main/scala/akka/io/UdpConnected.scala b/akka-actor/src/main/scala/akka/io/UdpConnected.scala index 8632e316cf..30d076cb31 100644 --- a/akka-actor/src/main/scala/akka/io/UdpConnected.scala +++ b/akka-actor/src/main/scala/akka/io/UdpConnected.scala @@ -8,12 +8,14 @@ import java.lang.{ Iterable => JIterable } import java.net.InetSocketAddress import scala.collection.immutable + +import com.github.ghik.silencer.silent + +import akka.actor._ import akka.io.Inet.SocketOption import akka.io.Udp.UdpSettings import akka.util.ByteString -import akka.actor._ import akka.util.ccompat._ -import com.github.ghik.silencer.silent /** * UDP Extension for Akka’s IO layer. @@ -180,8 +182,8 @@ class UdpConnectedExt(system: ExtendedActorSystem) extends IO.Extension { * Java API: factory methods for the message types used when communicating with the UdpConnected service. */ object UdpConnectedMessage { - import language.implicitConversions import UdpConnected._ + import language.implicitConversions /** * Send this message to the [[UdpExt#manager]] in order to bind to a local diff --git a/akka-actor/src/main/scala/akka/io/UdpConnection.scala b/akka-actor/src/main/scala/akka/io/UdpConnection.scala index f953a58bee..ced1774b0b 100644 --- a/akka-actor/src/main/scala/akka/io/UdpConnection.scala +++ b/akka-actor/src/main/scala/akka/io/UdpConnection.scala @@ -9,16 +9,16 @@ import java.nio.ByteBuffer import java.nio.channels.DatagramChannel import java.nio.channels.SelectionKey._ -import akka.actor.Status.Failure - import scala.annotation.tailrec import scala.util.control.NonFatal + import akka.actor.{ Actor, ActorLogging, ActorRef } +import akka.actor.Status.Failure import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.util.{ unused, ByteString } import akka.io.SelectionHandler._ import akka.io.UdpConnected._ import akka.io.dns.DnsProtocol +import akka.util.{ unused, ByteString } /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/UdpListener.scala b/akka-actor/src/main/scala/akka/io/UdpListener.scala index aaaaad92b5..262dc4df3d 100644 --- a/akka-actor/src/main/scala/akka/io/UdpListener.scala +++ b/akka-actor/src/main/scala/akka/io/UdpListener.scala @@ -10,12 +10,13 @@ import java.nio.channels.SelectionKey._ import scala.annotation.tailrec import scala.util.control.NonFatal + import akka.actor.{ Actor, ActorLogging, ActorRef } import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.util.ByteString import akka.io.Inet.DatagramChannelCreator import akka.io.SelectionHandler._ import akka.io.Udp._ +import akka.util.ByteString /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/UdpSender.scala b/akka-actor/src/main/scala/akka/io/UdpSender.scala index 586b59af0c..e045461058 100644 --- a/akka-actor/src/main/scala/akka/io/UdpSender.scala +++ b/akka-actor/src/main/scala/akka/io/UdpSender.scala @@ -8,11 +8,13 @@ import java.nio.channels.DatagramChannel import scala.collection.immutable import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + +import akka.actor._ import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.io.Inet.SocketOption import akka.io.Udp._ -import akka.actor._ -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/WithUdpSend.scala b/akka-actor/src/main/scala/akka/io/WithUdpSend.scala index 2e77ac6794..e3f8ca88bf 100644 --- a/akka-actor/src/main/scala/akka/io/WithUdpSend.scala +++ b/akka-actor/src/main/scala/akka/io/WithUdpSend.scala @@ -7,13 +7,13 @@ package akka.io import java.net.InetSocketAddress import java.nio.channels.{ DatagramChannel, SelectionKey } -import akka.actor.{ Actor, ActorLogging, ActorRef } -import akka.io.Udp.{ CommandFailed, Send } -import akka.io.SelectionHandler._ -import akka.io.dns.DnsProtocol - import scala.util.control.NonFatal +import akka.actor.{ Actor, ActorLogging, ActorRef } +import akka.io.SelectionHandler._ +import akka.io.Udp.{ CommandFailed, Send } +import akka.io.dns.DnsProtocol + /** * INTERNAL API */ diff --git a/akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala b/akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala index 8c818c64cc..9622b3e149 100644 --- a/akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala +++ b/akka-actor/src/main/scala/akka/io/dns/CachePolicy.scala @@ -4,11 +4,11 @@ package akka.io.dns +import scala.concurrent.duration.{ Duration, FiniteDuration, _ } + import akka.annotation.InternalApi import akka.util.JavaDurationConverters._ -import scala.concurrent.duration.{ Duration, FiniteDuration, _ } - object CachePolicy { sealed trait CachePolicy diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala b/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala index 77eed4cb55..39d2be13cb 100644 --- a/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala +++ b/akka-actor/src/main/scala/akka/io/dns/DnsProtocol.scala @@ -10,11 +10,11 @@ import java.net.InetAddress import java.net.UnknownHostException import java.util +import scala.collection.{ immutable => im } + import akka.actor.NoSerializationVerificationNeeded import akka.io.IpVersionSelector import akka.routing.ConsistentHashingRouter.ConsistentHashable - -import scala.collection.{ immutable => im } import akka.util.ccompat.JavaConverters._ /** diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala b/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala index f85a03e7a1..d9fa735ce0 100644 --- a/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala +++ b/akka-actor/src/main/scala/akka/io/dns/DnsResourceRecords.scala @@ -6,16 +6,17 @@ package akka.io.dns import java.net.{ Inet4Address, Inet6Address, InetAddress } -import akka.actor.NoSerializationVerificationNeeded -import akka.annotation.InternalApi -import CachePolicy._ -import akka.annotation.DoNotInherit -import akka.io.dns.internal.{ DomainName, _ } -import akka.util.{ unused, ByteIterator, ByteString } - import scala.annotation.switch import scala.concurrent.duration._ +import CachePolicy._ + +import akka.actor.NoSerializationVerificationNeeded +import akka.annotation.DoNotInherit +import akka.annotation.InternalApi +import akka.io.dns.internal.{ DomainName, _ } +import akka.util.{ unused, ByteIterator, ByteString } + /** * Not for user extension */ diff --git a/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala b/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala index 3fbdb8d16b..91bbfc5f47 100644 --- a/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala +++ b/akka-actor/src/main/scala/akka/io/dns/DnsSettings.scala @@ -8,21 +8,22 @@ import java.io.File import java.net.{ InetSocketAddress, URI } import java.util +import scala.collection.immutable +import scala.concurrent.duration.FiniteDuration +import scala.util.{ Failure, Success, Try } + +import com.typesafe.config.{ Config, ConfigValueType } + import akka.actor.ExtendedActorSystem import akka.annotation.InternalApi +import akka.event.Logging import akka.io.dns.CachePolicy.{ CachePolicy, Forever, Never, Ttl } import akka.io.dns.internal.{ ResolvConf, ResolvConfParser } import akka.util.Helpers import akka.util.Helpers.Requiring import akka.util.JavaDurationConverters._ -import akka.util.ccompat.JavaConverters._ import akka.util.ccompat._ -import com.typesafe.config.{ Config, ConfigValueType } -import scala.collection.immutable -import scala.concurrent.duration.FiniteDuration -import scala.util.{ Failure, Success, Try } - -import akka.event.Logging +import akka.util.ccompat.JavaConverters._ /** INTERNAL API */ @InternalApi diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala index 2bbea4db71..c76c290a04 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsManager.scala @@ -7,20 +7,21 @@ package akka.io.dns.internal import java.net.InetSocketAddress import java.util.concurrent.TimeUnit -import akka.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers } -import akka.annotation.InternalApi -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.io.PeriodicCacheCleanup -import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, DnsSettings } -import akka.io.dns.internal.AsyncDnsManager.CacheCleanup -import akka.io.{ Dns, DnsExt, DnsProvider } -import akka.routing.FromConfig -import akka.util.Timeout +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration.Duration + import com.github.ghik.silencer.silent import com.typesafe.config.Config -import scala.concurrent.duration.Duration -import scala.concurrent.ExecutionContextExecutor +import akka.actor.{ Actor, ActorLogging, ActorRefFactory, Deploy, ExtendedActorSystem, Props, Timers } +import akka.annotation.InternalApi +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.io.{ Dns, DnsExt, DnsProvider } +import akka.io.PeriodicCacheCleanup +import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, DnsSettings } +import akka.io.dns.internal.AsyncDnsManager.CacheCleanup +import akka.routing.FromConfig +import akka.util.Timeout /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala index f2d67c357c..c1f2d28193 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsProvider.scala @@ -4,9 +4,10 @@ package akka.io.dns.internal +import com.github.ghik.silencer.silent + import akka.annotation.InternalApi import akka.io._ -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala index cbf50dc513..2e4854447e 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/AsyncDnsResolver.scala @@ -6,23 +6,23 @@ package akka.io.dns.internal import java.net.{ Inet4Address, Inet6Address, InetAddress, InetSocketAddress } -import akka.actor.{ Actor, ActorLogging, ActorRef, ActorRefFactory } -import akka.annotation.InternalApi -import akka.io.SimpleDnsCache -import akka.io.dns.CachePolicy.{ Never, Ttl } -import akka.io.dns.DnsProtocol.{ Ip, RequestType, Srv } -import akka.io.dns.internal.DnsClient._ -import akka.io.dns._ -import akka.pattern.AskTimeoutException -import akka.pattern.{ ask, pipe } -import akka.util.{ Helpers, Timeout } -import akka.util.PrettyDuration._ - import scala.collection.immutable +import scala.concurrent.ExecutionContextExecutor import scala.concurrent.Future import scala.util.Try import scala.util.control.NonFatal -import scala.concurrent.ExecutionContextExecutor + +import akka.actor.{ Actor, ActorLogging, ActorRef, ActorRefFactory } +import akka.annotation.InternalApi +import akka.io.SimpleDnsCache +import akka.io.dns._ +import akka.io.dns.CachePolicy.{ Never, Ttl } +import akka.io.dns.DnsProtocol.{ Ip, RequestType, Srv } +import akka.io.dns.internal.DnsClient._ +import akka.pattern.{ ask, pipe } +import akka.pattern.AskTimeoutException +import akka.util.{ Helpers, Timeout } +import akka.util.PrettyDuration._ /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala index f82ffa1266..a7a1c0b0b4 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/DnsClient.scala @@ -6,17 +6,18 @@ package akka.io.dns.internal import java.net.{ InetAddress, InetSocketAddress } -import akka.actor.Status.Failure -import akka.actor.{ Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash } -import akka.annotation.InternalApi -import akka.io.dns.{ RecordClass, RecordType, ResourceRecord } -import akka.io.{ IO, Tcp, Udp } -import akka.pattern.{ BackoffOpts, BackoffSupervisor } +import scala.collection.{ immutable => im } +import scala.concurrent.duration._ +import scala.util.Try + import com.github.ghik.silencer.silent -import scala.collection.{ immutable => im } -import scala.util.Try -import scala.concurrent.duration._ +import akka.actor.{ Actor, ActorLogging, ActorRef, NoSerializationVerificationNeeded, Props, Stash } +import akka.actor.Status.Failure +import akka.annotation.InternalApi +import akka.io.{ IO, Tcp, Udp } +import akka.io.dns.{ RecordClass, RecordType, ResourceRecord } +import akka.pattern.{ BackoffOpts, BackoffSupervisor } /** * INTERNAL API @@ -39,7 +40,6 @@ import scala.concurrent.duration._ @InternalApi private[akka] class DnsClient(ns: InetSocketAddress) extends Actor with ActorLogging with Stash { import DnsClient._ - import context.system val udp = IO(Udp) diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala b/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala index 0748980a18..970a2b399e 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/DnsMessage.scala @@ -4,15 +4,16 @@ package akka.io.dns.internal -import akka.annotation.InternalApi -import akka.io.dns.ResourceRecord -import akka.util.{ ByteString, ByteStringBuilder } -import com.github.ghik.silencer.silent - import scala.collection.GenTraversableOnce import scala.collection.immutable.Seq import scala.util.{ Failure, Success, Try } +import com.github.ghik.silencer.silent + +import akka.annotation.InternalApi +import akka.io.dns.ResourceRecord +import akka.util.{ ByteString, ByteStringBuilder } + /** * INTERNAL API */ diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala b/akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala index 1144886052..424300f5f6 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/ResolvConfParser.scala @@ -7,9 +7,10 @@ package akka.io.dns.internal import java.io.File import java.nio.file.Files -import akka.util.ccompat.JavaConverters._ import scala.util.Try +import akka.util.ccompat.JavaConverters._ + private[dns] case class ResolvConf(search: List[String], ndots: Int) private[dns] object ResolvConfParser { diff --git a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala b/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala index 64975c5497..1a3f99773b 100644 --- a/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala +++ b/akka-actor/src/main/scala/akka/io/dns/internal/TcpDnsClient.scala @@ -9,8 +9,8 @@ import java.net.InetSocketAddress import akka.AkkaException import akka.actor.{ Actor, ActorLogging, ActorRef, Stash } import akka.annotation.InternalApi -import akka.io.dns.internal.DnsClient.Answer import akka.io.Tcp +import akka.io.dns.internal.DnsClient.Answer import akka.util.ByteString /** diff --git a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala index 4a69227431..9531a25f29 100644 --- a/akka-actor/src/main/scala/akka/japi/JavaAPI.scala +++ b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala @@ -6,15 +6,16 @@ package akka.japi import java.util.Collections.{ emptyList, singletonList } -import akka.util.Collections.EmptyImmutableSeq -import com.github.ghik.silencer.silent - import scala.collection.immutable import scala.language.implicitConversions import scala.reflect.ClassTag import scala.runtime.AbstractPartialFunction import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent + +import akka.util.Collections.EmptyImmutableSeq + /** * A Function interface. Used to create first-class-functions is Java. * diff --git a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala index f546ab12c0..215d849b6e 100644 --- a/akka-actor/src/main/scala/akka/pattern/AskSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/AskSupport.scala @@ -6,17 +6,18 @@ package akka.pattern import java.util.concurrent.TimeoutException +import scala.annotation.tailrec +import scala.concurrent.{ Future, Promise } +import scala.language.implicitConversions +import scala.util.{ Failure, Success } + +import com.github.ghik.silencer.silent + import akka.actor._ import akka.annotation.InternalApi import akka.dispatch.ExecutionContexts import akka.dispatch.sysmsg._ import akka.util.{ Timeout, Unsafe } -import com.github.ghik.silencer.silent - -import scala.annotation.tailrec -import scala.concurrent.{ Future, Promise } -import scala.language.implicitConversions -import scala.util.{ Failure, Success } /** * This is what is used to complete a Future that is returned from an ask/? call, diff --git a/akka-actor/src/main/scala/akka/pattern/Backoff.scala b/akka-actor/src/main/scala/akka/pattern/Backoff.scala index d72ee54d60..45f628959c 100644 --- a/akka-actor/src/main/scala/akka/pattern/Backoff.scala +++ b/akka-actor/src/main/scala/akka/pattern/Backoff.scala @@ -4,13 +4,14 @@ package akka.pattern +import scala.concurrent.duration.{ Duration, FiniteDuration } + +import com.github.ghik.silencer.silent + import akka.actor.{ OneForOneStrategy, Props, SupervisorStrategy } import akka.annotation.DoNotInherit import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor } import akka.util.JavaDurationConverters._ -import com.github.ghik.silencer.silent - -import scala.concurrent.duration.{ Duration, FiniteDuration } /** * @deprecated This API is superseded by the [[BackoffOpts]] object. diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala b/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala index bb37037a2f..6e893978ac 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala +++ b/akka-actor/src/main/scala/akka/pattern/BackoffOptions.scala @@ -4,13 +4,13 @@ package akka.pattern +import scala.concurrent.duration.{ Duration, FiniteDuration } + import akka.actor.{ OneForOneStrategy, Props, SupervisorStrategy } import akka.annotation.DoNotInherit import akka.pattern.internal.{ BackoffOnRestartSupervisor, BackoffOnStopSupervisor } import akka.util.JavaDurationConverters._ -import scala.concurrent.duration.{ Duration, FiniteDuration } - /** * Backoff options allow to specify a number of properties for backoff supervisors. */ diff --git a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala index 3670b50b00..e85fe90dbe 100644 --- a/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/BackoffSupervisor.scala @@ -7,14 +7,14 @@ package akka.pattern import java.util.Optional import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.util.Try + import akka.actor.{ ActorRef, DeadLetterSuppression, OneForOneStrategy, Props, SupervisorStrategy } import akka.annotation.InternalApi import akka.pattern.internal.BackoffOnStopSupervisor import akka.util.JavaDurationConverters._ -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.util.Try - object BackoffSupervisor { /** diff --git a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala index e500fdfbfd..ca4b06c693 100644 --- a/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala +++ b/akka-actor/src/main/scala/akka/pattern/CircuitBreaker.scala @@ -5,28 +5,27 @@ package akka.pattern import java.util.Optional +import java.util.concurrent.{ Callable, CompletionStage, CopyOnWriteArrayList } import java.util.concurrent.atomic.{ AtomicBoolean, AtomicInteger, AtomicLong } +import java.util.function.BiFunction import java.util.function.Consumer +import scala.compat.java8.FutureConverters +import scala.concurrent.{ Await, ExecutionContext, Future, Promise } +import scala.concurrent.TimeoutException +import scala.concurrent.duration._ +import scala.util.{ Failure, Success, Try } +import scala.util.control.NoStackTrace +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + import akka.AkkaException import akka.actor.Scheduler +import akka.dispatch.ExecutionContexts.parasitic import akka.util.JavaDurationConverters._ import akka.util.Unsafe -import scala.util.control.NoStackTrace -import java.util.concurrent.{ Callable, CompletionStage, CopyOnWriteArrayList } -import java.util.function.BiFunction - -import scala.concurrent.{ Await, ExecutionContext, Future, Promise } -import scala.concurrent.duration._ -import scala.concurrent.TimeoutException -import scala.util.control.NonFatal -import scala.util.{ Failure, Success, Try } -import akka.dispatch.ExecutionContexts.parasitic -import com.github.ghik.silencer.silent - -import scala.compat.java8.FutureConverters - /** * Companion object providing factory methods for Circuit Breaker which runs callbacks in caller's thread */ diff --git a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala index 9f8580c3fa..dd9a3f08bf 100644 --- a/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/FutureTimeoutSupport.scala @@ -4,15 +4,17 @@ package akka.pattern -import scala.concurrent.{ ExecutionContext, Future, Promise } -import akka.actor._ -import scala.util.control.NonFatal -import scala.concurrent.duration.FiniteDuration -import java.util.concurrent.CompletionStage import java.util.concurrent.CompletableFuture -import akka.dispatch.Futures +import java.util.concurrent.CompletionStage import java.util.function.BiConsumer +import scala.concurrent.{ ExecutionContext, Future, Promise } +import scala.concurrent.duration.FiniteDuration +import scala.util.control.NonFatal + +import akka.actor._ +import akka.dispatch.Futures + trait FutureTimeoutSupport { /** diff --git a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala index 7d5ddf2402..c1e50fce25 100644 --- a/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/GracefulStopSupport.scala @@ -4,14 +4,14 @@ package akka.pattern -import akka.actor._ -import akka.dispatch.ExecutionContexts -import akka.util.Timeout -import akka.dispatch.sysmsg.{ Unwatch, Watch } - import scala.concurrent.Future import scala.concurrent.duration.FiniteDuration +import akka.actor._ +import akka.dispatch.ExecutionContexts +import akka.dispatch.sysmsg.{ Unwatch, Watch } +import akka.util.Timeout + trait GracefulStopSupport { /** diff --git a/akka-actor/src/main/scala/akka/pattern/Patterns.scala b/akka-actor/src/main/scala/akka/pattern/Patterns.scala index d0c9ddf4c2..8197a42ca1 100644 --- a/akka-actor/src/main/scala/akka/pattern/Patterns.scala +++ b/akka-actor/src/main/scala/akka/pattern/Patterns.scala @@ -7,16 +7,19 @@ package akka.pattern import java.util.Optional import java.util.concurrent.{ Callable, CompletionStage, TimeUnit } -import akka.actor.{ ActorSelection, Scheduler } -import akka.util.JavaDurationConverters._ - import scala.compat.java8.FutureConverters._ import scala.concurrent.ExecutionContext +import akka.actor.{ ActorSelection, Scheduler } +import akka.util.JavaDurationConverters._ + /** * Java API: for Akka patterns such as `ask`, `pipe` and others which work with [[java.util.concurrent.CompletionStage]]. */ object Patterns { + import scala.concurrent.Future + import scala.concurrent.duration._ + import akka.actor.ActorRef import akka.japi import akka.pattern.{ @@ -28,9 +31,6 @@ object Patterns { } import akka.util.Timeout - import scala.concurrent.Future - import scala.concurrent.duration._ - /** * Java API for `akka.pattern.ask`: * Sends a message asynchronously and returns a [[scala.concurrent.Future]] @@ -574,13 +574,13 @@ object Patterns { */ @deprecated("Use Patterns instead.", since = "2.5.19") object PatternsCS { + import scala.concurrent.duration._ + import akka.actor.ActorRef import akka.japi import akka.pattern.{ ask => scalaAsk, gracefulStop => scalaGracefulStop, retry => scalaRetry } import akka.util.Timeout - import scala.concurrent.duration._ - /** * Java API for `akka.pattern.ask`: * Sends a message asynchronously and returns a [[java.util.concurrent.CompletionStage]] diff --git a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala index 9d11920eff..b652d7afc0 100644 --- a/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/PipeToSupport.scala @@ -4,14 +4,16 @@ package akka.pattern -import language.implicitConversions -import scala.concurrent.{ ExecutionContext, Future } -import scala.util.{ Failure, Success } -import akka.actor.{ Actor, ActorRef, Status } -import akka.actor.ActorSelection import java.util.concurrent.CompletionStage import java.util.function.BiConsumer +import scala.concurrent.{ ExecutionContext, Future } +import scala.util.{ Failure, Success } + +import language.implicitConversions + +import akka.actor.{ Actor, ActorRef, Status } +import akka.actor.ActorSelection import akka.util.unused trait PipeToSupport { diff --git a/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala b/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala index 98bc24a32e..65d6b75465 100644 --- a/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala +++ b/akka-actor/src/main/scala/akka/pattern/PromiseRef.scala @@ -4,11 +4,11 @@ package akka.pattern +import scala.concurrent.{ Future, Promise } + import akka.actor._ import akka.util.Timeout -import scala.concurrent.{ Future, Promise } - /** * A combination of a Future and an ActorRef associated with it, which points * to an actor performing a task which will eventually resolve the Future. diff --git a/akka-actor/src/main/scala/akka/pattern/RetrySupport.scala b/akka-actor/src/main/scala/akka/pattern/RetrySupport.scala index dbdb051bf9..0380f2ba0b 100644 --- a/akka-actor/src/main/scala/akka/pattern/RetrySupport.scala +++ b/akka-actor/src/main/scala/akka/pattern/RetrySupport.scala @@ -4,13 +4,13 @@ package akka.pattern +import scala.concurrent.{ ExecutionContext, Future } +import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.util.control.NonFatal + import akka.actor.Scheduler import akka.util.ConstantFun -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.concurrent.{ ExecutionContext, Future } -import scala.util.control.NonFatal - /** * This trait provides the retry utility function */ diff --git a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala index 22fa86f817..3f799dc361 100644 --- a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnRestartSupervisor.scala @@ -4,13 +4,13 @@ package akka.pattern.internal -import akka.actor.SupervisorStrategy._ +import scala.concurrent.duration._ + import akka.actor.{ OneForOneStrategy, _ } +import akka.actor.SupervisorStrategy._ import akka.annotation.InternalApi import akka.pattern.{ BackoffReset, BackoffSupervisor, HandleBackoff } -import scala.concurrent.duration._ - /** * INTERNAL API * diff --git a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala index 51ebcc18ab..af94d4fa57 100644 --- a/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala +++ b/akka-actor/src/main/scala/akka/pattern/internal/BackoffOnStopSupervisor.scala @@ -4,13 +4,13 @@ package akka.pattern.internal -import akka.actor.SupervisorStrategy.{ Directive, Escalate } +import scala.concurrent.duration.FiniteDuration + import akka.actor.{ Actor, ActorLogging, OneForOneStrategy, Props, SupervisorStrategy, Terminated } +import akka.actor.SupervisorStrategy.{ Directive, Escalate } import akka.annotation.InternalApi import akka.pattern.{ BackoffReset, BackoffSupervisor, HandleBackoff } -import scala.concurrent.duration.FiniteDuration - /** * INTERNAL API * diff --git a/akka-actor/src/main/scala/akka/routing/Balancing.scala b/akka-actor/src/main/scala/akka/routing/Balancing.scala index 16dfab74e6..0d5a8e0b9a 100644 --- a/akka-actor/src/main/scala/akka/routing/Balancing.scala +++ b/akka-actor/src/main/scala/akka/routing/Balancing.scala @@ -5,15 +5,17 @@ package akka.routing import scala.collection.immutable + +import com.github.ghik.silencer.silent import com.typesafe.config.Config import com.typesafe.config.ConfigFactory + import akka.actor.ActorContext import akka.actor.ActorSystem import akka.actor.Props import akka.actor.SupervisorStrategy import akka.dispatch.BalancingDispatcherConfigurator import akka.dispatch.Dispatchers -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/routing/Broadcast.scala b/akka-actor/src/main/scala/akka/routing/Broadcast.scala index 89ac7da1a8..abe9a51880 100644 --- a/akka-actor/src/main/scala/akka/routing/Broadcast.scala +++ b/akka-actor/src/main/scala/akka/routing/Broadcast.scala @@ -5,12 +5,14 @@ package akka.routing import scala.collection.immutable -import akka.dispatch.Dispatchers -import com.typesafe.config.Config -import akka.actor.SupervisorStrategy -import akka.japi.Util.immutableSeq -import akka.actor.ActorSystem + import com.github.ghik.silencer.silent +import com.typesafe.config.Config + +import akka.actor.ActorSystem +import akka.actor.SupervisorStrategy +import akka.dispatch.Dispatchers +import akka.japi.Util.immutableSeq object BroadcastRoutingLogic { def apply(): BroadcastRoutingLogic = new BroadcastRoutingLogic diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala index 7324e9851d..a506b0f4dd 100644 --- a/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala +++ b/akka-actor/src/main/scala/akka/routing/ConsistentHash.scala @@ -4,9 +4,10 @@ package akka.routing +import java.util.Arrays + import scala.collection.immutable import scala.reflect.ClassTag -import java.util.Arrays /** * Consistent Hashing node ring implementation. diff --git a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala b/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala index 3a62f470d4..148bd43901 100644 --- a/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala +++ b/akka-actor/src/main/scala/akka/routing/ConsistentHashing.scala @@ -4,23 +4,23 @@ package akka.routing -import scala.collection.immutable - -import akka.dispatch.Dispatchers -import com.typesafe.config.Config -import akka.actor.SupervisorStrategy -import akka.japi.Util.immutableSeq -import akka.actor.Address -import akka.actor.ExtendedActorSystem -import akka.actor.ActorSystem import java.util.concurrent.atomic.AtomicReference -import akka.serialization.SerializationExtension +import scala.collection.immutable import scala.util.control.NonFatal -import akka.event.Logging +import com.typesafe.config.Config + import akka.actor.ActorPath +import akka.actor.ActorSystem +import akka.actor.Address +import akka.actor.ExtendedActorSystem +import akka.actor.SupervisorStrategy import akka.actor.WrappedMessage +import akka.dispatch.Dispatchers +import akka.event.Logging +import akka.japi.Util.immutableSeq +import akka.serialization.SerializationExtension object ConsistentHashingRouter { diff --git a/akka-actor/src/main/scala/akka/routing/Listeners.scala b/akka-actor/src/main/scala/akka/routing/Listeners.scala index a66cfd6be6..3a1c58da27 100644 --- a/akka-actor/src/main/scala/akka/routing/Listeners.scala +++ b/akka-actor/src/main/scala/akka/routing/Listeners.scala @@ -4,9 +4,10 @@ package akka.routing -import akka.actor.{ Actor, ActorRef } import java.util.{ Set, TreeSet } +import akka.actor.{ Actor, ActorRef } + sealed trait ListenerMessage final case class Listen(listener: ActorRef) extends ListenerMessage final case class Deafen(listener: ActorRef) extends ListenerMessage diff --git a/akka-actor/src/main/scala/akka/routing/MurmurHash.scala b/akka-actor/src/main/scala/akka/routing/MurmurHash.scala index a40e9cc88e..5b150c9668 100644 --- a/akka-actor/src/main/scala/akka/routing/MurmurHash.scala +++ b/akka-actor/src/main/scala/akka/routing/MurmurHash.scala @@ -21,9 +21,10 @@ package akka.routing import java.lang.Integer.{ rotateLeft => rotl } -import akka.util.ccompat._ import com.github.ghik.silencer.silent +import akka.util.ccompat._ + /** * An object designed to generate well-distributed non-cryptographic * hashes. It is designed to hash a collection of integers; along with diff --git a/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala b/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala index dfcc70b8e6..e08a502716 100644 --- a/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala +++ b/akka-actor/src/main/scala/akka/routing/OptimalSizeExploringResizer.scala @@ -5,16 +5,17 @@ package akka.routing import java.time.LocalDateTime - -import scala.collection.immutable import java.util.concurrent.ThreadLocalRandom +import scala.collection.immutable import scala.concurrent.duration._ -import com.typesafe.config.Config -import akka.actor._ -import akka.util.JavaDurationConverters._ + import OptimalSizeExploringResizer._ +import com.typesafe.config.Config + +import akka.actor._ import akka.annotation.InternalApi +import akka.util.JavaDurationConverters._ trait OptimalSizeExploringResizer extends Resizer { diff --git a/akka-actor/src/main/scala/akka/routing/Random.scala b/akka-actor/src/main/scala/akka/routing/Random.scala index ce72cc9ed5..53dbbc5ddb 100644 --- a/akka-actor/src/main/scala/akka/routing/Random.scala +++ b/akka-actor/src/main/scala/akka/routing/Random.scala @@ -4,15 +4,17 @@ package akka.routing -import scala.collection.immutable import java.util.concurrent.ThreadLocalRandom -import akka.dispatch.Dispatchers -import com.typesafe.config.Config -import akka.actor.SupervisorStrategy -import akka.japi.Util.immutableSeq -import akka.actor.ActorSystem +import scala.collection.immutable + import com.github.ghik.silencer.silent +import com.typesafe.config.Config + +import akka.actor.ActorSystem +import akka.actor.SupervisorStrategy +import akka.dispatch.Dispatchers +import akka.japi.Util.immutableSeq object RandomRoutingLogic { def apply(): RandomRoutingLogic = new RandomRoutingLogic diff --git a/akka-actor/src/main/scala/akka/routing/Resizer.scala b/akka-actor/src/main/scala/akka/routing/Resizer.scala index 26f94ee7f1..48612194d8 100644 --- a/akka-actor/src/main/scala/akka/routing/Resizer.scala +++ b/akka-actor/src/main/scala/akka/routing/Resizer.scala @@ -7,12 +7,11 @@ package akka.routing import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicLong -import akka.AkkaException - import scala.collection.immutable import com.typesafe.config.Config +import akka.AkkaException import akka.actor.Actor import akka.actor.ActorCell import akka.actor.ActorInitializationException diff --git a/akka-actor/src/main/scala/akka/routing/RoundRobin.scala b/akka-actor/src/main/scala/akka/routing/RoundRobin.scala index 7b4f64f4b8..c9e7fe379c 100644 --- a/akka-actor/src/main/scala/akka/routing/RoundRobin.scala +++ b/akka-actor/src/main/scala/akka/routing/RoundRobin.scala @@ -7,12 +7,14 @@ package akka.routing import java.util.concurrent.atomic.AtomicLong import scala.collection.immutable -import akka.dispatch.Dispatchers -import com.typesafe.config.Config -import akka.actor.SupervisorStrategy -import akka.japi.Util.immutableSeq -import akka.actor.ActorSystem + import com.github.ghik.silencer.silent +import com.typesafe.config.Config + +import akka.actor.ActorSystem +import akka.actor.SupervisorStrategy +import akka.dispatch.Dispatchers +import akka.japi.Util.immutableSeq object RoundRobinRoutingLogic { def apply(): RoundRobinRoutingLogic = new RoundRobinRoutingLogic diff --git a/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala b/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala index 539050676c..b02f3bf8d7 100644 --- a/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala +++ b/akka-actor/src/main/scala/akka/routing/RoutedActorCell.scala @@ -4,6 +4,9 @@ package akka.routing +import scala.collection.immutable +import scala.concurrent.duration._ + import akka.actor.Actor import akka.actor.ActorCell import akka.actor.ActorInitializationException @@ -17,9 +20,6 @@ import akka.actor.SupervisorStrategy import akka.actor.Terminated import akka.dispatch.Envelope import akka.dispatch.MessageDispatcher - -import scala.collection.immutable -import scala.concurrent.duration._ import akka.util.ccompat._ /** diff --git a/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala b/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala index ac93668603..5936a4d94d 100644 --- a/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala +++ b/akka-actor/src/main/scala/akka/routing/RoutedActorRef.scala @@ -4,6 +4,8 @@ package akka.routing +import com.github.ghik.silencer.silent + import akka.ConfigurationException import akka.actor.ActorPath import akka.actor.ActorSystemImpl @@ -15,7 +17,6 @@ import akka.actor.UnstartedCell import akka.dispatch.BalancingDispatcher import akka.dispatch.MailboxType import akka.dispatch.MessageDispatcher -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/routing/Router.scala b/akka-actor/src/main/scala/akka/routing/Router.scala index d2b62dc6ec..1702cd5fcd 100644 --- a/akka-actor/src/main/scala/akka/routing/Router.scala +++ b/akka-actor/src/main/scala/akka/routing/Router.scala @@ -5,11 +5,12 @@ package akka.routing import scala.collection.immutable + import akka.actor.ActorRef import akka.actor.ActorSelection import akka.actor.InternalActorRef -import akka.japi.Util.immutableSeq import akka.actor.NoSerializationVerificationNeeded +import akka.japi.Util.immutableSeq /** * The interface of the routing logic that is used in a [[Router]] to select diff --git a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala index 980c661b6d..33f5c84627 100644 --- a/akka-actor/src/main/scala/akka/routing/RouterConfig.scala +++ b/akka-actor/src/main/scala/akka/routing/RouterConfig.scala @@ -5,19 +5,21 @@ package akka.routing import scala.collection.immutable + +import com.github.ghik.silencer.silent + import akka.ConfigurationException import akka.actor.ActorContext import akka.actor.ActorPath +import akka.actor.ActorSystem import akka.actor.AutoReceivedMessage import akka.actor.OneForOneStrategy import akka.actor.Props import akka.actor.SupervisorStrategy import akka.actor.Terminated import akka.dispatch.Dispatchers -import akka.actor.ActorSystem import akka.japi.Util.immutableSeq import akka.util.unused -import com.github.ghik.silencer.silent /** * This trait represents a router factory: it produces the actual router actor diff --git a/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala b/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala index ec27af01bd..cd369c5708 100644 --- a/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala +++ b/akka-actor/src/main/scala/akka/routing/ScatterGatherFirstCompleted.scala @@ -4,23 +4,26 @@ package akka.routing +import java.util.concurrent.TimeoutException + import scala.collection.immutable -import akka.dispatch.Dispatchers -import com.typesafe.config.Config -import akka.actor.SupervisorStrategy -import akka.japi.Util.immutableSeq -import akka.actor.ActorRef +import scala.concurrent.Future import scala.concurrent.Promise +import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config + +import akka.actor.ActorRef +import akka.actor.ActorSystem +import akka.actor.SupervisorStrategy +import akka.dispatch.Dispatchers +import akka.dispatch.ExecutionContexts +import akka.japi.Util.immutableSeq import akka.pattern.ask import akka.pattern.pipe -import akka.dispatch.ExecutionContexts -import scala.concurrent.duration.FiniteDuration -import akka.util.Timeout import akka.util.Helpers.ConfigOps import akka.util.JavaDurationConverters._ -import akka.actor.ActorSystem -import scala.concurrent.Future -import java.util.concurrent.TimeoutException +import akka.util.Timeout /** * Broadcasts the message to all routees, and replies with the first response. diff --git a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala b/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala index b28d3e9829..3bb4308e30 100644 --- a/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala +++ b/akka-actor/src/main/scala/akka/routing/SmallestMailbox.scala @@ -4,17 +4,19 @@ package akka.routing -import scala.annotation.tailrec -import scala.collection.immutable import java.util.concurrent.ThreadLocalRandom +import scala.annotation.tailrec +import scala.collection.immutable + +import com.github.ghik.silencer.silent import com.typesafe.config.Config + import akka.actor.ActorCell import akka.actor.ActorRefWithCell +import akka.actor.ActorSystem import akka.actor.SupervisorStrategy import akka.dispatch.Dispatchers -import akka.actor.ActorSystem -import com.github.ghik.silencer.silent object SmallestMailboxRoutingLogic { def apply(): SmallestMailboxRoutingLogic = new SmallestMailboxRoutingLogic diff --git a/akka-actor/src/main/scala/akka/routing/TailChopping.scala b/akka-actor/src/main/scala/akka/routing/TailChopping.scala index bb692f383b..027dbe127f 100644 --- a/akka-actor/src/main/scala/akka/routing/TailChopping.scala +++ b/akka-actor/src/main/scala/akka/routing/TailChopping.scala @@ -7,18 +7,19 @@ package akka.routing import java.util.concurrent.atomic.AtomicInteger import scala.collection.immutable +import scala.concurrent.{ ExecutionContext, Promise } +import scala.concurrent.duration._ +import scala.util.Random + +import com.typesafe.config.Config + import akka.actor._ import akka.dispatch.Dispatchers -import com.typesafe.config.Config import akka.japi.Util.immutableSeq -import scala.concurrent.{ ExecutionContext, Promise } import akka.pattern.{ ask, pipe, AskTimeoutException } -import scala.concurrent.duration._ +import akka.util.Helpers.ConfigOps import akka.util.JavaDurationConverters._ import akka.util.Timeout -import akka.util.Helpers.ConfigOps - -import scala.util.Random /** * As each message is sent to the router, the routees are randomly ordered. The message is sent to the diff --git a/akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala b/akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala index 8f5efbd567..fc691b6c52 100644 --- a/akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala +++ b/akka-actor/src/main/scala/akka/serialization/AsyncSerializer.scala @@ -6,10 +6,10 @@ package akka.serialization import java.util.concurrent.CompletionStage -import akka.actor.ExtendedActorSystem -import scala.concurrent.duration.Duration import scala.concurrent.{ Await, Future } +import scala.concurrent.duration.Duration +import akka.actor.ExtendedActorSystem import akka.event.Logging /** diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala index 70ccceb9a6..86bd55e2a7 100644 --- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala +++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala @@ -4,24 +4,24 @@ package akka.serialization -import com.typesafe.config.Config -import akka.actor._ -import akka.event.{ LogMarker, Logging, LoggingAdapter } -import java.util.concurrent.ConcurrentHashMap - -import scala.collection.mutable.ArrayBuffer import java.io.NotSerializableException - -import scala.util.{ DynamicVariable, Failure, Try } -import scala.collection.immutable -import scala.util.control.NonFatal -import scala.util.Success import java.nio.ByteBuffer +import java.util.NoSuchElementException +import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec -import java.util.NoSuchElementException +import scala.collection.immutable +import scala.collection.mutable.ArrayBuffer +import scala.util.{ DynamicVariable, Failure, Try } +import scala.util.Success +import scala.util.control.NonFatal + +import com.typesafe.config.Config + +import akka.actor._ import akka.annotation.InternalApi +import akka.event.{ LogMarker, Logging, LoggingAdapter } import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala b/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala index 7a3164bfbc..41e4ea18f0 100644 --- a/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala +++ b/akka-actor/src/main/scala/akka/serialization/SerializationExtension.scala @@ -4,8 +4,8 @@ package akka.serialization -import akka.actor.ClassicActorSystemProvider import akka.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider } +import akka.actor.ClassicActorSystemProvider /** * SerializationExtension is an Akka Extension to interact with the Serialization diff --git a/akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala b/akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala index 1f2f6d5ad4..ca2a25a38f 100644 --- a/akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala +++ b/akka-actor/src/main/scala/akka/serialization/SerializationSetup.scala @@ -4,10 +4,10 @@ package akka.serialization +import scala.collection.immutable + import akka.actor.ExtendedActorSystem import akka.actor.setup.Setup - -import scala.collection.immutable import akka.util.ccompat.JavaConverters._ object SerializationSetup { diff --git a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala index d12fea7c4c..cde8b51251 100644 --- a/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala +++ b/akka-actor/src/main/scala/akka/util/BoundedBlockingQueue.scala @@ -4,9 +4,9 @@ package akka.util -import java.util.concurrent.locks.{ Condition, ReentrantLock } -import java.util.concurrent.{ BlockingQueue, TimeUnit } import java.util.{ AbstractQueue, Collection, Iterator, Queue } +import java.util.concurrent.{ BlockingQueue, TimeUnit } +import java.util.concurrent.locks.{ Condition, ReentrantLock } import annotation.tailrec diff --git a/akka-actor/src/main/scala/akka/util/Collections.scala b/akka-actor/src/main/scala/akka/util/Collections.scala index d07711f30b..a685302512 100644 --- a/akka-actor/src/main/scala/akka/util/Collections.scala +++ b/akka-actor/src/main/scala/akka/util/Collections.scala @@ -4,8 +4,8 @@ package akka.util -import scala.collection.immutable import scala.annotation.tailrec +import scala.collection.immutable /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/util/ConstantFun.scala b/akka-actor/src/main/scala/akka/util/ConstantFun.scala index a23e3f308f..62d6d16aac 100644 --- a/akka-actor/src/main/scala/akka/util/ConstantFun.scala +++ b/akka-actor/src/main/scala/akka/util/ConstantFun.scala @@ -5,8 +5,8 @@ package akka.util import akka.annotation.InternalApi -import akka.japi.function.{ Function => JFun, Function2 => JFun2 } import akka.japi.{ Pair => JPair } +import akka.japi.function.{ Function => JFun, Function2 => JFun2 } /** * INTERNAL API diff --git a/akka-actor/src/main/scala/akka/util/HashCode.scala b/akka-actor/src/main/scala/akka/util/HashCode.scala index a4009f22a7..f601445da8 100644 --- a/akka-actor/src/main/scala/akka/util/HashCode.scala +++ b/akka-actor/src/main/scala/akka/util/HashCode.scala @@ -4,8 +4,8 @@ package akka.util -import java.lang.reflect.{ Array => JArray } import java.lang.{ Float => JFloat, Double => JDouble } +import java.lang.reflect.{ Array => JArray } /** * Set of methods which allow easy implementation of hashCode. diff --git a/akka-actor/src/main/scala/akka/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala index 21925d9769..d86cb4a092 100644 --- a/akka-actor/src/main/scala/akka/util/Helpers.scala +++ b/akka-actor/src/main/scala/akka/util/Helpers.scala @@ -4,16 +4,18 @@ package akka.util -import java.util.Comparator -import scala.annotation.tailrec -import java.util.regex.Pattern -import com.typesafe.config.Config -import scala.concurrent.duration.FiniteDuration -import scala.concurrent.duration.Duration -import java.util.concurrent.TimeUnit -import java.util.Locale import java.time.{ Instant, LocalDateTime, ZoneId } import java.time.format.DateTimeFormatter +import java.util.Comparator +import java.util.Locale +import java.util.concurrent.TimeUnit +import java.util.regex.Pattern + +import scala.annotation.tailrec +import scala.concurrent.duration.Duration +import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config object Helpers { diff --git a/akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala b/akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala index 48c2abea9e..8a733e558e 100644 --- a/akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala +++ b/akka-actor/src/main/scala/akka/util/ImmutableIntMap.scala @@ -4,9 +4,11 @@ package akka.util import java.util.Arrays -import akka.annotation.InternalApi + import scala.annotation.tailrec +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-actor/src/main/scala/akka/util/Index.scala b/akka-actor/src/main/scala/akka/util/Index.scala index b7e13c67fd..4911aedf5b 100644 --- a/akka-actor/src/main/scala/akka/util/Index.scala +++ b/akka-actor/src/main/scala/akka/util/Index.scala @@ -4,16 +4,16 @@ package akka.util -import annotation.tailrec - -import java.util.concurrent.{ ConcurrentHashMap, ConcurrentSkipListSet } import java.util.Comparator +import java.util.concurrent.{ ConcurrentHashMap, ConcurrentSkipListSet } import scala.collection.JavaConverters.collectionAsScalaIterableConverter -import akka.util.ccompat.JavaConverters._ +import annotation.tailrec import com.github.ghik.silencer.silent +import akka.util.ccompat.JavaConverters._ + /** * An implementation of a ConcurrentMultiMap * Adds/remove is serialized over the specified key diff --git a/akka-actor/src/main/scala/akka/util/LockUtil.scala b/akka-actor/src/main/scala/akka/util/LockUtil.scala index af1d3cd8e8..5d1fd4fef5 100644 --- a/akka-actor/src/main/scala/akka/util/LockUtil.scala +++ b/akka-actor/src/main/scala/akka/util/LockUtil.scala @@ -4,8 +4,8 @@ package akka.util -import java.util.concurrent.locks.ReentrantLock import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.locks.ReentrantLock final class ReentrantGuard extends ReentrantLock { diff --git a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala b/akka-actor/src/main/scala/akka/util/ManifestInfo.scala index aa55937bfa..e3c86c7f5c 100644 --- a/akka-actor/src/main/scala/akka/util/ManifestInfo.scala +++ b/akka-actor/src/main/scala/akka/util/ManifestInfo.scala @@ -4,12 +4,15 @@ package akka.util -import scala.collection.immutable import java.io.IOException import java.util.Arrays import java.util.jar.Attributes import java.util.jar.Manifest +import scala.collection.immutable + +import com.github.ghik.silencer.silent + import akka.actor.ActorSystem import akka.actor.ClassicActorSystemProvider import akka.actor.ExtendedActorSystem @@ -17,7 +20,6 @@ import akka.actor.Extension import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider import akka.event.Logging -import com.github.ghik.silencer.silent /** * Akka extension that extracts [[ManifestInfo.Version]] information from META-INF/MANIFEST.MF in jar files diff --git a/akka-actor/src/main/scala/akka/util/Reflect.scala b/akka-actor/src/main/scala/akka/util/Reflect.scala index 7e9e14c054..bd087f01e4 100644 --- a/akka-actor/src/main/scala/akka/util/Reflect.scala +++ b/akka-actor/src/main/scala/akka/util/Reflect.scala @@ -3,13 +3,14 @@ */ package akka.util -import scala.util.control.NonFatal import java.lang.reflect.Constructor -import scala.collection.immutable -import java.lang.reflect.Type -import scala.annotation.tailrec import java.lang.reflect.ParameterizedType +import java.lang.reflect.Type + +import scala.annotation.tailrec +import scala.collection.immutable import scala.util.Try +import scala.util.control.NonFatal /** * Collection of internal reflection utilities which may or may not be diff --git a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala index fd973d73b3..7e53f755ff 100644 --- a/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala +++ b/akka-actor/src/main/scala/akka/util/SerializedSuspendableExecutionContext.scala @@ -5,9 +5,11 @@ package akka.util import java.util.concurrent.atomic.AtomicInteger + +import scala.annotation.{ switch, tailrec } import scala.concurrent.ExecutionContext import scala.util.control.NonFatal -import scala.annotation.{ switch, tailrec } + import akka.dispatch.AbstractNodeQueue private[akka] object SerializedSuspendableExecutionContext { diff --git a/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala b/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala index 3518e32ae4..23703f3438 100644 --- a/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala +++ b/akka-actor/src/main/scala/akka/util/StablePriorityQueue.scala @@ -4,9 +4,9 @@ package akka.util +import java.util.{ AbstractQueue, Comparator, Iterator, PriorityQueue } import java.util.concurrent.PriorityBlockingQueue import java.util.concurrent.atomic.AtomicLong -import java.util.{ AbstractQueue, Comparator, Iterator, PriorityQueue } /** * PriorityQueueStabilizer wraps a priority queue so that it respects FIFO for elements of equal priority. diff --git a/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala b/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala index 5311bbf3fb..a026709a3e 100644 --- a/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala +++ b/akka-actor/src/main/scala/akka/util/SubclassifiedIndex.scala @@ -5,6 +5,7 @@ package akka.util import scala.collection.immutable + import akka.util.ccompat._ /** diff --git a/akka-actor/src/main/scala/akka/util/Timeout.scala b/akka-actor/src/main/scala/akka/util/Timeout.scala index 4ed6110cb1..47a28fc65c 100644 --- a/akka-actor/src/main/scala/akka/util/Timeout.scala +++ b/akka-actor/src/main/scala/akka/util/Timeout.scala @@ -4,11 +4,12 @@ package akka.util -import language.implicitConversions - import java.util.concurrent.TimeUnit + import scala.concurrent.duration.{ Duration, FiniteDuration } +import language.implicitConversions + @SerialVersionUID(1L) case class Timeout(duration: FiniteDuration) { diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala index d791d712c2..e1ab29d962 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ActorBenchmark.scala @@ -4,12 +4,14 @@ package akka.actor +import java.util.concurrent.TimeUnit + +import scala.concurrent.Await +import scala.concurrent.duration._ + +import BenchmarkActors._ import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import java.util.concurrent.TimeUnit -import scala.concurrent.Await -import BenchmarkActors._ -import scala.concurrent.duration._ object ActorBenchmark { // Constants because they are used in annotations diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala index 8476a5fefd..9c88f1c810 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ActorCreationBenchmark.scala @@ -4,10 +4,12 @@ package akka.actor -import scala.concurrent.duration._ import java.util.concurrent.TimeUnit -import org.openjdk.jmh.annotations._ + import scala.concurrent.Await +import scala.concurrent.duration._ + +import org.openjdk.jmh.annotations._ /* regex checking: diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala index 91ba473399..403778be81 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ActorPathValidationBenchmark.scala @@ -6,13 +6,13 @@ package akka.actor import java.util.concurrent.TimeUnit +import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.Benchmark import org.openjdk.jmh.annotations.BenchmarkMode import org.openjdk.jmh.annotations.Fork import org.openjdk.jmh.annotations.Measurement import org.openjdk.jmh.annotations.Mode import org.openjdk.jmh.annotations.OutputTimeUnit -import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.State import org.openjdk.jmh.annotations.Warmup diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala index f8f4d15205..6320278203 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolComparativeBenchmark.scala @@ -6,11 +6,12 @@ package akka.actor import java.util.concurrent.TimeUnit -import akka.actor.BenchmarkActors._ -import akka.actor.ForkJoinActorBenchmark.cores import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ +import akka.actor.BenchmarkActors._ +import akka.actor.ForkJoinActorBenchmark.cores + @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) @Fork(1) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala index 29479f57be..8802d64cee 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolIdleCPULevelBenchmark.scala @@ -6,10 +6,11 @@ package akka.actor import java.util.concurrent.TimeUnit -import akka.actor.BenchmarkActors._ import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ +import akka.actor.BenchmarkActors._ + @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) @Fork(1) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala index e0b48448a0..3ad0f5ce36 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/AffinityPoolRequestResponseBenchmark.scala @@ -6,11 +6,12 @@ package akka.actor import java.util.concurrent.{ CountDownLatch, TimeUnit } -import akka.actor.BenchmarkActors._ -import akka.actor.ForkJoinActorBenchmark.cores import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ +import akka.actor.BenchmarkActors._ +import akka.actor.ForkJoinActorBenchmark.cores + @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) @Fork(1) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala b/akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala index 33660e9ca1..15f8e1ee04 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/BenchmarkActors.scala @@ -7,8 +7,8 @@ package akka.actor import java.util.concurrent.{ CountDownLatch, TimeUnit } import scala.concurrent.Await -import scala.concurrent.duration.Duration import scala.concurrent.duration._ +import scala.concurrent.duration.Duration object BenchmarkActors { diff --git a/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala index fcb845e846..e96d7f15ac 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/DirectByteBufferPoolBenchmark.scala @@ -8,9 +8,10 @@ import java.nio.ByteBuffer import java.util.Random import java.util.concurrent.TimeUnit -import akka.io.DirectByteBufferPool import org.openjdk.jmh.annotations._ +import akka.io.DirectByteBufferPool + @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.AverageTime)) @OutputTimeUnit(TimeUnit.NANOSECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala index f1c26ac91f..49229e6875 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ForkJoinActorBenchmark.scala @@ -4,14 +4,17 @@ package akka.actor -import akka.testkit.TestProbe +import java.util.concurrent.TimeUnit + +import scala.annotation.tailrec +import scala.concurrent.Await +import scala.concurrent.duration._ + +import BenchmarkActors._ import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import java.util.concurrent.TimeUnit -import scala.concurrent.Await -import scala.annotation.tailrec -import BenchmarkActors._ -import scala.concurrent.duration._ + +import akka.testkit.TestProbe @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala b/akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala index 1f3738dd48..2156c1618b 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/JCToolsMailbox.scala @@ -4,16 +4,18 @@ package akka.actor -import akka.dispatch.MailboxType -import akka.dispatch.ProducesMessageQueue -import akka.dispatch.BoundedNodeMessageQueue -import com.typesafe.config.Config -import akka.dispatch.MessageQueue -import akka.dispatch.BoundedMessageQueueSemantics -import scala.concurrent.duration.Duration -import akka.dispatch.Envelope -import org.jctools.queues.MpscGrowableArrayQueue import scala.annotation.tailrec +import scala.concurrent.duration.Duration + +import com.typesafe.config.Config +import org.jctools.queues.MpscGrowableArrayQueue + +import akka.dispatch.BoundedMessageQueueSemantics +import akka.dispatch.BoundedNodeMessageQueue +import akka.dispatch.Envelope +import akka.dispatch.MailboxType +import akka.dispatch.MessageQueue +import akka.dispatch.ProducesMessageQueue case class JCToolsMailbox(val capacity: Int) extends MailboxType with ProducesMessageQueue[BoundedNodeMessageQueue] { diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala b/akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala index 251ca5a623..928e1e9297 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ManyToOneArrayMailbox.scala @@ -4,16 +4,18 @@ package akka.actor -import akka.dispatch.MailboxType -import akka.dispatch.ProducesMessageQueue -import akka.dispatch.BoundedNodeMessageQueue -import com.typesafe.config.Config -import akka.dispatch.MessageQueue -import akka.dispatch.BoundedMessageQueueSemantics -import scala.concurrent.duration.Duration -import akka.dispatch.Envelope -import org.agrona.concurrent.ManyToOneConcurrentArrayQueue import scala.annotation.tailrec +import scala.concurrent.duration.Duration + +import com.typesafe.config.Config +import org.agrona.concurrent.ManyToOneConcurrentArrayQueue + +import akka.dispatch.BoundedMessageQueueSemantics +import akka.dispatch.BoundedNodeMessageQueue +import akka.dispatch.Envelope +import akka.dispatch.MailboxType +import akka.dispatch.MessageQueue +import akka.dispatch.ProducesMessageQueue /** * ManyToOneArrayMailbox is a high-performance, multiple-producer single-consumer, bounded MailboxType, diff --git a/akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala index aef3d4505a..822d6cfe51 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/RouterPoolCreationBenchmark.scala @@ -4,13 +4,16 @@ package akka.actor +import java.util.concurrent.TimeUnit + import scala.concurrent.Await import scala.concurrent.duration._ + +import org.openjdk.jmh.annotations._ + import akka.routing.RoundRobinPool import akka.testkit.TestActors import akka.testkit.TestProbe -import org.openjdk.jmh.annotations._ -import java.util.concurrent.TimeUnit @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.SingleShotTime)) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala index 0dc7cb6f4a..97b081039e 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/ScheduleBenchmark.scala @@ -7,12 +7,13 @@ package akka.actor import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicInteger -import akka.util.Timeout -import org.openjdk.jmh.annotations._ - +import scala.concurrent.{ Await, Promise } import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.duration._ -import scala.concurrent.{ Await, Promise } + +import org.openjdk.jmh.annotations._ + +import akka.util.Timeout @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala index d0a43c628b..6293dfbe6f 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/StashCreationBenchmark.scala @@ -4,12 +4,15 @@ package akka.actor +import java.util.concurrent.TimeUnit + import scala.concurrent.Await import scala.concurrent.duration._ -import akka.testkit.TestProbe + import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import java.util.concurrent.TimeUnit + +import akka.testkit.TestProbe object StashCreationBenchmark { class StashingActor extends Actor with Stash { diff --git a/akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala index 7fe52bcc47..7ba3618a8f 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/TellOnlyBenchmark.scala @@ -4,14 +4,17 @@ package akka.actor +import java.util.concurrent.TimeUnit + +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } +import org.openjdk.jmh.annotations._ + import akka.dispatch._ import akka.testkit.TestProbe import akka.util.Helpers.ConfigOps -import com.typesafe.config.{ Config, ConfigFactory } -import java.util.concurrent.TimeUnit -import org.openjdk.jmh.annotations._ -import scala.concurrent.duration._ -import scala.concurrent.Await @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.SingleShotTime)) diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala index 75dc688ad2..6bb211ad89 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedActorBenchmark.scala @@ -6,11 +6,12 @@ package akka.actor.typed import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations._ -import scala.concurrent.Await -import scala.concurrent.duration._ import akka.actor.typed.scaladsl.AskPattern._ object TypedActorBenchmark { diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala index 3c323a17ec..e82719a98e 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/typed/TypedForkJoinActorBenchmark.scala @@ -6,26 +6,27 @@ package akka.actor.typed import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory import org.openjdk.jmh.annotations.Benchmark -import org.openjdk.jmh.annotations.Level -import org.openjdk.jmh.annotations.OperationsPerInvocation -import org.openjdk.jmh.annotations.Param -import org.openjdk.jmh.annotations.Setup -import akka.actor.typed.scaladsl.AskPattern._ import org.openjdk.jmh.annotations.BenchmarkMode import org.openjdk.jmh.annotations.Fork +import org.openjdk.jmh.annotations.Level import org.openjdk.jmh.annotations.Measurement import org.openjdk.jmh.annotations.Mode +import org.openjdk.jmh.annotations.OperationsPerInvocation +import org.openjdk.jmh.annotations.Param import org.openjdk.jmh.annotations.Scope +import org.openjdk.jmh.annotations.Setup import org.openjdk.jmh.annotations.State import org.openjdk.jmh.annotations.TearDown import org.openjdk.jmh.annotations.Threads import org.openjdk.jmh.annotations.Warmup -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future +import akka.actor.typed.scaladsl.AskPattern._ @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) @@ -34,8 +35,8 @@ import scala.concurrent.Future @Warmup(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS, batchSize = 1) @Measurement(iterations = 10, time = 15, timeUnit = TimeUnit.SECONDS, batchSize = 1) class TypedForkJoinActorBenchmark { - import TypedForkJoinActorBenchmark._ import TypedBenchmarkActors._ + import TypedForkJoinActorBenchmark._ @Param(Array("50")) var tpt = 0 diff --git a/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala index 19d07e35af..12e398138c 100644 --- a/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/actor/typed/delivery/ReliableDeliveryBenchmark.scala @@ -12,6 +12,9 @@ import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.Done import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem @@ -20,8 +23,6 @@ import akka.actor.typed.delivery.ProducerController.MessageWithConfirmation import akka.actor.typed.receptionist.ServiceKey import akka.actor.typed.scaladsl.AskPattern._ import akka.actor.typed.scaladsl.Behaviors -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ object Producer { trait Command diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala index e2ad7b7ae4..e8abdac47c 100644 --- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetMergeBenchmark.scala @@ -5,20 +5,22 @@ package akka.cluster.ddata import java.util.concurrent.TimeUnit + +import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.Benchmark import org.openjdk.jmh.annotations.BenchmarkMode import org.openjdk.jmh.annotations.Fork +import org.openjdk.jmh.annotations.Level import org.openjdk.jmh.annotations.Measurement import org.openjdk.jmh.annotations.Mode import org.openjdk.jmh.annotations.OutputTimeUnit -import org.openjdk.jmh.annotations.{ Scope => JmhScope } -import org.openjdk.jmh.annotations.State -import org.openjdk.jmh.annotations.Warmup -import akka.cluster.UniqueAddress -import akka.actor.Address import org.openjdk.jmh.annotations.Param import org.openjdk.jmh.annotations.Setup -import org.openjdk.jmh.annotations.Level +import org.openjdk.jmh.annotations.State +import org.openjdk.jmh.annotations.Warmup + +import akka.actor.Address +import akka.cluster.UniqueAddress @Fork(2) @State(JmhScope.Benchmark) diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala index efda7a1801..4ccbdf394a 100644 --- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/ORSetSerializationBenchmark.scala @@ -9,13 +9,8 @@ import java.util.concurrent.TimeUnit import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.ActorRef -import akka.actor.ActorSystem -import akka.actor.Props -import akka.cluster.Cluster -import akka.serialization.SerializationExtension -import akka.serialization.Serializers import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.Benchmark import org.openjdk.jmh.annotations.BenchmarkMode import org.openjdk.jmh.annotations.Fork @@ -25,7 +20,13 @@ import org.openjdk.jmh.annotations.OutputTimeUnit import org.openjdk.jmh.annotations.State import org.openjdk.jmh.annotations.TearDown import org.openjdk.jmh.annotations.Warmup -import org.openjdk.jmh.annotations.{ Scope => JmhScope } + +import akka.actor.ActorRef +import akka.actor.ActorSystem +import akka.actor.Props +import akka.cluster.Cluster +import akka.serialization.SerializationExtension +import akka.serialization.Serializers @Fork(2) @State(JmhScope.Benchmark) diff --git a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala index 10d55b6389..c1f4153412 100644 --- a/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/cluster/ddata/VersionVectorBenchmark.scala @@ -5,20 +5,22 @@ package akka.cluster.ddata import java.util.concurrent.TimeUnit + +import org.openjdk.jmh.annotations.{ Scope => JmhScope } import org.openjdk.jmh.annotations.Benchmark import org.openjdk.jmh.annotations.BenchmarkMode import org.openjdk.jmh.annotations.Fork +import org.openjdk.jmh.annotations.Level import org.openjdk.jmh.annotations.Measurement import org.openjdk.jmh.annotations.Mode import org.openjdk.jmh.annotations.OutputTimeUnit -import org.openjdk.jmh.annotations.{ Scope => JmhScope } -import org.openjdk.jmh.annotations.State -import org.openjdk.jmh.annotations.Warmup -import akka.cluster.UniqueAddress -import akka.actor.Address import org.openjdk.jmh.annotations.Param import org.openjdk.jmh.annotations.Setup -import org.openjdk.jmh.annotations.Level +import org.openjdk.jmh.annotations.State +import org.openjdk.jmh.annotations.Warmup + +import akka.actor.Address +import akka.cluster.UniqueAddress @Fork(2) @State(JmhScope.Benchmark) diff --git a/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala index e4d8273932..9312619fd1 100644 --- a/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/dispatch/NodeQueueBenchmark.scala @@ -4,12 +4,15 @@ package akka.dispatch -import akka.actor._ -import org.openjdk.jmh.annotations._ -import com.typesafe.config.ConfigFactory import java.util.concurrent.TimeUnit + import scala.concurrent.Await import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + +import akka.actor._ import akka.testkit.TestProbe object NodeQueueBenchmark { diff --git a/akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala index af71c613ad..0f51c143e1 100644 --- a/akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/event/LogLevelAccessBenchmark.scala @@ -6,9 +6,10 @@ package akka.event import java.util.concurrent.TimeUnit -import akka.event.Logging.LogLevel import org.openjdk.jmh.annotations._ +import akka.event.Logging.LogLevel + @Fork(3) @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala index 4f9eb634ca..cf3848f01d 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/LevelDbBatchingBenchmark.scala @@ -6,14 +6,17 @@ package akka.persistence import java.io.File import java.util.concurrent.TimeUnit + import scala.concurrent.Await import scala.concurrent.duration._ + +import org.apache.commons.io.FileUtils +import org.openjdk.jmh.annotations._ + import akka.actor._ import akka.persistence.journal.AsyncWriteTarget._ import akka.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore } import akka.testkit.TestProbe -import org.apache.commons.io.FileUtils -import org.openjdk.jmh.annotations._ /* # OS: OSX 10.9.3 diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala index fa5512ff20..3429755cba 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/PersistenceActorDeferBenchmark.scala @@ -4,14 +4,17 @@ package akka.persistence +import java.io.File + +import scala.concurrent.Await import scala.concurrent.duration._ + +import org.apache.commons.io.FileUtils import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.Scope + import akka.actor._ import akka.testkit.TestProbe -import java.io.File -import org.apache.commons.io.FileUtils -import org.openjdk.jmh.annotations.Scope -import scala.concurrent.Await /* # OS: OSX 10.9.3 diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala index 0676f06eac..e5f1872520 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorBenchmark.scala @@ -4,14 +4,17 @@ package akka.persistence +import java.io.File + +import scala.concurrent.Await import scala.concurrent.duration._ + +import org.apache.commons.io.FileUtils import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.Scope + import akka.actor._ import akka.testkit.TestProbe -import java.io.File -import org.apache.commons.io.FileUtils -import org.openjdk.jmh.annotations.Scope -import scala.concurrent.Await @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala index b63a8b8c7b..03ab940536 100644 --- a/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala @@ -4,15 +4,18 @@ package akka.persistence +import java.io.File + +import scala.concurrent.Await import scala.concurrent.duration._ +import scala.concurrent.duration._ + +import org.apache.commons.io.FileUtils import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.Scope + import akka.actor._ import akka.testkit.TestProbe -import java.io.File -import org.apache.commons.io.FileUtils -import org.openjdk.jmh.annotations.Scope -import scala.concurrent.duration._ -import scala.concurrent.Await @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala index 32a9042a78..544e8f3bd6 100644 --- a/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/remote/artery/CodecBenchmark.scala @@ -10,6 +10,15 @@ import java.nio.ByteOrder import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.annotation.tailrec +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.Done import akka.NotUsed import akka.actor._ @@ -22,14 +31,6 @@ import akka.serialization.SerializationExtension import akka.stream.SystemMaterializer import akka.stream.scaladsl._ import akka.util.OptionVal -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - -import scala.annotation.tailrec -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala index 5b3ac99f31..aab8a1c884 100644 --- a/akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/remote/artery/LiteralEncodingBenchmark.scala @@ -8,9 +8,11 @@ import java.nio.ByteBuffer import java.nio.ByteOrder import java.nio.charset.Charset import java.util.concurrent.TimeUnit -import akka.util.Unsafe + import org.openjdk.jmh.annotations._ +import akka.util.Unsafe + @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala index 870cf1eb8e..1bcc1057e5 100644 --- a/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/remote/artery/SendQueueBenchmark.scala @@ -8,17 +8,18 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.CyclicBarrier import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.agrona.concurrent.ManyToOneConcurrentArrayQueue +import org.openjdk.jmh.annotations._ + import akka.actor.ActorSystem import akka.stream.KillSwitches import akka.stream.OverflowStrategy import akka.stream.SystemMaterializer import akka.stream.scaladsl._ -import com.typesafe.config.ConfigFactory -import org.agrona.concurrent.ManyToOneConcurrentArrayQueue -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala index 27b6c251bc..1d71b9ad20 100644 --- a/akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/remote/compress/HeavyHittersBenchmark.scala @@ -6,10 +6,11 @@ package akka.remote.compress import java.util.Random -import akka.remote.artery.compress.TopHeavyHitters import org.openjdk.jmh.annotations._ import org.openjdk.jmh.infra.Blackhole +import akka.remote.artery.compress.TopHeavyHitters + /** * On Macbook pro: * [info] Benchmark (n) Mode Cnt Score Error Units diff --git a/akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala b/akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala index 612acc82f7..2289f214db 100644 --- a/akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala +++ b/akka-bench-jmh/src/main/scala/akka/serialization/jackson/JacksonSerializationBench.scala @@ -4,22 +4,23 @@ package akka.serialization.jackson +import java.time.{ Duration => JDuration } import java.time.Instant import java.time.LocalDateTime -import java.time.{ Duration => JDuration } import java.util import java.util.concurrent.TimeUnit import scala.concurrent.Await import scala.concurrent.duration._ +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.actor._ import akka.serialization.Serialization import akka.serialization.SerializationExtension import akka.serialization.SerializerWithStringManifest -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ object JacksonSerializationBench { trait TestMessage diff --git a/akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala index a6d1599a0a..a052368f66 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/AskBenchmark.scala @@ -7,6 +7,12 @@ package akka.stream import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.actor.Actor import akka.actor.ActorRef @@ -17,11 +23,6 @@ import akka.remote.artery.LatchSink import akka.stream.scaladsl._ import akka.stream.testkit.scaladsl.StreamTestKit import akka.util.Timeout -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ object AskBenchmark { final val OperationsPerInvocation = 100000 diff --git a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala index f866bf496c..63003c5c50 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/EmptySourceBenchmark.scala @@ -6,13 +6,14 @@ package akka.stream import java.util.concurrent.TimeUnit -import akka.actor.ActorSystem -import akka.stream.scaladsl._ -import org.openjdk.jmh.annotations._ - import scala.concurrent._ import scala.concurrent.duration._ +import org.openjdk.jmh.annotations._ + +import akka.actor.ActorSystem +import akka.stream.scaladsl._ + @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala index da9c4bb94a..d27d90220f 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/FlatMapConcatBenchmark.scala @@ -7,6 +7,12 @@ package akka.stream import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.actor.ActorSystem import akka.remote.artery.BenchTestSource @@ -14,11 +20,6 @@ import akka.remote.artery.LatchSink import akka.stream.impl.fusing.GraphStages import akka.stream.scaladsl._ import akka.stream.testkit.scaladsl.StreamTestKit -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ object FlatMapConcatBenchmark { final val OperationsPerInvocation = 100000 diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala index 30b94bfe90..f12613f84d 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/FlatMapMergeBenchmark.scala @@ -4,15 +4,18 @@ package akka.stream -import akka.{ Done, NotUsed } -import akka.actor.ActorSystem -import akka.stream.scaladsl._ import java.util.concurrent.TimeUnit -import akka.remote.artery.BenchTestSourceSameElement -import org.openjdk.jmh.annotations._ + import scala.concurrent._ import scala.concurrent.duration._ +import org.openjdk.jmh.annotations._ + +import akka.{ Done, NotUsed } +import akka.actor.ActorSystem +import akka.remote.artery.BenchTestSourceSameElement +import akka.stream.scaladsl._ + @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala index 459877b19e..6638fa5527 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/FlowMapBenchmark.scala @@ -4,18 +4,21 @@ package akka.stream +import java.util.concurrent.Semaphore import java.util.concurrent.TimeUnit + +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.Success + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.actor.ActorSystem import akka.remote.artery.BenchTestSource -import akka.stream.scaladsl._ -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ -import java.util.concurrent.Semaphore -import scala.util.Success import akka.stream.impl.fusing.GraphStages -import scala.concurrent.Await -import scala.concurrent.duration._ +import akka.stream.scaladsl._ @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.SECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala index 3e30c9a5f3..9deb5a8d2d 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/FramingBenchmark.scala @@ -7,6 +7,14 @@ package akka.stream import java.util.concurrent.Semaphore import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.Random + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.actor.ActorSystem import akka.remote.artery.BenchTestSourceSameElement @@ -14,13 +22,6 @@ import akka.stream.scaladsl.Framing import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.util.ByteString -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.util.Random @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.SECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala index 2d1ec393b3..7b6bf29bd2 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/FusedGraphsBenchmark.scala @@ -7,16 +7,17 @@ package akka.stream import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.OperationsPerInvocation + import akka.NotUsed import akka.actor.ActorSystem import akka.stream.scaladsl._ import akka.stream.stage._ -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations.OperationsPerInvocation -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ object FusedGraphsBenchmark { val ElementCount = 100 * 1000 diff --git a/akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala index 8bd377a2a2..b32f3f0893 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/GraphBuilderBenchmark.scala @@ -6,9 +6,10 @@ package akka.stream import java.util.concurrent.TimeUnit +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.stream.scaladsl.RunnableGraph -import org.openjdk.jmh.annotations._ @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.SECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala index 6d0032fd18..00f4b08d7f 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/InterpreterBenchmark.scala @@ -4,14 +4,15 @@ package akka.stream -import akka.event._ -import akka.stream.impl.fusing.{ GraphInterpreterSpecKit, GraphStages } -import akka.stream.impl.fusing.GraphStages -import akka.stream.impl.fusing.GraphInterpreter.{ DownstreamBoundaryStageLogic, UpstreamBoundaryStageLogic } -import akka.stream.stage._ +import java.util.concurrent.TimeUnit + import org.openjdk.jmh.annotations._ -import java.util.concurrent.TimeUnit +import akka.event._ +import akka.stream.impl.fusing.{ GraphInterpreterSpecKit, GraphStages } +import akka.stream.impl.fusing.GraphInterpreter.{ DownstreamBoundaryStageLogic, UpstreamBoundaryStageLogic } +import akka.stream.impl.fusing.GraphStages +import akka.stream.stage._ @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala index 06fa874c80..2c40797683 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/InvokeWithFeedbackBenchmark.scala @@ -6,13 +6,14 @@ package akka.stream import java.util.concurrent.TimeUnit -import akka.actor.ActorSystem -import akka.stream.scaladsl._ -import org.openjdk.jmh.annotations._ - import scala.concurrent._ import scala.concurrent.duration._ +import org.openjdk.jmh.annotations._ + +import akka.actor.ActorSystem +import akka.stream.scaladsl._ + @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.SECONDS) @BenchmarkMode(Array(Mode.Throughput)) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala index f5b74125e5..6471172e99 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/JsonFramingBenchmark.scala @@ -6,9 +6,10 @@ package akka.stream import java.util.concurrent.TimeUnit +import org.openjdk.jmh.annotations._ + import akka.stream.impl.JsonObjectParser import akka.util.ByteString -import org.openjdk.jmh.annotations._ @State(Scope.Benchmark) @OutputTimeUnit(TimeUnit.SECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala index 3d294e9fc9..2e7f97c96b 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/MapAsyncBenchmark.scala @@ -7,18 +7,19 @@ package akka.stream import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.actor.ActorSystem import akka.remote.artery.BenchTestSource import akka.remote.artery.LatchSink import akka.stream.scaladsl._ import akka.stream.testkit.scaladsl.StreamTestKit -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future object MapAsyncBenchmark { final val OperationsPerInvocation = 100000 diff --git a/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala index 6d8445d105..b758822f2b 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/MaterializationBenchmark.scala @@ -6,15 +6,16 @@ package akka.stream import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + +import org.openjdk.jmh.annotations._ + import akka.Done import akka.NotUsed import akka.actor.ActorSystem import akka.stream.scaladsl._ -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ object MaterializationBenchmark { diff --git a/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala index d01c35de78..d5c2ba9cf1 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/PartitionHubBenchmark.scala @@ -7,19 +7,20 @@ package akka.stream import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + import akka.NotUsed import akka.actor.ActorSystem import akka.remote.artery.BenchTestSource import akka.remote.artery.FixedSizePartitionHub import akka.remote.artery.LatchSink -import akka.stream.scaladsl.PartitionHub import akka.stream.scaladsl._ +import akka.stream.scaladsl.PartitionHub import akka.stream.testkit.scaladsl.StreamTestKit -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ object PartitionHubBenchmark { final val OperationsPerInvocation = 100000 diff --git a/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala index a191c8bb56..498bb95ba3 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/SourceRefBenchmark.scala @@ -7,16 +7,17 @@ package akka.stream import java.util.concurrent.Semaphore import java.util.concurrent.TimeUnit -import akka.actor.ActorSystem -import akka.remote.artery.BenchTestSource -import akka.stream.scaladsl._ -import com.typesafe.config.ConfigFactory -import org.openjdk.jmh.annotations._ - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Success +import com.typesafe.config.ConfigFactory +import org.openjdk.jmh.annotations._ + +import akka.actor.ActorSystem +import akka.remote.artery.BenchTestSource +import akka.stream.scaladsl._ + /* Just a brief reference run (3.1 GHz Intel Core i7, MacBook Pro late 2017): [info] SourceRefBenchmark.source_ref_100k_elements thrpt 10 724650.336 ± 233643.256 ops/s diff --git a/akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala index c6af31b03a..62648430be 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/impl/OutputStreamSourceStageBenchmark.scala @@ -6,15 +6,16 @@ package akka.stream.impl import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ + +import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.TearDown + import akka.actor.ActorSystem import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.StreamConverters -import org.openjdk.jmh.annotations.TearDown -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.duration._ object OutputStreamSourceStageBenchmark { final val WritesPerBench = 10000 diff --git a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala index 5c8323d6d5..623401ab70 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesBenchmark.scala @@ -8,19 +8,20 @@ import java.nio.file.Files import java.nio.file.Path import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.concurrent.duration._ + +import org.openjdk.jmh.annotations._ + +import akka.Done +import akka.NotUsed import akka.actor.ActorSystem import akka.stream.Attributes import akka.stream.IOResult import akka.stream.scaladsl._ import akka.util.ByteString -import akka.Done -import akka.NotUsed -import org.openjdk.jmh.annotations._ - -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.Promise /** * Benchmark (bufSize) Mode Cnt Score Error Units diff --git a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala b/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala index dcdd4f75df..6fbd0229af 100644 --- a/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/stream/io/FileSourcesScaleBenchmark.scala @@ -8,18 +8,19 @@ import java.nio.file.Files import java.nio.file.Path import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + +import org.openjdk.jmh.annotations._ +import org.openjdk.jmh.annotations.BenchmarkMode +import org.openjdk.jmh.annotations.Scope +import org.openjdk.jmh.annotations.State + import akka.actor.ActorSystem import akka.stream.IOResult import akka.stream.scaladsl._ import akka.util.ByteString -import org.openjdk.jmh.annotations.BenchmarkMode -import org.openjdk.jmh.annotations.Scope -import org.openjdk.jmh.annotations.State -import org.openjdk.jmh.annotations._ - -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.AverageTime)) diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala index dcc2b3c8d4..2858de857b 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_copyToBuffer_Benchmark.scala @@ -7,9 +7,10 @@ package akka.util import java.nio.ByteBuffer import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1C, ByteStrings } import org.openjdk.jmh.annotations._ +import akka.util.ByteString.{ ByteString1C, ByteStrings } + @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) class ByteString_copyToBuffer_Benchmark { diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala index 56fa5d40ca..dde5ac4b86 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_decode_Benchmark.scala @@ -7,9 +7,10 @@ package akka.util import java.nio.charset.Charset import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1C, ByteStrings } import org.openjdk.jmh.annotations._ +import akka.util.ByteString.{ ByteString1C, ByteStrings } + @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) class ByteString_decode_Benchmark { diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala index 1c779e3433..10773da8e9 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropRight_Benchmark.scala @@ -6,10 +6,11 @@ package akka.util import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1, ByteStrings } +import scala.util.Random + import org.openjdk.jmh.annotations._ -import scala.util.Random +import akka.util.ByteString.{ ByteString1, ByteStrings } @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala index 4275bee57b..ad5f9a472b 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_dropSliceTake_Benchmark.scala @@ -6,9 +6,10 @@ package akka.util import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1C, ByteStrings } import org.openjdk.jmh.annotations._ +import akka.util.ByteString.{ ByteString1C, ByteStrings } + @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) class ByteString_dropSliceTake_Benchmark { diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala index 235777186d..61e996094e 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_drop_Benchmark.scala @@ -6,10 +6,11 @@ package akka.util import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1, ByteStrings } +import scala.util.Random + import org.openjdk.jmh.annotations._ -import scala.util.Random +import akka.util.ByteString.{ ByteString1, ByteStrings } @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala b/akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala index 8a307104fa..38d59d7d19 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ByteString_take_Benchmark.scala @@ -6,10 +6,11 @@ package akka.util import java.util.concurrent.TimeUnit -import akka.util.ByteString.{ ByteString1, ByteStrings } +import scala.util.Random + import org.openjdk.jmh.annotations.{ Benchmark, Measurement, Scope, State } -import scala.util.Random +import akka.util.ByteString.{ ByteString1, ByteStrings } @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MILLISECONDS) diff --git a/akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala b/akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala index 2d14bc4757..5c16c4c30f 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/ImmutableIntMapBench.scala @@ -4,10 +4,12 @@ package akka.util -import org.openjdk.jmh.annotations._ import java.util.concurrent.TimeUnit + import scala.annotation.tailrec +import org.openjdk.jmh.annotations._ + @State(Scope.Benchmark) @BenchmarkMode(Array(Mode.Throughput)) @Fork(1) diff --git a/akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala b/akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala index c9529fe9ed..e7c238baa3 100644 --- a/akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala +++ b/akka-bench-jmh/src/main/scala/akka/util/LruBoundedCacheBench.scala @@ -7,10 +7,11 @@ package akka.util import java.util import java.util.concurrent.TimeUnit -import akka.remote.artery.LruBoundedCache +import scala.util.Random + import org.openjdk.jmh.annotations.{ Param, _ } -import scala.util.Random +import akka.remote.artery.LruBoundedCache @State(Scope.Benchmark) @Measurement(timeUnit = TimeUnit.MICROSECONDS) diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala index feab28a21a..ed7a705edb 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsCollector.scala @@ -4,20 +4,22 @@ package akka.cluster.metrics -import akka.actor.Actor -import akka.actor.ActorLogging -import akka.actor.Props -import akka.actor.Address -import akka.cluster.ClusterEvent -import akka.cluster.Member -import akka.cluster.Cluster -import scala.collection.immutable -import akka.cluster.MemberStatus import java.util.concurrent.ThreadLocalRandom -import akka.actor.DeadLetterSuppression + +import scala.collection.immutable import com.github.ghik.silencer.silent +import akka.actor.Actor +import akka.actor.ActorLogging +import akka.actor.Address +import akka.actor.DeadLetterSuppression +import akka.actor.Props +import akka.cluster.Cluster +import akka.cluster.ClusterEvent +import akka.cluster.Member +import akka.cluster.MemberStatus + /** * Runtime collection management commands. */ @@ -50,8 +52,8 @@ case object CollectionStopMessage extends CollectionControlMessage { */ private[metrics] class ClusterMetricsSupervisor extends Actor with ActorLogging { val metrics = ClusterMetricsExtension(context.system) - import metrics.settings._ import context._ + import metrics.settings._ override val supervisorStrategy = metrics.strategy @@ -132,8 +134,8 @@ private[metrics] object ClusterMetricsCollector { * Actor responsible for periodic data sampling in the node and publication to the cluster. */ private[metrics] class ClusterMetricsCollector extends Actor with ActorLogging { - import ClusterMetricsCollector._ import ClusterEvent._ + import ClusterMetricsCollector._ import Member.addressOrdering import context.dispatcher val cluster = Cluster(context.system) diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala index 5776f63adb..62f96a8235 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsExtension.scala @@ -4,21 +4,22 @@ package akka.cluster.metrics -import akka.actor.ExtendedActorSystem -import akka.actor.Extension -import akka.actor.SupervisorStrategy -import akka.event.LoggingAdapter -import akka.event.Logging +import scala.collection.immutable + import com.typesafe.config.Config -import scala.collection.immutable -import akka.actor.Props +import akka.actor.ActorRef +import akka.actor.ActorSystem +import akka.actor.ClassicActorSystemProvider import akka.actor.Deploy +import akka.actor.ExtendedActorSystem +import akka.actor.Extension import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider -import akka.actor.ActorSystem -import akka.actor.ActorRef -import akka.actor.ClassicActorSystemProvider +import akka.actor.Props +import akka.actor.SupervisorStrategy +import akka.event.Logging +import akka.event.LoggingAdapter /** * Cluster metrics extension. diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala index ed4b9b5b8c..e539609b2c 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsRouting.scala @@ -5,13 +5,15 @@ package akka.cluster.metrics import java.util.Arrays +import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec import scala.collection.immutable -import java.util.concurrent.ThreadLocalRandom +import com.github.ghik.silencer.silent import com.typesafe.config.Config + import akka.actor.Actor import akka.actor.ActorSystem import akka.actor.Address @@ -20,11 +22,10 @@ import akka.actor.NoSerializationVerificationNeeded import akka.actor.Props import akka.actor.SupervisorStrategy import akka.cluster.Cluster +import akka.cluster.routing.ClusterRouterSettingsBase import akka.dispatch.Dispatchers import akka.japi.Util.immutableSeq import akka.routing._ -import akka.cluster.routing.ClusterRouterSettingsBase -import com.github.ghik.silencer.silent /** * Load balancing of messages to cluster nodes based on cluster metric data. diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala index cb701183ee..5fac7d0969 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsSettings.scala @@ -4,11 +4,13 @@ package akka.cluster.metrics -import com.typesafe.config.Config -import scala.concurrent.duration.FiniteDuration -import akka.util.Helpers.Requiring -import akka.util.Helpers.ConfigOps import scala.concurrent.duration.Duration +import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config + +import akka.util.Helpers.ConfigOps +import akka.util.Helpers.Requiring /** * Metrics extension settings. Documented in: `src/main/resources/reference.conf`. diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala index f29859517b..cd5a108a8f 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/ClusterMetricsStrategy.scala @@ -5,6 +5,7 @@ package akka.cluster.metrics import com.typesafe.config.Config + import akka.actor.OneForOneStrategy import akka.util.Helpers.ConfigOps diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala index 75d0c24dec..0e49ef9861 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Metric.scala @@ -4,13 +4,14 @@ package akka.cluster.metrics -import akka.actor.Address -import scala.util.Success import scala.util.Failure +import scala.util.Success import scala.util.Try import com.github.ghik.silencer.silent +import akka.actor.Address + /** * Metrics key/value. * diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala index 4be9a24b34..387116dc9c 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/MetricsCollector.scala @@ -4,20 +4,22 @@ package akka.cluster.metrics -import akka.actor.ActorSystem -import akka.actor.ExtendedActorSystem -import akka.event.Logging -import akka.ConfigurationException -import akka.actor.Address -import java.lang.management.MemoryMXBean -import java.lang.management.ManagementFactory -import java.lang.management.OperatingSystemMXBean -import java.lang.management.MemoryUsage -import java.lang.System.{ currentTimeMillis => newTimestamp } -import akka.cluster.Cluster import java.io.Closeable +import java.lang.System.{ currentTimeMillis => newTimestamp } +import java.lang.management.ManagementFactory +import java.lang.management.MemoryMXBean +import java.lang.management.MemoryUsage +import java.lang.management.OperatingSystemMXBean + import org.hyperic.sigar.SigarProxy +import akka.ConfigurationException +import akka.actor.ActorSystem +import akka.actor.Address +import akka.actor.ExtendedActorSystem +import akka.cluster.Cluster +import akka.event.Logging + /** * Metrics sampler. * diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala index 7492b7995c..ef12ed69ea 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/Provision.scala @@ -5,13 +5,15 @@ package akka.cluster.metrics import java.io.File + +import scala.language.postfixOps +import scala.util.Failure +import scala.util.Success +import scala.util.Try + import kamon.sigar.SigarProvisioner import org.hyperic.sigar.Sigar import org.hyperic.sigar.SigarProxy -import scala.language.postfixOps -import scala.util.Success -import scala.util.Failure -import scala.util.Try /** * Provide sigar instance as `SigarProxy`. diff --git a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala index 698475b638..00859d50b9 100644 --- a/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala +++ b/akka-cluster-metrics/src/main/scala/akka/cluster/metrics/protobuf/MessageSerializer.scala @@ -4,24 +4,23 @@ package akka.cluster.metrics.protobuf -import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, ObjectOutputStream } -import java.util.zip.{ GZIPInputStream, GZIPOutputStream } import java.{ lang => jl } - -import akka.actor.{ Address, ExtendedActorSystem } -import akka.cluster.metrics.protobuf.msg.{ ClusterMetricsMessages => cm } -import akka.cluster.metrics._ -import akka.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest, Serializers } -import akka.util.ClassLoaderObjectInputStream -import akka.protobufv3.internal.{ ByteString, MessageLite } -import akka.util.ccompat._ +import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, ObjectOutputStream } +import java.io.NotSerializableException +import java.util.zip.{ GZIPInputStream, GZIPOutputStream } import scala.annotation.tailrec import scala.collection.immutable -import akka.util.ccompat.JavaConverters._ -import java.io.NotSerializableException +import akka.actor.{ Address, ExtendedActorSystem } +import akka.cluster.metrics._ +import akka.cluster.metrics.protobuf.msg.{ ClusterMetricsMessages => cm } import akka.dispatch.Dispatchers +import akka.protobufv3.internal.{ ByteString, MessageLite } +import akka.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest, Serializers } +import akka.util.ClassLoaderObjectInputStream +import akka.util.ccompat._ +import akka.util.ccompat.JavaConverters._ /** * Protobuf serializer for [[akka.cluster.metrics.ClusterMetricsMessage]] types. diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala index 62387dedf2..8533ed2f25 100644 --- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala +++ b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala @@ -4,13 +4,15 @@ package akka.cluster.metrics -import scala.language.postfixOps import scala.concurrent.duration._ +import scala.language.postfixOps + import com.typesafe.config.ConfigFactory + +import akka.cluster.MemberStatus +import akka.cluster.MultiNodeClusterSpec import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.cluster.MultiNodeClusterSpec -import akka.cluster.MemberStatus trait ClusterMetricsCommonConfig extends MultiNodeConfig { import ConfigFactory._ diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala index ec63882192..48dcfd13ed 100644 --- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala +++ b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala @@ -4,7 +4,6 @@ package akka.cluster.metrics -import language.postfixOps import java.lang.management.ManagementFactory import scala.concurrent.Await @@ -12,19 +11,21 @@ import scala.concurrent.duration._ import com.typesafe.config.Config import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor._ import akka.cluster.Cluster import akka.cluster.MultiNodeClusterSpec -import akka.pattern.ask -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } -import akka.routing.GetRoutees -import akka.routing.FromConfig -import akka.testkit.{ DefaultTimeout, ImplicitSender, LongRunningTest } -import akka.routing.ActorRefRoutee -import akka.routing.Routees import akka.cluster.routing.ClusterRouterPool import akka.cluster.routing.ClusterRouterPoolSettings +import akka.pattern.ask +import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } +import akka.routing.ActorRefRoutee +import akka.routing.FromConfig +import akka.routing.GetRoutees +import akka.routing.Routees import akka.serialization.jackson.CborSerializable +import akka.testkit.{ DefaultTimeout, ImplicitSender, LongRunningTest } import akka.util.unused object AdaptiveLoadBalancingRouterConfig extends MultiNodeConfig { diff --git a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala index 2ae9a247e1..34cdd0d47b 100644 --- a/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala +++ b/akka-cluster-metrics/src/multi-jvm/scala/akka/cluster/metrics/sample/StatsService.scala @@ -4,12 +4,12 @@ package akka.cluster.metrics.sample +import scala.concurrent.duration._ + import akka.actor.{ Actor, ActorRef, Props, ReceiveTimeout } import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope import akka.routing.FromConfig -import scala.concurrent.duration._ - //#service class StatsService extends Actor { // This router is used both with lookup and deploy of routees. If you diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala index 46b0061880..7a4266919d 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsExtensionSpec.scala @@ -4,12 +4,13 @@ package akka.cluster.metrics -import scala.language.postfixOps import scala.concurrent.duration._ +import scala.language.postfixOps + import akka.actor._ -import akka.testkit._ -import akka.cluster.metrics.StandardMetrics._ import akka.cluster.Cluster +import akka.cluster.metrics.StandardMetrics._ +import akka.testkit._ class ClusterMetricsExtensionSpec extends AkkaSpec(MetricsConfig.clusterSigarMock) diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala index fa990f9a5a..6213af6bf1 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsRoutingSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.metrics -import akka.actor.Address -import akka.cluster.metrics.StandardMetrics._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address +import akka.cluster.metrics.StandardMetrics._ + class MetricsSelectorSpec extends AnyWordSpec with Matchers { val factor = 0.3 // TODO read from reference.conf diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala index 438c9f4de4..c94dafd6a1 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/ClusterMetricsSettingsSpec.scala @@ -4,11 +4,13 @@ package akka.cluster.metrics -import language.postfixOps -import akka.testkit.AkkaSpec -import akka.dispatch.Dispatchers import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + +import akka.dispatch.Dispatchers +import akka.testkit.AkkaSpec class ClusterMetricsSettingsSpec extends AkkaSpec { diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala index 0a45c10d86..fc06d6c00d 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/EWMASpec.scala @@ -4,12 +4,14 @@ package akka.cluster.metrics -import scala.concurrent.duration._ -import akka.testkit.{ AkkaSpec, LongRunningTest } import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.duration._ + import com.github.ghik.silencer.silent +import akka.testkit.{ AkkaSpec, LongRunningTest } + @silent class EWMASpec extends AkkaSpec(MetricsConfig.defaultEnabled) with MetricsCollectorFactory { diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala index 994a8f7fa4..78144cf7c1 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricSpec.scala @@ -4,18 +4,19 @@ package akka.cluster.metrics -import akka.cluster.metrics.StandardMetrics._ +import java.lang.System.{ currentTimeMillis => newTimestamp } import scala.util.Failure -import akka.actor.Address -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import java.lang.System.{ currentTimeMillis => newTimestamp } import com.github.ghik.silencer.silent import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address +import akka.cluster.metrics.StandardMetrics._ +import akka.testkit.AkkaSpec +import akka.testkit.ImplicitSender + @silent class MetricNumericConverterSpec extends AnyWordSpec with Matchers with MetricNumericConverter { diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala index 5a47b42408..710482a4cd 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/MetricsCollectorSpec.scala @@ -4,13 +4,15 @@ package akka.cluster.metrics -import scala.language.postfixOps import scala.concurrent.duration._ +import scala.language.postfixOps import scala.util.Try -import akka.testkit._ -import akka.cluster.metrics.StandardMetrics._ + import com.github.ghik.silencer.silent +import akka.cluster.metrics.StandardMetrics._ +import akka.testkit._ + @silent class MetricsCollectorSpec extends AkkaSpec(MetricsConfig.defaultEnabled) diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala index 2beea3e387..0421273ea9 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/TestUtil.scala @@ -4,27 +4,28 @@ package akka.cluster.metrics -import scala.language.postfixOps +import java.io.Closeable import java.util.logging.LogManager -import org.slf4j.bridge.SLF4JBridgeHandler -import akka.testkit.AkkaSpec -import akka.actor.ExtendedActorSystem -import akka.actor.Address -import java.io.Closeable +import scala.language.postfixOps -import akka.actor.ActorRef -import akka.actor.Props -import akka.actor.Actor -import akka.dispatch.RequiresMessageQueue -import akka.actor.Deploy -import akka.dispatch.UnboundedMessageQueueSemantics -import akka.actor.PoisonPill -import akka.actor.ActorLogging import org.scalatestplus.mockito.MockitoSugar +import org.slf4j.bridge.SLF4JBridgeHandler + +import akka.actor.Actor +import akka.actor.ActorLogging +import akka.actor.ActorRef import akka.actor.ActorSystem +import akka.actor.Address +import akka.actor.Deploy +import akka.actor.ExtendedActorSystem +import akka.actor.PoisonPill +import akka.actor.Props import akka.dispatch.Dispatchers +import akka.dispatch.RequiresMessageQueue +import akka.dispatch.UnboundedMessageQueueSemantics import akka.remote.RARP +import akka.testkit.AkkaSpec /** * Redirect different logging sources to SLF4J. diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala index 3148a26091..656a063aa9 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/WeightedRouteesSpec.scala @@ -4,14 +4,16 @@ package akka.cluster.metrics +import scala.Vector + import com.typesafe.config.ConfigFactory + import akka.actor.Address import akka.actor.RootActorPath import akka.remote.RARP -import akka.testkit.AkkaSpec -import akka.routing.ActorSelectionRoutee import akka.routing.ActorRefRoutee -import scala.Vector +import akka.routing.ActorSelectionRoutee +import akka.testkit.AkkaSpec class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString(""" akka.actor.provider = "cluster" diff --git a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala index b46f279001..c682ab3bb8 100644 --- a/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala +++ b/akka-cluster-metrics/src/test/scala/akka/cluster/metrics/protobuf/MessageSerializerSpec.scala @@ -5,10 +5,10 @@ package akka.cluster.metrics.protobuf import akka.actor.{ Address, ExtendedActorSystem } -import akka.testkit.AkkaSpec import akka.cluster.MemberStatus -import akka.cluster.metrics._ import akka.cluster.TestMember +import akka.cluster.metrics._ +import akka.testkit.AkkaSpec class MessageSerializerSpec extends AkkaSpec(""" akka.actor.provider = cluster diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala index 825d1b8027..f23a471075 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala @@ -5,6 +5,9 @@ package akka.cluster.sharding.typed import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.annotation.InternalApi import akka.cluster.ClusterSettings.DataCenter @@ -12,7 +15,6 @@ import akka.cluster.sharding.{ ClusterShardingSettings => ClassicShardingSetting import akka.cluster.singleton.{ ClusterSingletonManagerSettings => ClassicClusterSingletonManagerSettings } import akka.cluster.typed.Cluster import akka.cluster.typed.ClusterSingletonManagerSettings -import com.typesafe.config.Config import akka.util.JavaDurationConverters._ object ClusterShardingSettings { diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala index aa98928c5f..cb69c9189b 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSettings.scala @@ -6,13 +6,14 @@ package akka.cluster.sharding.typed import java.time.Duration +import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.annotation.ApiMayChange import akka.annotation.InternalApi import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config - -import scala.concurrent.duration.FiniteDuration @ApiMayChange object ShardedDaemonProcessSettings { diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala index 4b91274c6b..1864c0ea0e 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingConsumerController.scala @@ -6,6 +6,8 @@ package akka.cluster.sharding.typed.delivery import java.util.function.{ Function => JFunction } +import com.typesafe.config.Config + import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior @@ -13,7 +15,6 @@ import akka.actor.typed.delivery.ConsumerController import akka.actor.typed.scaladsl.Behaviors import akka.annotation.ApiMayChange import akka.cluster.sharding.typed.delivery.internal.ShardingConsumerControllerImpl -import com.typesafe.config.Config /** * `ShardingConsumerController` is used together with [[ShardingProducerController]]. See the description diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala index e7716e75b4..a00e16fa58 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/delivery/ShardingProducerController.scala @@ -10,6 +10,8 @@ import scala.compat.java8.OptionConverters._ import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag +import com.typesafe.config.Config + import akka.Done import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem @@ -22,7 +24,6 @@ import akka.annotation.ApiMayChange import akka.cluster.sharding.typed.ShardingEnvelope import akka.cluster.sharding.typed.delivery.internal.ShardingProducerControllerImpl import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config /** * Reliable delivery between a producer actor sending messages to sharded consumer diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala index b9104f31ec..ff7a5f5cdd 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ClusterShardingImpl.scala @@ -11,18 +11,16 @@ import java.util.concurrent.CompletionStage import java.util.concurrent.ConcurrentHashMap import scala.compat.java8.FutureConverters._ - -import akka.util.JavaDurationConverters._ import scala.concurrent.Future import akka.actor.ActorRefProvider import akka.actor.ExtendedActorSystem import akka.actor.InternalActorRef -import akka.actor.typed.TypedActorContext import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Props +import akka.actor.typed.TypedActorContext import akka.actor.typed.internal.InternalRecipientRef import akka.actor.typed.internal.PoisonPill import akka.actor.typed.internal.PoisonPillInterceptor @@ -43,6 +41,7 @@ import akka.japi.function.{ Function => JFunction } import akka.pattern.AskTimeoutException import akka.pattern.PromiseActorRef import akka.util.ByteString +import akka.util.JavaDurationConverters._ import akka.util.Timeout /** diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala index e66b8361de..ffa4efc090 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala @@ -4,11 +4,12 @@ package akka.cluster.sharding.typed.internal -import akka.annotation.InternalApi -import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid } +import scala.collection.{ immutable => im } + import com.typesafe.config.Config -import scala.collection.{ immutable => im } +import akka.annotation.InternalApi +import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid } /** * INTERNAL API diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala index 6eff811961..01233edf86 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala @@ -6,6 +6,10 @@ package akka.cluster.sharding.typed.internal import java.util.Optional +import scala.compat.java8.OptionConverters._ +import scala.concurrent.duration.Duration +import scala.reflect.ClassTag + import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior @@ -15,11 +19,11 @@ import akka.annotation.InternalApi import akka.cluster.sharding.ShardRegion.EntityId import akka.cluster.sharding.typed.ClusterShardingSettings import akka.cluster.sharding.typed.ClusterShardingSettings.StateStoreModeDData +import akka.cluster.sharding.typed.ShardedDaemonProcessSettings import akka.cluster.sharding.typed.ShardingEnvelope import akka.cluster.sharding.typed.ShardingMessageExtractor -import akka.cluster.sharding.typed.scaladsl import akka.cluster.sharding.typed.javadsl -import akka.cluster.sharding.typed.ShardedDaemonProcessSettings +import akka.cluster.sharding.typed.scaladsl import akka.cluster.sharding.typed.scaladsl.ClusterSharding import akka.cluster.sharding.typed.scaladsl.Entity import akka.cluster.sharding.typed.scaladsl.EntityTypeKey @@ -28,10 +32,6 @@ import akka.cluster.typed.Cluster import akka.japi.function import akka.util.PrettyDuration -import scala.compat.java8.OptionConverters._ -import scala.concurrent.duration.Duration -import scala.reflect.ClassTag - /** * INTERNAL API */ diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala index 4cf8c2147d..1f08f0c1c1 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardingState.scala @@ -5,10 +5,10 @@ package akka.cluster.sharding.typed.internal import akka.actor.typed.Behavior import akka.actor.typed.scaladsl.Behaviors -import akka.cluster.sharding.{ ClusterSharding, ShardRegion } -import akka.cluster.sharding.ShardRegion.CurrentShardRegionState import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi +import akka.cluster.sharding.{ ClusterSharding, ShardRegion } +import akka.cluster.sharding.ShardRegion.CurrentShardRegionState import akka.cluster.sharding.typed.{ ClusterShardingQuery, GetShardRegionState } /** diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala index 96a4f54236..6ca84200e5 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ClusterSharding.scala @@ -9,18 +9,19 @@ import java.time.Duration import java.util.Optional import java.util.concurrent.CompletionStage +import com.github.ghik.silencer.silent + import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior -import akka.actor.typed.RecipientRef import akka.actor.typed.Props +import akka.actor.typed.RecipientRef import akka.actor.typed.internal.InternalRecipientRef import akka.annotation.DoNotInherit import akka.annotation.InternalApi import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy import akka.cluster.sharding.typed.internal.EntityTypeKeyImpl import akka.japi.function.{ Function => JFunction } -import com.github.ghik.silencer.silent @FunctionalInterface trait EntityFactory[M] { 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 a40014dc34..02bf7778a4 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 @@ -8,23 +8,23 @@ package scaladsl import scala.concurrent.Future import scala.reflect.ClassTag -import akka.util.Timeout import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Extension import akka.actor.typed.ExtensionId import akka.actor.typed.ExtensionSetup -import akka.actor.typed.RecipientRef import akka.actor.typed.Props +import akka.actor.typed.RecipientRef import akka.actor.typed.internal.InternalRecipientRef import akka.annotation.DoNotInherit import akka.annotation.InternalApi import akka.cluster.ClusterSettings.DataCenter import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy +import akka.cluster.sharding.ShardRegion.{ StartEntity => ClassicStartEntity } import akka.cluster.sharding.typed.internal.ClusterShardingImpl import akka.cluster.sharding.typed.internal.EntityTypeKeyImpl -import akka.cluster.sharding.ShardRegion.{ StartEntity => ClassicStartEntity } +import akka.util.Timeout object ClusterSharding extends ExtensionId[ClusterSharding] { diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala index 276f7baf38..9e655f7c1b 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala @@ -4,6 +4,8 @@ package akka.cluster.sharding.typed.scaladsl +import scala.reflect.ClassTag + import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Extension @@ -15,8 +17,6 @@ import akka.cluster.sharding.typed.ShardedDaemonProcessSettings import akka.cluster.sharding.typed.internal.ShardedDaemonProcessImpl import akka.cluster.sharding.typed.javadsl -import scala.reflect.ClassTag - object ShardedDaemonProcess extends ExtensionId[ShardedDaemonProcess] { override def createExtension(system: ActorSystem[_]): ShardedDaemonProcess = new ShardedDaemonProcessImpl(system) } diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala index cd0f344888..5e52393bd3 100644 --- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/MultiDcClusterShardingSpec.scala @@ -5,18 +5,20 @@ package akka.cluster.sharding.typed import scala.concurrent.duration._ -import akka.actor.typed.ActorRef -import akka.cluster.sharding.typed.scaladsl.EntityTypeKey -import akka.cluster.sharding.typed.scaladsl.ClusterSharding -import akka.cluster.sharding.typed.scaladsl.Entity -import akka.cluster.typed.{ MultiDcPinger, MultiNodeTypedClusterSpec } -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.cluster.MultiNodeClusterSpec -import akka.util.Timeout + import com.typesafe.config.ConfigFactory import org.scalatest.concurrent.ScalaFutures +import akka.actor.testkit.typed.scaladsl.TestProbe +import akka.actor.typed.ActorRef +import akka.cluster.MultiNodeClusterSpec +import akka.cluster.sharding.typed.scaladsl.ClusterSharding +import akka.cluster.sharding.typed.scaladsl.Entity +import akka.cluster.sharding.typed.scaladsl.EntityTypeKey +import akka.cluster.typed.{ MultiDcPinger, MultiNodeTypedClusterSpec } +import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } +import akka.util.Timeout + object MultiDcClusterShardingSpecConfig extends MultiNodeConfig { val first = role("first") val second = role("second") diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala index c8e5ca0da3..5f1181b509 100644 --- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala +++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/ShardedDaemonProcessSpec.scala @@ -4,6 +4,11 @@ package akka.cluster.sharding.typed +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.ScalaFutures + import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.Behavior import akka.actor.typed.receptionist.Receptionist @@ -16,10 +21,6 @@ import akka.cluster.typed.MultiNodeTypedClusterSpec import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.serialization.jackson.CborSerializable -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.ScalaFutures - -import scala.concurrent.duration._ object ShardedDaemonProcessSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala index 7346a64c9a..9995042c79 100644 --- a/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala +++ b/akka-cluster-sharding-typed/src/multi-jvm/scala/akka/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala @@ -9,6 +9,8 @@ import java.util.concurrent.TimeUnit.NANOSECONDS import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.ActorIdentity import akka.actor.Identify import akka.actor.testkit.typed.scaladsl.TestProbe @@ -35,7 +37,6 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.PerfFlamesSupport import akka.serialization.jackson.CborSerializable -import com.typesafe.config.ConfigFactory object DeliveryThroughputSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala index e530846796..4cde31a807 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala @@ -7,14 +7,15 @@ package akka.cluster.sharding.typed import scala.collection.{ immutable => im } import scala.concurrent.duration._ +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.CoordinatedShutdown import akka.actor.testkit.typed.scaladsl.{ ActorTestKit, LogCapturing, ScalaTestWithActorTestKit } import akka.actor.typed.ActorSystem import akka.cluster.{ Cluster => ClassicCluster } import akka.testkit.LongRunningTest -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike object JoinConfigCompatCheckerClusterShardingSpec { @@ -45,8 +46,8 @@ class JoinConfigCompatCheckerClusterShardingSpec with Matchers with LogCapturing { - import JoinConfigCompatCheckerClusterShardingSpec._ import CoordinatedShutdown.IncompatibleConfigurationDetectedReason + import JoinConfigCompatCheckerClusterShardingSpec._ private val clusterWaitDuration = 5.seconds diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala index e1d3d59c6a..08dff6e091 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/ShardingSerializerSpec.scala @@ -4,12 +4,13 @@ package akka.cluster.sharding.typed +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.internal.adapter.ActorSystemAdapter import akka.cluster.sharding.typed.internal.ShardingSerializer import akka.serialization.SerializationExtension -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike class ShardingSerializerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala index ef9497d483..73266a6104 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/DurableShardingSpec.scala @@ -6,6 +6,10 @@ package akka.cluster.sharding.typed.delivery import java.util.UUID +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit @@ -26,9 +30,6 @@ import akka.cluster.typed.Join import akka.persistence.journal.inmem.InmemJournal import akka.persistence.typed.PersistenceId import akka.persistence.typed.delivery.EventSourcedProducerQueue -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object DurableShardingSpec { def conf: Config = diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala index 554707f1bc..175e2cae6b 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala @@ -8,6 +8,9 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit @@ -20,14 +23,12 @@ import akka.actor.typed.delivery.TestConsumer import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.LoggerOps -import akka.cluster.typed.Cluster import akka.cluster.sharding.typed.ShardingEnvelope import akka.cluster.sharding.typed.scaladsl.ClusterSharding import akka.cluster.sharding.typed.scaladsl.Entity import akka.cluster.sharding.typed.scaladsl.EntityTypeKey +import akka.cluster.typed.Cluster import akka.cluster.typed.Join -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object ReliableDeliveryShardingSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala index 06ceb54bf2..b9daada054 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala @@ -13,28 +13,29 @@ import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorRef import akka.actor.typed.Behavior import akka.actor.typed.PostStop import akka.actor.typed.internal.PoisonPill import akka.actor.typed.scaladsl.Behaviors +import akka.cluster.sharding.{ ClusterSharding => ClassicClusterSharding } import akka.cluster.sharding.ShardRegion.CurrentShardRegionState import akka.cluster.sharding.ShardRegion.GetShardRegionState import akka.cluster.sharding.typed.scaladsl.ClusterSharding.Passivate import akka.cluster.sharding.typed.scaladsl.ClusterSharding.ShardCommand -import akka.cluster.sharding.{ ClusterSharding => ClassicClusterSharding } import akka.cluster.typed.Cluster import akka.cluster.typed.Join import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted import akka.persistence.typed.scaladsl.Effect import akka.persistence.typed.scaladsl.EventSourcedBehavior -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object ClusterShardingPersistenceSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala index fa2d001833..9417b5b286 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala @@ -8,6 +8,9 @@ import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.ActorTestKit import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit @@ -27,8 +30,6 @@ import akka.pattern.AskTimeoutException import akka.serialization.jackson.CborSerializable import akka.util.Timeout import akka.util.ccompat._ -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike @ccompatUsedUntil213 object ClusterShardingSpec { diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala index 48d575f7dc..558a3413c3 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala @@ -4,14 +4,15 @@ package akka.cluster.sharding.typed.scaladsl -import akka.actor.testkit.typed.scaladsl.LogCapturing +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorRef import akka.cluster.sharding.ShardRegion.{ CurrentShardRegionState, ShardState } -import akka.cluster.sharding.typed.scaladsl.ClusterShardingSpec._ import akka.cluster.sharding.typed.{ GetShardRegionState, ShardingMessageExtractor } +import akka.cluster.sharding.typed.scaladsl.ClusterShardingSpec._ import akka.cluster.typed.{ Cluster, Join } -import org.scalatest.wordspec.AnyWordSpecLike class ClusterShardingStateSpec extends ScalaTestWithActorTestKit(ClusterShardingSpec.config) diff --git a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala index bb1830521a..519c0a2953 100644 --- a/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala +++ b/akka-cluster-sharding-typed/src/test/scala/akka/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala @@ -4,6 +4,11 @@ package akka.cluster.sharding.typed.scaladsl +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.ActorRef @@ -14,10 +19,6 @@ import akka.cluster.sharding.typed.ClusterShardingSettings import akka.cluster.sharding.typed.ShardedDaemonProcessSettings import akka.cluster.typed.Cluster import akka.cluster.typed.Join -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.duration._ object ShardedDaemonProcessSpec { // single node cluster config diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala index abf39643c3..be2d76e064 100755 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterSharding.scala @@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap import scala.collection.immutable import scala.concurrent.Await import scala.util.control.NonFatal -import akka.util.ccompat.JavaConverters._ + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.ActorSystem @@ -36,6 +36,7 @@ import akka.event.Logging import akka.pattern.BackoffOpts import akka.pattern.ask import akka.util.ByteString +import akka.util.ccompat.JavaConverters._ /** * This extension provides sharding functionality of actors in a cluster. diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala index e5c199888d..0b5217cad7 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala @@ -4,8 +4,10 @@ package akka.cluster.sharding -import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration._ +import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config import akka.actor.ActorSystem import akka.actor.NoSerializationVerificationNeeded @@ -14,7 +16,6 @@ import akka.cluster.Cluster import akka.cluster.singleton.ClusterSingletonManagerSettings import akka.coordination.lease.LeaseUsageSettings import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config object ClusterShardingSettings { diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala index fdffdbdc6d..1bc3e02901 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/JoinConfigCompatCheckSharding.scala @@ -4,10 +4,12 @@ package akka.cluster.sharding +import scala.collection.{ immutable => im } + +import com.typesafe.config.Config + import akka.annotation.InternalApi import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker } -import com.typesafe.config.Config -import scala.collection.{ immutable => im } /** * INTERNAL API diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala index 83cb410570..7509e2d7df 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/Shard.scala @@ -184,9 +184,10 @@ private[akka] class Shard( import ShardRegion.Passivate import ShardRegion.ShardInitialized import ShardRegion.handOffStopperProps + import settings.tuningParameters._ + import akka.cluster.sharding.ShardCoordinator.Internal.CoordinatorMessage import akka.cluster.sharding.ShardRegion.ShardRegionCommand - import settings.tuningParameters._ var state = State.Empty var idByRef = Map.empty[ActorRef, EntityId] @@ -582,6 +583,7 @@ private[akka] trait RememberingShard { import Shard._ import ShardRegion.EntityId import ShardRegion.Msg + import akka.pattern.pipe protected val settings: ClusterShardingSettings @@ -1009,6 +1011,7 @@ final class ConstantRateEntityRecoveryStrategy( import ShardRegion.EntityId import actorSystem.dispatcher + import akka.pattern.after override def recoverEntities(entities: Set[EntityId]): Set[Future[Set[EntityId]]] = diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala index 1541ed6c5a..3d3d622ee2 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardCoordinator.scala @@ -9,28 +9,29 @@ import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Success +import com.github.ghik.silencer.silent + import akka.actor._ import akka.actor.DeadLetterSuppression import akka.annotation.InternalApi import akka.cluster.Cluster -import akka.cluster.ClusterEvent._ -import akka.cluster.ddata.LWWRegister -import akka.cluster.ddata.LWWRegisterKey -import akka.cluster.ddata.Replicator._ -import akka.dispatch.ExecutionContexts -import akka.pattern.{ pipe, AskTimeoutException } -import akka.persistence._ import akka.cluster.ClusterEvent +import akka.cluster.ClusterEvent._ import akka.cluster.ddata.GSet import akka.cluster.ddata.GSetKey import akka.cluster.ddata.Key +import akka.cluster.ddata.LWWRegister +import akka.cluster.ddata.LWWRegisterKey import akka.cluster.ddata.ReplicatedData +import akka.cluster.ddata.Replicator._ import akka.cluster.ddata.SelfUniqueAddress +import akka.dispatch.ExecutionContexts import akka.event.BusLogging import akka.event.Logging +import akka.pattern.{ pipe, AskTimeoutException } +import akka.persistence._ import akka.util.PrettyDuration._ import akka.util.Timeout -import com.github.ghik.silencer.silent /** * @see [[ClusterSharding$ ClusterSharding extension]] @@ -1105,6 +1106,7 @@ class DDataShardCoordinator( extends ShardCoordinator(settings, allocationStrategy) with Stash { import ShardCoordinator.Internal._ + import akka.cluster.ddata.Replicator.Update private val stateReadConsistency = settings.tuningParameters.coordinatorStateReadMajorityPlus match { diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala index dac4acc2d3..54cf382c8e 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala @@ -6,25 +6,25 @@ package akka.cluster.sharding import java.net.URLEncoder -import akka.Done -import akka.actor._ -import akka.annotation.InternalApi -import akka.cluster.ClusterEvent._ -import akka.cluster.ClusterSettings.DataCenter -import akka.cluster.sharding.Shard.ShardStats -import akka.cluster.{ Cluster, ClusterSettings, Member, MemberStatus } -import akka.event.Logging -import akka.pattern.{ ask, pipe } -import akka.util.{ MessageBufferMap, PrettyDuration, Timeout } - import scala.annotation.tailrec import scala.collection.immutable -import scala.concurrent.duration._ import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration._ import scala.reflect.ClassTag import scala.runtime.AbstractFunction1 import scala.util.{ Failure, Success } +import akka.Done +import akka.actor._ +import akka.annotation.InternalApi +import akka.cluster.{ Cluster, ClusterSettings, Member, MemberStatus } +import akka.cluster.ClusterEvent._ +import akka.cluster.ClusterSettings.DataCenter +import akka.cluster.sharding.Shard.ShardStats +import akka.event.Logging +import akka.pattern.{ ask, pipe } +import akka.util.{ MessageBufferMap, PrettyDuration, Timeout } + /** * @see [[ClusterSharding$ ClusterSharding extension]] */ diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala index b4caafd471..9fb95e3096 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocation.scala @@ -5,16 +5,15 @@ package akka.cluster.sharding.external import java.util.concurrent.ConcurrentHashMap +import java.util.function.{ Function => JFunction } +import akka.actor.ClassicActorSystemProvider import akka.actor.ExtendedActorSystem import akka.actor.Extension import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider -import akka.cluster.sharding.external.internal.ExternalShardAllocationClientImpl -import java.util.function.{ Function => JFunction } - -import akka.actor.ClassicActorSystemProvider import akka.annotation.ApiMayChange +import akka.cluster.sharding.external.internal.ExternalShardAllocationClientImpl /** * API May Change diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala index 893b4d5660..7129de9a88 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategy.scala @@ -4,6 +4,10 @@ package akka.cluster.sharding.external +import scala.collection.immutable +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorRef @@ -26,10 +30,6 @@ import akka.event.Logging import akka.pattern.AskTimeoutException import akka.util.Timeout -import scala.collection.immutable -import scala.concurrent.Future -import scala.concurrent.duration._ - object ExternalShardAllocationStrategy { type ShardRegion = ActorRef @@ -91,9 +91,10 @@ class ExternalShardAllocationStrategy(systemProvider: ClassicActorSystemProvider private val system = systemProvider.classicSystem import ExternalShardAllocationStrategy._ - import akka.pattern.ask import system.dispatcher + import akka.pattern.ask + private val log = Logging(system, classOf[ExternalShardAllocationStrategy]) private var shardState: ActorRef = _ diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala index f58d056b5e..5af5f9f28c 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala @@ -6,6 +6,9 @@ package akka.cluster.sharding.external.internal import java.util.concurrent.CompletionStage +import scala.compat.java8.FutureConverters._ +import scala.concurrent.Future + import akka.Done import akka.actor.ActorRef import akka.actor.ActorSystem @@ -29,15 +32,12 @@ import akka.cluster.sharding.external.ClientTimeoutException import akka.cluster.sharding.external.ExternalShardAllocationStrategy import akka.cluster.sharding.external.ExternalShardAllocationStrategy.ShardLocation import akka.cluster.sharding.external.ShardLocations -import akka.event.Logging -import akka.util.Timeout -import akka.util.PrettyDuration._ -import akka.pattern.ask - -import scala.concurrent.Future -import scala.compat.java8.FutureConverters._ -import akka.util.JavaDurationConverters._ import akka.dispatch.MessageDispatcher +import akka.event.Logging +import akka.pattern.ask +import akka.util.JavaDurationConverters._ +import akka.util.PrettyDuration._ +import akka.util.Timeout /** * INTERNAL API diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala index 8f096f6a73..aa9e21af03 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala @@ -4,14 +4,14 @@ package akka.cluster.sharding.external.scaladsl +import scala.concurrent.Future + import akka.Done import akka.actor.Address import akka.annotation.ApiMayChange import akka.cluster.sharding.ShardRegion.ShardId import akka.cluster.sharding.external.ShardLocations -import scala.concurrent.Future - /** * API May Change * diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala index e85d6116a0..90387d8ad2 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala @@ -5,30 +5,28 @@ package akka.cluster.sharding.protobuf import java.io.{ ByteArrayInputStream, ByteArrayOutputStream } +import java.io.NotSerializableException import java.util.zip.GZIPInputStream import java.util.zip.GZIPOutputStream import scala.annotation.tailrec +import scala.collection.immutable import scala.concurrent.duration._ -import akka.util.ccompat.JavaConverters._ -import scala.collection.immutable - import akka.actor.ActorRef +import akka.actor.Address import akka.actor.ExtendedActorSystem import akka.cluster.sharding.Shard import akka.cluster.sharding.ShardCoordinator +import akka.cluster.sharding.ShardRegion._ import akka.cluster.sharding.protobuf.msg.{ ClusterShardingMessages => sm } +import akka.cluster.sharding.protobuf.msg.ClusterShardingMessages +import akka.protobufv3.internal.MessageLite import akka.serialization.BaseSerializer import akka.serialization.Serialization import akka.serialization.SerializerWithStringManifest -import akka.protobufv3.internal.MessageLite import akka.util.ccompat._ -import java.io.NotSerializableException - -import akka.actor.Address -import akka.cluster.sharding.ShardRegion._ -import akka.cluster.sharding.protobuf.msg.ClusterShardingMessages +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API: Protobuf serializer of ClusterSharding messages. @@ -37,10 +35,10 @@ import akka.cluster.sharding.protobuf.msg.ClusterShardingMessages private[akka] class ClusterShardingMessageSerializer(val system: ExtendedActorSystem) extends SerializerWithStringManifest with BaseSerializer { - import ShardCoordinator.Internal._ import Shard.{ CurrentShardState, GetCurrentShardState } import Shard.{ GetShardStats, ShardStats } import Shard.{ State => EntityState, EntityStarted, EntityStopped } + import ShardCoordinator.Internal._ private final val BufferSize = 1024 * 4 diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala index e95db6040a..2b521bec1b 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala @@ -4,6 +4,10 @@ package akka.cluster.sharding +import scala.collection.immutable +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.actor._ import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy import akka.pattern.ask @@ -11,10 +15,6 @@ import akka.remote.testconductor.RoleName import akka.testkit._ import akka.util.Timeout -import scala.collection.immutable -import scala.concurrent.Future -import scala.concurrent.duration._ - object ClusterShardingCustomShardAllocationSpec { case object AllocateReq diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala index b3819a827f..bfcf7c0906 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingFailureSpec.scala @@ -4,6 +4,8 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + import akka.actor._ import akka.cluster.sharding.ShardRegion.Passivate import akka.remote.testconductor.RoleName @@ -12,8 +14,6 @@ import akka.serialization.jackson.CborSerializable import akka.testkit._ import akka.util.ccompat._ -import scala.concurrent.duration._ - @ccompatUsedUntil213 object ClusterShardingFailureSpec { case class Get(id: String) extends CborSerializable diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala index 5701d8ee51..f0b6189c86 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStateSpec.scala @@ -6,11 +6,12 @@ package akka.cluster.sharding import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.Cluster import akka.cluster.ClusterEvent.CurrentClusterState import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory object ClusterShardingGetStateSpec { import MultiNodeClusterShardingSpec.PingPongActor diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala index 223453f3bd..8d2d1fbfa2 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGetStatsSpec.scala @@ -6,10 +6,11 @@ package akka.cluster.sharding import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.{ Cluster, MemberStatus } import akka.testkit.{ TestDuration, TestProbe } -import com.typesafe.config.ConfigFactory object ClusterShardingGetStatsSpec { import MultiNodeClusterShardingSpec.PingPongActor diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala index 988b114882..faf676ef9d 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala @@ -4,13 +4,13 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + import akka.actor._ import akka.cluster.sharding.ShardRegion.GracefulShutdown import akka.remote.testconductor.RoleName import akka.testkit._ -import scala.concurrent.duration._ - abstract class ClusterShardingGracefulShutdownSpecConfig(mode: String) extends MultiNodeClusterShardingConfig( mode, diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala index 77b578c022..a96cd4121e 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingMinMembersSpec.scala @@ -4,14 +4,14 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + import akka.actor._ import akka.cluster.MemberStatus import akka.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats } import akka.testkit._ import akka.util.ccompat._ -import scala.concurrent.duration._ - @ccompatUsedUntil213 abstract class ClusterShardingMinMembersSpecConfig(mode: String) extends MultiNodeClusterShardingConfig( diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala index 762ee1f72b..457b9dc11f 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingQueriesSpec.scala @@ -6,11 +6,12 @@ package akka.cluster.sharding import scala.concurrent.duration._ -import akka.actor.Props -import akka.testkit.TestProbe import com.typesafe.config.ConfigFactory import org.scalatest.concurrent.ScalaFutures +import akka.actor.Props +import akka.testkit.TestProbe + object ClusterShardingQueriesSpec { import MultiNodeClusterShardingSpec.PingPongActor diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala index 779b93366d..f784a63f52 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala @@ -4,14 +4,14 @@ package akka.cluster.sharding +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.Done import akka.actor._ import akka.cluster.MemberStatus import akka.testkit.{ ImplicitSender, TestProbe } -import scala.concurrent.Future -import scala.concurrent.duration._ - /** * Test for issue #28416 */ diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala index cfa8ac381f..5843afd60e 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala @@ -4,13 +4,14 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.{ Cluster, MemberStatus } import akka.persistence.journal.leveldb.SharedLeveldbJournal import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object ClusterShardingRememberEntitiesNewExtractorSpec { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala index 28e5e2255d..fd0f5c0f43 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala @@ -6,13 +6,14 @@ package akka.cluster.sharding import java.util.concurrent.TimeUnit.NANOSECONDS +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.MemberStatus import akka.testkit._ import akka.util.ccompat._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ @ccompatUsedUntil213 object ClusterShardingRememberEntitiesPerfSpec { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala index 696a9b6185..3597ed139d 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala @@ -6,11 +6,12 @@ package akka.cluster.sharding import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.{ Cluster, MemberStatus } import akka.testkit._ import akka.util.ccompat._ -import com.typesafe.config.ConfigFactory @ccompatUsedUntil213 object ClusterShardingRememberEntitiesSpec { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala index 1b2ff0149a..3dff45b678 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingRolePartitioningSpec.scala @@ -4,12 +4,13 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor._ import akka.cluster.sharding.ShardRegion.{ ClusterShardingStats, GetClusterShardingStats } import akka.testkit._ -import com.typesafe.config.{ Config, ConfigFactory } - -import scala.concurrent.duration._ // Tests the case where cluster roles are used with cluster.min-nr-of-members, no per role min set // with 5 node cluster, 2 roles: 3 nodes role R1, 2 nodes role R2 diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala index 8c7deaa751..b290095348 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala @@ -4,13 +4,13 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + import akka.actor._ import akka.remote.testconductor.RoleName import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import scala.concurrent.duration._ - /** * one-to-one mapping between shards and entities is not efficient but some use that anyway */ diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala index 679a95b97a..bcca97933d 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingSpec.scala @@ -4,6 +4,11 @@ package akka.cluster.sharding +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.Cluster import akka.cluster.ddata.{ Replicator, ReplicatorSettings } @@ -14,12 +19,8 @@ import akka.pattern.BackoffOpts import akka.persistence.{ Persistence, PersistentActor } import akka.persistence.journal.leveldb.{ SharedLeveldbJournal, SharedLeveldbStore } import akka.remote.testconductor.RoleName -import akka.testkit.TestEvent.Mute import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ -import scala.language.postfixOps +import akka.testkit.TestEvent.Mute object ClusterShardingSpec { //#counter-actor diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala index 0a2fca01b2..dbf977d8cd 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ExternalShardAllocationSpec.scala @@ -4,15 +4,16 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + +import org.scalatest.concurrent.ScalaFutures + import akka.actor.{ Actor, ActorLogging, Address, Props } import akka.cluster.Cluster import akka.cluster.sharding.ExternalShardAllocationSpec.GiveMeYourHome.{ Get, Home } import akka.cluster.sharding.external.{ ExternalShardAllocation, ExternalShardAllocationStrategy } import akka.serialization.jackson.CborSerializable import akka.testkit.{ ImplicitSender, TestProbe } -import org.scalatest.concurrent.ScalaFutures - -import scala.concurrent.duration._ object ExternalShardAllocationSpecConfig extends MultiNodeClusterShardingConfig(additionalConfig = """ @@ -68,8 +69,8 @@ abstract class ExternalShardAllocationSpec with ImplicitSender with ScalaFutures { - import ExternalShardAllocationSpec.GiveMeYourHome._ import ExternalShardAllocationSpec._ + import ExternalShardAllocationSpec.GiveMeYourHome._ import ExternalShardAllocationSpecConfig._ override implicit val patienceConfig: PatienceConfig = PatienceConfig(5.second) diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala index bcc1df84bb..82e78df0a6 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiDcClusterShardingSpec.scala @@ -4,16 +4,17 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorRef, Address, Props } -import akka.cluster.sharding.ShardRegion.{ CurrentRegions, GetCurrentRegions } import akka.cluster.{ Cluster, MemberStatus } +import akka.cluster.sharding.ShardRegion.{ CurrentRegions, GetCurrentRegions } import akka.remote.testconductor.RoleName import akka.serialization.jackson.CborSerializable import akka.testkit._ import akka.util.ccompat._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ @ccompatUsedUntil213 object MultiDcClusterShardingSpec { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala index f074f56467..b4c44db637 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingConfig.scala @@ -6,10 +6,11 @@ package akka.cluster.sharding import java.lang.reflect.Modifier +import com.typesafe.config.{ Config, ConfigFactory } + import akka.cluster.MultiNodeClusterSpec import akka.persistence.journal.leveldb.SharedLeveldbJournal import akka.remote.testkit.MultiNodeConfig -import com.typesafe.config.{ Config, ConfigFactory } object MultiNodeClusterShardingConfig { diff --git a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala index a3e6fe2f1a..e51c447784 100644 --- a/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala +++ b/akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/MultiNodeClusterShardingSpec.scala @@ -6,6 +6,10 @@ package akka.cluster.sharding import java.io.File +import scala.concurrent.duration._ + +import org.apache.commons.io.FileUtils + import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, ActorSystem, Identify, PoisonPill, Props } import akka.cluster.MultiNodeClusterSpec import akka.cluster.sharding.ShardCoordinator.ShardAllocationStrategy @@ -16,9 +20,6 @@ import akka.remote.testkit.MultiNodeSpec import akka.serialization.jackson.CborSerializable import akka.testkit.{ TestActors, TestProbe } import akka.util.ccompat._ -import org.apache.commons.io.FileUtils - -import scala.concurrent.duration._ @ccompatUsedUntil213 object MultiNodeClusterShardingSpec { diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala index e79f4ba394..306953377b 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingInternalsSpec.scala @@ -4,6 +4,8 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + import akka.actor.{ Actor, ActorRef, ExtendedActorSystem, NoSerializationVerificationNeeded, PoisonPill, Props } import akka.cluster.ClusterSettings.DataCenter import akka.cluster.sharding.ShardCoordinator.Internal.ShardStopped @@ -11,8 +13,6 @@ import akka.cluster.sharding.ShardCoordinator.LeastShardAllocationStrategy import akka.cluster.sharding.ShardRegion.{ ExtractEntityId, ExtractShardId, HandOffStopper, Msg } import akka.testkit.{ AkkaSpec, TestProbe } -import scala.concurrent.duration._ - object ClusterShardingInternalsSpec { case class HandOffStopMessage() extends NoSerializationVerificationNeeded class EmptyHandlerActor extends Actor { diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala index f2f3a1a30d..477febf80b 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ClusterShardingLeaseSpec.scala @@ -3,17 +3,18 @@ */ package akka.cluster.sharding -import akka.actor.Props -import akka.cluster.{ Cluster, MemberStatus, TestLease, TestLeaseExt } -import akka.testkit.TestActors.EchoActor -import akka.testkit.{ AkkaSpec, ImplicitSender } -import com.typesafe.config.{ Config, ConfigFactory } - import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Success import scala.util.control.NoStackTrace +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor.Props +import akka.cluster.{ Cluster, MemberStatus, TestLease, TestLeaseExt } +import akka.testkit.{ AkkaSpec, ImplicitSender } +import akka.testkit.TestActors.EchoActor + object ClusterShardingLeaseSpec { val config = ConfigFactory.parseString(""" akka.loglevel = DEBUG diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala index bc4987576b..a027a77633 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ConstantRateEntityRecoveryStrategySpec.scala @@ -4,12 +4,12 @@ package akka.cluster.sharding -import akka.cluster.sharding.ShardRegion.EntityId -import akka.testkit.{ AkkaSpec, TimingTest } - import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ +import akka.cluster.sharding.ShardRegion.EntityId +import akka.testkit.{ AkkaSpec, TimingTest } + class ConstantRateEntityRecoveryStrategySpec extends AkkaSpec { val strategy = EntityRecoveryStrategy.constantStrategy(system, 1.second, 2) diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala index 3d52cd236a..b057bf500d 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/CoordinatedShutdownShardingSpec.scala @@ -6,6 +6,7 @@ package akka.cluster.sharding import scala.concurrent.Future import scala.concurrent.duration._ + import akka.Done import akka.actor.ActorSystem import akka.actor.CoordinatedShutdown diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/InactiveEntityPassivationSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/InactiveEntityPassivationSpec.scala index 05deedf91c..715bcc0040 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/InactiveEntityPassivationSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/InactiveEntityPassivationSpec.scala @@ -6,12 +6,13 @@ package akka.cluster.sharding import scala.concurrent.duration._ +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorRef, Props } import akka.cluster.Cluster import akka.cluster.sharding.InactiveEntityPassivationSpec.Entity.GotIt import akka.testkit.{ AkkaSpec, TestProbe } -import com.typesafe.config.ConfigFactory -import com.typesafe.config.Config object InactiveEntityPassivationSpec { diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala index 6dc62ee66d..675b5df358 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala @@ -4,12 +4,14 @@ package akka.cluster.sharding +import scala.collection.{ immutable => im } +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor.ActorSystem import akka.cluster.{ Cluster, ClusterReadView } import akka.testkit.{ AkkaSpec, LongRunningTest } -import com.typesafe.config.{ Config, ConfigFactory } -import scala.concurrent.duration._ -import scala.collection.{ immutable => im } class JoinConfigCompatCheckShardingSpec extends AkkaSpec() { diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardSpec.scala index 592c017e90..ffc8c00c1a 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/PersistentShardSpec.scala @@ -4,13 +4,14 @@ package akka.cluster.sharding +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.{ Actor, PoisonPill, Props } import akka.cluster.sharding.PersistentShardSpec.EntityActor import akka.cluster.sharding.Shard.{ GetShardStats, ShardStats } import akka.cluster.sharding.ShardRegion.{ StartEntity, StartEntityAck } import akka.testkit.{ AkkaSpec, ImplicitSender } -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object PersistentShardSpec { class EntityActor extends Actor { diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala index e7397bdcd6..496fa705ee 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ProxyShardingSpec.scala @@ -6,10 +6,11 @@ package akka.cluster.sharding import scala.concurrent.Await import scala.concurrent.duration._ +import scala.concurrent.duration.FiniteDuration + import akka.actor.ActorRef import akka.testkit.AkkaSpec import akka.testkit.TestActors -import scala.concurrent.duration.FiniteDuration object ProxyShardingSpec { val config = """ diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala index 375a8f27f2..4980fa68ae 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala @@ -10,6 +10,8 @@ import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Success +import org.apache.commons.io.FileUtils + import akka.actor.ActorRef import akka.actor.Props import akka.cluster.Cluster @@ -23,7 +25,6 @@ import akka.persistence.SnapshotSelectionCriteria import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.TestActors.EchoActor -import org.apache.commons.io.FileUtils object RemoveInternalClusterShardingDataSpec { val config = """ diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala index 89640e3bc5..64010bce38 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardRegionSpec.scala @@ -6,14 +6,15 @@ package akka.cluster.sharding import java.io.File -import akka.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, PoisonPill, Props } -import akka.cluster.ClusterEvent.CurrentClusterState -import akka.cluster.{ Cluster, MemberStatus } -import akka.testkit.TestEvent.Mute -import akka.testkit.{ AkkaSpec, DeadLettersFilter, TestProbe } import com.typesafe.config.ConfigFactory import org.apache.commons.io.FileUtils +import akka.actor.{ Actor, ActorLogging, ActorRef, ActorSystem, PoisonPill, Props } +import akka.cluster.{ Cluster, MemberStatus } +import akka.cluster.ClusterEvent.CurrentClusterState +import akka.testkit.{ AkkaSpec, DeadLettersFilter, TestProbe } +import akka.testkit.TestEvent.Mute + object ShardRegionSpec { val host = "127.0.0.1" val tempConfig = @@ -59,9 +60,10 @@ object ShardRegionSpec { } class ShardRegionSpec extends AkkaSpec(ShardRegionSpec.config) { - import ShardRegionSpec._ import scala.concurrent.duration._ + import ShardRegionSpec._ + val storageLocation = List( new File(system.settings.config.getString("akka.cluster.sharding.distributed-data.durable.lmdb.dir")).getParentFile) diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardSpec.scala index 321f8f6178..b67ba6c1cd 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/ShardSpec.scala @@ -6,17 +6,17 @@ package akka.cluster.sharding import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.Success +import scala.util.control.NoStackTrace + import akka.actor.{ Actor, ActorLogging, PoisonPill, Props } import akka.cluster.TestLeaseExt import akka.cluster.sharding.ShardRegion.ShardInitialized import akka.coordination.lease.LeaseUsageSettings import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.Success -import scala.util.control.NoStackTrace - object ShardSpec { val config = """ diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala index 7c1c8c8258..9b13e5a7a0 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/SupervisionSpec.scala @@ -4,14 +4,15 @@ package akka.cluster.sharding +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorLogging, ActorRef, PoisonPill, Props } import akka.cluster.Cluster import akka.cluster.sharding.ShardRegion.Passivate import akka.pattern.{ BackoffOpts, BackoffSupervisor } import akka.testkit.{ AkkaSpec, ImplicitSender } -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object SupervisionSpec { val config = diff --git a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala index 2384907b25..5eabc17fe4 100644 --- a/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala +++ b/akka-cluster-sharding/src/test/scala/akka/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala @@ -4,6 +4,8 @@ package akka.cluster.sharding.external +import scala.concurrent.duration._ + import akka.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocation import akka.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocationResponse import akka.cluster.sharding.external.ExternalShardAllocationStrategy.GetShardLocations @@ -11,8 +13,6 @@ import akka.testkit.AkkaSpec import akka.testkit.TestProbe import akka.util.Timeout -import scala.concurrent.duration._ - class ExternalShardAllocationStrategySpec extends AkkaSpec(""" akka.actor.provider = cluster akka.loglevel = INFO diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala b/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala index b03c699a32..8e0e62b34f 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/client/ClusterClient.scala @@ -7,7 +7,11 @@ package akka.cluster.client import java.net.URLEncoder import scala.collection.immutable +import scala.collection.immutable.{ HashMap, HashSet } import scala.concurrent.duration._ + +import com.typesafe.config.Config + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorLogging @@ -34,15 +38,12 @@ import akka.cluster.Member import akka.cluster.MemberStatus import akka.cluster.pubsub._ import akka.japi.Util.immutableSeq +import akka.remote.DeadlineFailureDetector import akka.routing.ConsistentHash import akka.routing.MurmurHash -import com.typesafe.config.Config -import akka.remote.DeadlineFailureDetector import akka.util.MessageBuffer import akka.util.ccompat._ -import scala.collection.immutable.{ HashMap, HashSet } - @ccompatUsedUntil213 @deprecated( "Use Akka gRPC instead, see https://doc.akka.io/docs/akka/2.6/cluster-client.html#migration-to-akka-grpc", @@ -948,9 +949,8 @@ final class ClusterReceptionist(pubSubMediator: ActorRef, settings: ClusterRecep extends Actor with ActorLogging { - import DistributedPubSubMediator.{ Publish, Send, SendToAll } - import ClusterReceptionist.Internal._ + import DistributedPubSubMediator.{ Publish, Send, SendToAll } import settings._ val cluster = Cluster(context.system) diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala b/akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala index ce1cbcd1e1..f47f5a465d 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializer.scala @@ -4,16 +4,17 @@ package akka.cluster.client.protobuf -import akka.util.ccompat.JavaConverters._ -import akka.actor.ExtendedActorSystem -import akka.serialization.BaseSerializer -import akka.serialization.SerializerWithStringManifest -import akka.cluster.client.ClusterReceptionist -import akka.cluster.client.protobuf.msg.{ ClusterClientMessages => cm } import java.io.NotSerializableException import com.github.ghik.silencer.silent +import akka.actor.ExtendedActorSystem +import akka.cluster.client.ClusterReceptionist +import akka.cluster.client.protobuf.msg.{ ClusterClientMessages => cm } +import akka.serialization.BaseSerializer +import akka.serialization.SerializerWithStringManifest +import akka.util.ccompat.JavaConverters._ + /** * INTERNAL API: Serializer of ClusterClient messages. */ diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala index 4d46f656b5..79a5692b3a 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala @@ -4,12 +4,16 @@ package akka.cluster.pubsub +import java.net.URLDecoder +import java.net.URLEncoder +import java.util.concurrent.ThreadLocalRandom + import scala.collection.immutable import scala.collection.immutable.Set +import scala.collection.immutable.TreeMap import scala.concurrent.duration._ -import java.util.concurrent.ThreadLocalRandom -import java.net.URLEncoder -import java.net.URLDecoder + +import com.typesafe.config.Config import akka.actor._ import akka.annotation.DoNotInherit @@ -17,18 +21,15 @@ import akka.cluster.Cluster import akka.cluster.ClusterEvent._ import akka.cluster.Member import akka.cluster.MemberStatus -import akka.routing.RandomRoutingLogic -import akka.routing.RoutingLogic -import akka.routing.Routee import akka.routing.ActorRefRoutee +import akka.routing.BroadcastRoutingLogic +import akka.routing.ConsistentHashingRoutingLogic +import akka.routing.RandomRoutingLogic +import akka.routing.RoundRobinRoutingLogic +import akka.routing.Routee import akka.routing.Router import akka.routing.RouterEnvelope -import akka.routing.RoundRobinRoutingLogic -import akka.routing.ConsistentHashingRoutingLogic -import akka.routing.BroadcastRoutingLogic - -import scala.collection.immutable.TreeMap -import com.typesafe.config.Config +import akka.routing.RoutingLogic object DistributedPubSubSettings { diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala index ea0af0ba29..c5254d750c 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala @@ -4,21 +4,23 @@ package akka.cluster.pubsub.protobuf -import akka.serialization._ -import akka.actor.{ Address, ExtendedActorSystem } import java.io.{ ByteArrayInputStream, ByteArrayOutputStream } -import akka.protobufv3.internal.{ ByteString, MessageLite } -import java.util.zip.GZIPOutputStream +import java.io.NotSerializableException import java.util.zip.GZIPInputStream +import java.util.zip.GZIPOutputStream + import scala.annotation.tailrec -import akka.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages => dm } -import akka.util.ccompat.JavaConverters._ +import scala.collection.immutable.TreeMap + +import akka.actor.{ Address, ExtendedActorSystem } +import akka.actor.ActorRef import akka.cluster.pubsub.DistributedPubSubMediator._ import akka.cluster.pubsub.DistributedPubSubMediator.Internal._ -import akka.actor.ActorRef +import akka.cluster.pubsub.protobuf.msg.{ DistributedPubSubMessages => dm } +import akka.protobufv3.internal.{ ByteString, MessageLite } +import akka.serialization._ import akka.util.ccompat._ -import scala.collection.immutable.TreeMap -import java.io.NotSerializableException +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API: Protobuf serializer of DistributedPubSubMediator messages. diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala index bf29e56e01..9a25bfa461 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala @@ -10,6 +10,8 @@ import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.control.NonFatal +import com.typesafe.config.Config + import akka.AkkaException import akka.Done import akka.actor.Actor @@ -26,8 +28,8 @@ import akka.actor.Props import akka.actor.Terminated import akka.annotation.DoNotInherit import akka.annotation.InternalStableApi -import akka.cluster.ClusterEvent._ import akka.cluster._ +import akka.cluster.ClusterEvent._ import akka.coordination.lease.LeaseUsageSettings import akka.coordination.lease.scaladsl.Lease import akka.coordination.lease.scaladsl.LeaseProvider @@ -38,7 +40,6 @@ import akka.pattern.ask import akka.pattern.pipe import akka.util.JavaDurationConverters._ import akka.util.Timeout -import com.typesafe.config.Config object ClusterSingletonManagerSettings { @@ -482,8 +483,8 @@ class ClusterSingletonManager(singletonProps: Props, terminationMessage: Any, se extends Actor with FSM[ClusterSingletonManager.State, ClusterSingletonManager.Data] { - import ClusterSingletonManager.Internal.OldestChangedBuffer._ import ClusterSingletonManager.Internal._ + import ClusterSingletonManager.Internal.OldestChangedBuffer._ import settings._ val cluster = Cluster(context.system) diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala index da116f5044..6fac0342c8 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonProxy.scala @@ -4,25 +4,25 @@ package akka.cluster.singleton -import akka.actor._ -import akka.cluster.{ Cluster, Member, MemberStatus } - import scala.collection.immutable -import akka.cluster.ClusterEvent._ -import akka.cluster.ClusterEvent.MemberRemoved -import akka.cluster.ClusterEvent.MemberUp +import scala.concurrent.duration._ + +import com.typesafe.config.Config + +import akka.actor._ +import akka.actor.NoSerializationVerificationNeeded import akka.actor.RootActorPath +import akka.cluster.{ Cluster, Member, MemberStatus } +import akka.cluster.ClusterEvent._ import akka.cluster.ClusterEvent.CurrentClusterState import akka.cluster.ClusterEvent.MemberExited - -import scala.concurrent.duration._ -import com.typesafe.config.Config -import akka.actor.NoSerializationVerificationNeeded -import akka.event.Logging -import akka.util.MessageBuffer +import akka.cluster.ClusterEvent.MemberRemoved +import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterSettings import akka.cluster.ClusterSettings.DataCenter import akka.dispatch.Dispatchers +import akka.event.Logging +import akka.util.MessageBuffer object ClusterSingletonProxySettings { diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala index 65211af633..74dd045382 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala @@ -4,6 +4,8 @@ package akka.cluster.singleton.protobuf +import java.io.NotSerializableException + import akka.actor.ExtendedActorSystem import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverDone import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverInProgress @@ -11,7 +13,6 @@ import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverToMe import akka.cluster.singleton.ClusterSingletonManager.Internal.TakeOverFromMe import akka.serialization.BaseSerializer import akka.serialization.SerializerWithStringManifest -import java.io.NotSerializableException /** * INTERNAL API: Serializer of ClusterSingleton messages. diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/TestLeaseActor.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/TestLeaseActor.scala index e0eee38139..81c21791aa 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/TestLeaseActor.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/TestLeaseActor.scala @@ -8,6 +8,7 @@ import java.util.concurrent.atomic.AtomicReference import scala.concurrent.Future import scala.concurrent.duration._ + import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorRef @@ -19,9 +20,9 @@ import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider import akka.actor.Props import akka.cluster.TestLeaseActor.{ Acquire, Create, Release } -import akka.event.Logging import akka.coordination.lease.LeaseSettings import akka.coordination.lease.scaladsl.Lease +import akka.event.Logging import akka.pattern.ask import akka.testkit.JavaSerializable import akka.util.Timeout diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala index 2f01207eb5..001056b9ce 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/client/ClusterClientHandoverSpec.scala @@ -4,15 +4,16 @@ package akka.cluster.client +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.{ ActorPath, ActorRef } import akka.cluster.{ Cluster, MultiNodeClusterSpec } import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.testkit.{ ImplicitSender, TestActors } -import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ - -import com.github.ghik.silencer.silent object ClusterClientHandoverSpec extends MultiNodeConfig { val client = role("client") 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 f239d08b92..f144abdb77 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 @@ -4,10 +4,13 @@ package akka.cluster.client -import language.postfixOps +import scala.concurrent.Await import scala.concurrent.duration._ +import com.github.ghik.silencer.silent import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.{ Actor, ActorPath, @@ -21,18 +24,15 @@ import akka.actor.{ import akka.cluster.Cluster import akka.cluster.client.ClusterClientSpec.TestClientListener.LatestContactPoints import akka.cluster.client.ClusterClientSpec.TestReceptionistListener.LatestClusterClients +import akka.cluster.pubsub._ 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.cluster.pubsub._ import akka.remote.transport.ThrottlerTransportAdapter.Direction +import akka.testkit._ import akka.util.Timeout import akka.util.unused -import scala.concurrent.Await - -import com.github.ghik.silencer.silent object ClusterClientSpec extends MultiNodeConfig { val client = role("client") 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 0eb0db64d0..f13370417a 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,17 +4,18 @@ package akka.cluster.client +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, Props } import akka.cluster.Cluster import akka.cluster.pubsub.{ DistributedPubSub, DistributedPubSubMediator } import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.testkit.{ EventFilter, ImplicitSender } -import com.typesafe.config.ConfigFactory -import scala.concurrent.Await -import scala.concurrent.duration._ - -import com.github.ghik.silencer.silent object ClusterClientStopSpec extends MultiNodeConfig { val client = role("client") 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 b258fb03bc..6adf1ed39e 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 @@ -4,22 +4,24 @@ package akka.cluster.pubsub -import language.postfixOps import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor +import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.PoisonPill import akka.actor.Props import akka.cluster.Cluster +import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Delta +import akka.cluster.pubsub.DistributedPubSubMediator.Internal.Status 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 object DistributedPubSubMediatorSpec extends MultiNodeConfig { val first = role("first") @@ -46,8 +48,8 @@ object DistributedPubSubMediatorSpec extends MultiNodeConfig { } class TestChatUser(mediator: ActorRef, testActor: ActorRef) extends Actor { - import TestChatUser._ import DistributedPubSubMediator._ + import TestChatUser._ def receive = { case Whisper(path, msg) => mediator ! Send(path, msg, localAffinity = true) @@ -129,9 +131,9 @@ class DistributedPubSubMediatorSpec extends MultiNodeSpec(DistributedPubSubMediatorSpec) with STMultiNodeSpec with ImplicitSender { + import DistributedPubSubMediator._ import DistributedPubSubMediatorSpec._ import DistributedPubSubMediatorSpec.TestChatUser._ - import DistributedPubSubMediator._ override def initialParticipants = roles.size 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 aa636ae10b..1a0f7c472f 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 @@ -4,24 +4,25 @@ package akka.cluster.pubsub -import language.postfixOps +import scala.concurrent.Await import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor +import akka.actor.ActorIdentity import akka.actor.ActorRef +import akka.actor.ActorSystem +import akka.actor.Identify import akka.actor.Props +import akka.actor.RootActorPath import akka.cluster.Cluster 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.ActorSystem - -import scala.concurrent.Await -import akka.actor.Identify -import akka.actor.RootActorPath -import akka.actor.ActorIdentity object DistributedPubSubRestartSpec extends MultiNodeConfig { val first = role("first") @@ -55,8 +56,8 @@ class DistributedPubSubRestartSpec extends MultiNodeSpec(DistributedPubSubRestartSpec) with STMultiNodeSpec with ImplicitSender { - import DistributedPubSubRestartSpec._ import DistributedPubSubMediator._ + import DistributedPubSubRestartSpec._ override def initialParticipants = roles.size 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 3b4884ca91..883104cb6d 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 @@ -4,13 +4,16 @@ package akka.cluster.singleton -import language.postfixOps import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor import akka.actor.ActorRef -import akka.actor.Props +import akka.actor.ActorSelection import akka.actor.PoisonPill +import akka.actor.Props import akka.actor.RootActorPath import akka.cluster.Cluster import akka.cluster.ClusterEvent._ @@ -20,7 +23,6 @@ import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ import akka.testkit.TestEvent._ -import akka.actor.ActorSelection object ClusterSingletonManagerChaosSpec extends MultiNodeConfig { val controller = role("controller") diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala index 90f8e85f41..f0b6b51a94 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerDownedSpec.scala @@ -5,6 +5,9 @@ package akka.cluster.singleton import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.PoisonPill @@ -18,7 +21,6 @@ import akka.remote.testkit.STMultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter import akka.testkit._ import akka.util.ccompat._ -import com.typesafe.config.ConfigFactory @ccompatUsedUntil213 object ClusterSingletonManagerDownedSpec extends MultiNodeConfig { diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala index 30819d1189..c551b362ce 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala @@ -4,16 +4,17 @@ package akka.cluster.singleton +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, Address, Identify, PoisonPill, Props } +import akka.cluster._ import akka.cluster.MemberStatus.Up import akka.cluster.TestLeaseActor._ import akka.cluster.singleton.ClusterSingletonManagerLeaseSpec.ImportantSingleton.Response -import akka.cluster._ import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object ClusterSingletonManagerLeaseSpec extends MultiNodeConfig { val controller = role("controller") @@ -76,8 +77,8 @@ class ClusterSingletonManagerLeaseSpec with ImplicitSender with MultiNodeClusterSpec { - import ClusterSingletonManagerLeaseSpec.ImportantSingleton._ import ClusterSingletonManagerLeaseSpec._ + import ClusterSingletonManagerLeaseSpec.ImportantSingleton._ override def initialParticipants = roles.size diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala index aaaee797ef..54a0c512da 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala @@ -6,6 +6,8 @@ package akka.cluster.singleton import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorLogging @@ -20,7 +22,6 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ -import com.typesafe.config.ConfigFactory object ClusterSingletonManagerLeave2Spec extends MultiNodeConfig { val first = role("first") 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 a4e6f4ba42..538abee0b1 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 @@ -5,17 +5,19 @@ package akka.cluster.singleton import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props 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.remote.testkit.STMultiNodeSpec import akka.testkit._ -import akka.cluster.MemberStatus object ClusterSingletonManagerLeaveSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala index 349a12d50a..b73133e5d8 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/ClusterSingletonManagerSpec.scala @@ -4,13 +4,17 @@ package akka.cluster.singleton -import language.postfixOps import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor +import akka.actor.ActorIdentity import akka.actor.ActorLogging import akka.actor.ActorRef +import akka.actor.ActorSelection +import akka.actor.Identify import akka.actor.Props import akka.actor.RootActorPath import akka.cluster.Cluster @@ -19,12 +23,9 @@ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec +import akka.serialization.jackson.CborSerializable import akka.testkit._ import akka.testkit.TestEvent._ -import akka.actor.Identify -import akka.actor.ActorIdentity -import akka.actor.ActorSelection -import akka.serialization.jackson.CborSerializable object ClusterSingletonManagerSpec extends MultiNodeConfig { val controller = role("controller") @@ -172,8 +173,8 @@ class ClusterSingletonManagerSpec with ImplicitSender { import ClusterSingletonManagerSpec._ - import ClusterSingletonManagerSpec.PointToPointChannel._ import ClusterSingletonManagerSpec.Consumer._ + import ClusterSingletonManagerSpec.PointToPointChannel._ override def initialParticipants = roles.size 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 913ae322e9..503bc5b57c 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 @@ -5,18 +5,20 @@ package akka.cluster.singleton import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef -import akka.actor.Props import akka.actor.PoisonPill +import akka.actor.Props 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.remote.testkit.STMultiNodeSpec import akka.testkit._ -import akka.cluster.MemberStatus object ClusterSingletonManagerStartupSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala index 521841a45f..c3345a5622 100644 --- a/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala +++ b/akka-cluster-tools/src/multi-jvm/scala/akka/cluster/singleton/MultiDcSingletonManagerSpec.scala @@ -7,12 +7,13 @@ package akka.cluster.singleton import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorLogging, Address, PoisonPill, Props } import akka.cluster.Cluster -import akka.testkit.ImplicitSender -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.cluster.ClusterSettings +import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.serialization.jackson.CborSerializable +import akka.testkit.ImplicitSender object MultiDcSingletonManagerSpec extends MultiNodeConfig { val controller = role("controller") diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/TestLease.scala b/akka-cluster-tools/src/test/scala/akka/cluster/TestLease.scala index f5f07318a5..ebdfbd6930 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/TestLease.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/TestLease.scala @@ -7,15 +7,16 @@ package akka.cluster import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicReference -import akka.actor.ClassicActorSystemProvider +import scala.concurrent.{ Future, Promise } + +import com.typesafe.config.ConfigFactory + import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } +import akka.actor.ClassicActorSystemProvider import akka.coordination.lease.LeaseSettings import akka.coordination.lease.scaladsl.Lease import akka.event.Logging import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory - -import scala.concurrent.{ Future, Promise } import akka.util.ccompat.JavaConverters._ object TestLeaseExt extends ExtensionId[TestLeaseExt] with ExtensionIdProvider { diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala index 97a4195498..42a145e6e4 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.client.protobuf -import akka.actor.ExtendedActorSystem -import akka.testkit.AkkaSpec -import akka.cluster.client.ClusterReceptionist.Internal._ import com.github.ghik.silencer.silent +import akka.actor.ExtendedActorSystem +import akka.cluster.client.ClusterReceptionist.Internal._ +import akka.testkit.AkkaSpec + @silent("deprecated") class ClusterClientMessageSerializerSpec extends AkkaSpec { diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala index 37bb7835f0..e7726c3189 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala @@ -4,10 +4,11 @@ package akka.cluster.pubsub +import scala.concurrent.duration._ + import akka.actor.DeadLetter import akka.cluster.pubsub.DistributedPubSubMediator.{ Subscribe, _ } import akka.testkit._ -import scala.concurrent.duration._ object DistributedPubSubMediatorDeadLettersSpec { def config(sendToDeadLettersWhenNoSubscribers: Boolean) = diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala index 45d129a51b..d5db6004a9 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala @@ -4,12 +4,13 @@ package akka.cluster.pubsub -import akka.testkit._ -import akka.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope } -import akka.actor.ActorRef import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.ActorRef +import akka.routing.{ ConsistentHashingRoutingLogic, RouterEnvelope } +import akka.testkit._ + case class WrappedMessage(msg: String) extends RouterEnvelope { override def message = msg } diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala index f85fbcbd97..c60e47eac3 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala @@ -4,12 +4,13 @@ package akka.cluster.pubsub.protobuf +import scala.collection.immutable.TreeMap + import akka.actor.{ Address, ExtendedActorSystem } -import akka.testkit.AkkaSpec +import akka.actor.Props import akka.cluster.pubsub.DistributedPubSubMediator._ import akka.cluster.pubsub.DistributedPubSubMediator.Internal._ -import akka.actor.Props -import scala.collection.immutable.TreeMap +import akka.testkit.AkkaSpec class DistributedPubSubMessageSerializerSpec extends AkkaSpec { diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala index 1dc7ff3958..210d980e70 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeaseSpec.scala @@ -10,6 +10,8 @@ import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.Success +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorRef @@ -25,7 +27,6 @@ import akka.cluster.TestLeaseExt import akka.testkit.AkkaSpec import akka.testkit.TestException import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory class ImportantSingleton(lifeCycleProbe: ActorRef) extends Actor with ActorLogging { diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala index c250187461..d2bb0e8b03 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala @@ -6,6 +6,8 @@ package akka.cluster.singleton import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.ActorSystem @@ -17,7 +19,6 @@ import akka.cluster.MemberStatus import akka.cluster.singleton.ClusterSingletonLeavingSpeedSpec.TheSingleton import akka.testkit.AkkaSpec import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory object ClusterSingletonLeavingSpeedSpec { diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala index 980bd0811a..d682ebc3ff 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonProxySpec.scala @@ -4,15 +4,17 @@ package akka.cluster.singleton -import akka.testkit.{ TestKit, TestProbe } -import akka.actor._ -import com.typesafe.config.ConfigFactory -import akka.cluster.Cluster import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor._ +import akka.cluster.Cluster +import akka.testkit.{ TestKit, TestProbe } + class ClusterSingletonProxySpec extends AnyWordSpecLike with Matchers with BeforeAndAfterAll { import ClusterSingletonProxySpec._ diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala index 9ae476a3a3..bd22055c90 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestart2Spec.scala @@ -5,6 +5,9 @@ package akka.cluster.singleton import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorSystem import akka.actor.PoisonPill @@ -14,7 +17,6 @@ import akka.cluster.MemberStatus import akka.cluster.UniqueAddress import akka.testkit.AkkaSpec import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory object ClusterSingletonRestart2Spec { def singletonActorProps: Props = Props(new Singleton) diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala index 9484866194..34cc68bbd7 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/ClusterSingletonRestartSpec.scala @@ -5,6 +5,9 @@ package akka.cluster.singleton import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSystem import akka.actor.PoisonPill import akka.cluster.Cluster @@ -12,7 +15,6 @@ import akka.cluster.MemberStatus import akka.testkit.AkkaSpec import akka.testkit.TestActors import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory class ClusterSingletonRestartSpec extends AkkaSpec(""" diff --git a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala index 0d7f1e6991..80295c7fc3 100644 --- a/akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala +++ b/akka-cluster-tools/src/test/scala/akka/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala @@ -5,11 +5,11 @@ package akka.cluster.singleton.protobuf import akka.actor.ExtendedActorSystem -import akka.testkit.AkkaSpec import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverDone import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverInProgress import akka.cluster.singleton.ClusterSingletonManager.Internal.HandOverToMe import akka.cluster.singleton.ClusterSingletonManager.Internal.TakeOverFromMe +import akka.testkit.AkkaSpec class ClusterSingletonMessageSerializerSpec extends AkkaSpec { diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala index c9fa464205..63490c927b 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/internal/ReplicatorBehavior.scala @@ -6,17 +6,17 @@ package akka.cluster.ddata.typed.internal import scala.concurrent.duration._ -import akka.annotation.InternalApi -import akka.cluster.{ ddata => dd } -import akka.pattern.ask import akka.actor.typed.ActorRef import akka.actor.typed.Behavior +import akka.actor.typed.Terminated import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ -import akka.util.Timeout -import akka.util.JavaDurationConverters._ +import akka.annotation.InternalApi +import akka.cluster.{ ddata => dd } import akka.cluster.ddata.ReplicatedData -import akka.actor.typed.Terminated +import akka.pattern.ask +import akka.util.JavaDurationConverters._ +import akka.util.Timeout /** * INTERNAL API diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala index 7637a34c53..d60d740736 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala @@ -6,11 +6,11 @@ package akka.cluster.ddata.typed.javadsl import java.util.function.{ Function => JFunction } +import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem +import akka.actor.typed.Behavior import akka.actor.typed.Extension import akka.actor.typed.ExtensionId -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior import akka.actor.typed.ExtensionSetup import akka.actor.typed.javadsl.Behaviors import akka.annotation.DoNotInherit diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala index ef5092160a..8aeeea410d 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/Replicator.scala @@ -7,16 +7,16 @@ package akka.cluster.ddata.typed.javadsl import java.time.Duration import java.util.function.{ Function => JFunction } -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior import akka.actor.DeadLetterSuppression import akka.actor.NoSerializationVerificationNeeded +import akka.actor.typed.ActorRef +import akka.actor.typed.Behavior import akka.annotation.DoNotInherit import akka.annotation.InternalApi +import akka.cluster.{ ddata => dd } import akka.cluster.ddata.Key import akka.cluster.ddata.ReplicatedData import akka.cluster.ddata.typed.internal.ReplicatorBehavior -import akka.cluster.{ ddata => dd } import akka.util.JavaDurationConverters._ /** diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala index 077a18e922..6f8065496d 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala @@ -10,13 +10,14 @@ import java.util.function.{ Function => JFunction } import scala.util.Failure import scala.util.Success -import akka.util.JavaDurationConverters._ +import com.github.ghik.silencer.silent + import akka.actor.typed.ActorRef import akka.actor.typed.javadsl.ActorContext import akka.cluster.ddata.Key import akka.cluster.ddata.ReplicatedData +import akka.util.JavaDurationConverters._ import akka.util.Timeout -import com.github.ghik.silencer.silent /** * When interacting with the `Replicator` from an actor this class provides convenient diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala index 1c6009e6e5..47899bad65 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/ReplicatorSettings.scala @@ -4,10 +4,11 @@ package akka.cluster.ddata.typed.javadsl -import akka.cluster.{ ddata => dd } +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.actor.typed.scaladsl.adapter._ -import com.typesafe.config.Config +import akka.cluster.{ ddata => dd } object ReplicatorSettings { diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala index 7675b08d51..6571716b35 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/DistributedData.scala @@ -6,18 +6,19 @@ package akka.cluster.ddata.typed.scaladsl import scala.concurrent.duration.FiniteDuration -import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, Props } +import org.slf4j.LoggerFactory + import akka.actor.ExtendedActorSystem +import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId, Props } import akka.actor.typed.Behavior import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.LoggerOps import akka.annotation.InternalApi +import akka.cluster.{ ddata => dd } import akka.cluster.Cluster import akka.cluster.ddata.ReplicatedData -import akka.cluster.{ ddata => dd } import akka.cluster.ddata.SelfUniqueAddress import akka.util.JavaDurationConverters._ -import org.slf4j.LoggerFactory object DistributedData extends ExtensionId[DistributedData] { def get(system: ActorSystem[_]): DistributedData = apply(system) diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala index 81237c57f0..87007a2312 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala @@ -6,11 +6,11 @@ package akka.cluster.ddata.typed.scaladsl import scala.concurrent.duration.FiniteDuration +import akka.actor.typed.ActorRef +import akka.actor.typed.Behavior import akka.cluster.{ ddata => dd } import akka.cluster.ddata.Key import akka.cluster.ddata.ReplicatedData -import akka.actor.typed.ActorRef -import akka.actor.typed.Behavior import akka.cluster.ddata.typed.internal.ReplicatorBehavior /** diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala index f282192322..7520c4722c 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata.typed.scaladsl -import akka.cluster.{ ddata => dd } +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi -import com.typesafe.config.Config +import akka.cluster.{ ddata => dd } /** * @see [[akka.cluster.ddata.ReplicatorSettings]]. diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala index 3adcbe680a..914746d1ec 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala @@ -4,16 +4,16 @@ package akka.cluster.typed +import scala.collection.immutable + import akka.actor.Address -import akka.annotation.DoNotInherit -import akka.cluster.ClusterEvent.{ ClusterDomainEvent, CurrentClusterState } -import akka.cluster._ -import akka.japi.Util import akka.actor.typed.{ ActorRef, ActorSystem, Extension, ExtensionId } import akka.actor.typed.ExtensionSetup +import akka.annotation.DoNotInherit +import akka.cluster._ +import akka.cluster.ClusterEvent.{ ClusterDomainEvent, CurrentClusterState } import akka.cluster.typed.internal.AdapterClusterImpl - -import scala.collection.immutable +import akka.japi.Util /** * Messages for subscribing to changes in the cluster state diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala index 9653026c8b..77c4d61045 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala @@ -4,6 +4,13 @@ package akka.cluster.typed +import scala.concurrent.duration._ +import scala.concurrent.duration.{ Duration, FiniteDuration } + +import com.typesafe.config.Config + +import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Extension, ExtensionId, Props } +import akka.actor.typed.ExtensionSetup import akka.annotation.{ DoNotInherit, InternalApi } import akka.cluster.ClusterSettings.DataCenter import akka.cluster.singleton.{ @@ -11,13 +18,7 @@ import akka.cluster.singleton.{ ClusterSingletonManagerSettings => ClassicClusterSingletonManagerSettings } import akka.cluster.typed.internal.AdaptedClusterSingletonImpl -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior, Extension, ExtensionId, Props } import akka.util.JavaDurationConverters._ -import com.typesafe.config.Config -import scala.concurrent.duration._ -import scala.concurrent.duration.{ Duration, FiniteDuration } - -import akka.actor.typed.ExtensionSetup object ClusterSingletonSettings { def apply(system: ActorSystem[_]): ClusterSingletonSettings = diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala index 363a38a50d..705c553a23 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterImpl.scala @@ -4,17 +4,17 @@ package akka.cluster.typed.internal +import akka.actor.typed.{ ActorRef, ActorSystem, Terminated } import akka.actor.typed.Behavior import akka.actor.typed.Props import akka.actor.typed.SupervisorStrategy -import akka.annotation.InternalApi -import akka.cluster.ClusterEvent.MemberEvent -import akka.cluster.{ ClusterEvent, Member, MemberStatus } -import akka.actor.typed.{ ActorRef, ActorSystem, Terminated } -import akka.cluster.typed._ import akka.actor.typed.internal.adapter.ActorSystemAdapter import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ +import akka.annotation.InternalApi +import akka.cluster.{ ClusterEvent, Member, MemberStatus } +import akka.cluster.ClusterEvent.MemberEvent +import akka.cluster.typed._ /** * INTERNAL API: diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala index df907d3ed1..fcafcaad63 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AdaptedClusterSingletonImpl.scala @@ -7,16 +7,16 @@ package akka.cluster.typed.internal import java.util.concurrent.ConcurrentHashMap import java.util.function.{ Function => JFunction } -import akka.actor.typed.internal.{ PoisonPill, PoisonPillInterceptor } import akka.actor.{ ExtendedActorSystem, InvalidActorNameException } -import akka.annotation.InternalApi -import akka.cluster.singleton.{ ClusterSingletonProxy, ClusterSingletonManager => OldSingletonManager } -import akka.cluster.typed.{ Cluster, ClusterSingleton, ClusterSingletonImpl, ClusterSingletonSettings } +import akka.actor.typed.{ ActorRef, ActorSystem, Behavior } +import akka.actor.typed.internal.{ PoisonPill, PoisonPillInterceptor } import akka.actor.typed.internal.adapter.ActorSystemAdapter import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.{ ActorRef, ActorSystem, Behavior } +import akka.annotation.InternalApi import akka.cluster.ClusterSettings.DataCenter +import akka.cluster.singleton.{ ClusterSingletonProxy, ClusterSingletonManager => OldSingletonManager } import akka.cluster.typed +import akka.cluster.typed.{ Cluster, ClusterSingleton, ClusterSingletonImpl, ClusterSingletonSettings } /** * INTERNAL API: @@ -28,6 +28,7 @@ private[akka] final class AdaptedClusterSingletonImpl(system: ActorSystem[_]) ex "only adapted actor systems can be used for the typed cluster singleton") import ClusterSingletonImpl._ + import akka.actor.typed.scaladsl.adapter._ private lazy val cluster = Cluster(system) diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala index 660c6fc4e7..2c882a6eb5 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializer.scala @@ -9,12 +9,12 @@ import java.io.NotSerializableException import akka.actor.ExtendedActorSystem import akka.actor.typed.ActorRefResolver import akka.actor.typed.internal.pubsub.TopicImpl -import akka.annotation.InternalApi -import akka.serialization.{ BaseSerializer, SerializerWithStringManifest } import akka.actor.typed.scaladsl.adapter._ +import akka.annotation.InternalApi import akka.cluster.typed.internal.protobuf.ClusterMessages import akka.cluster.typed.internal.receptionist.ClusterReceptionist.Entry import akka.remote.serialization.WrappedPayloadSupport +import akka.serialization.{ BaseSerializer, SerializerWithStringManifest } /** * INTERNAL API diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala index ce26c2b675..ff0cd75ba3 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala @@ -6,7 +6,6 @@ package akka.cluster.typed.internal.delivery import java.io.NotSerializableException -import akka.util.ccompat.JavaConverters._ import akka.actor.typed.ActorRefResolver import akka.actor.typed.delivery.ConsumerController import akka.actor.typed.delivery.DurableProducerQueue @@ -19,6 +18,7 @@ import akka.cluster.typed.internal.protobuf.ReliableDelivery.Confirmed import akka.remote.serialization.WrappedPayloadSupport import akka.serialization.BaseSerializer import akka.serialization.SerializerWithStringManifest +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala index 99f4f6531b..11d87471d0 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionist.scala @@ -4,30 +4,30 @@ package akka.cluster.typed.internal.receptionist +import scala.concurrent.duration._ + +import akka.actor.Address +import akka.actor.typed.{ ActorRef, Behavior } import akka.actor.typed.internal.receptionist.{ AbstractServiceKey, ReceptionistBehaviorProvider, ReceptionistMessages } import akka.actor.typed.receptionist.Receptionist.Command import akka.actor.typed.receptionist.ServiceKey -import akka.actor.typed.scaladsl.adapter._ import akka.actor.typed.scaladsl.{ ActorContext, Behaviors, LoggerOps } -import akka.actor.typed.{ ActorRef, Behavior } +import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi -import akka.cluster.ClusterEvent.MemberRemoved -import akka.cluster.ddata.{ ORMultiMap, ORMultiMapKey, Replicator } import akka.cluster.{ Cluster, ClusterEvent, UniqueAddress } -import akka.remote.AddressUidExtension -import akka.util.TypedMultiMap - -import scala.concurrent.duration._ -import akka.actor.Address import akka.cluster.ClusterEvent.ClusterDomainEvent import akka.cluster.ClusterEvent.ClusterShuttingDown import akka.cluster.ClusterEvent.MemberJoined +import akka.cluster.ClusterEvent.MemberRemoved import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterEvent.MemberWeaklyUp import akka.cluster.ClusterEvent.ReachabilityEvent import akka.cluster.ClusterEvent.ReachableMember import akka.cluster.ClusterEvent.UnreachableMember +import akka.cluster.ddata.{ ORMultiMap, ORMultiMapKey, Replicator } import akka.cluster.ddata.SelfUniqueAddress +import akka.remote.AddressUidExtension +import akka.util.TypedMultiMap // just to provide a log class /** INTERNAL API */ diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala index d8ab1237d4..26711c0db9 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala @@ -4,9 +4,10 @@ package akka.cluster.typed.internal.receptionist +import com.typesafe.config.Config + import akka.annotation.InternalApi import akka.cluster.{ ConfigValidation, JoinConfigCompatChecker, Valid } -import com.typesafe.config.Config /** * INTERNAL API diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala index f30452aabe..87ebe9980c 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala @@ -4,16 +4,17 @@ package akka.cluster.typed.internal.receptionist +import scala.concurrent.duration._ +import scala.concurrent.duration.{ FiniteDuration, MILLISECONDS } + +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.annotation.InternalApi import akka.cluster.ddata.Replicator import akka.cluster.ddata.Replicator.WriteConsistency -import akka.util.Helpers.toRootLowerCase -import com.typesafe.config.Config -import scala.concurrent.duration._ -import scala.concurrent.duration.{ FiniteDuration, MILLISECONDS } - import akka.cluster.ddata.ReplicatorSettings +import akka.util.Helpers.toRootLowerCase /** * Internal API 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 5ed5d3a282..4160a56759 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,14 +4,15 @@ package akka.cluster.typed +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + +import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.scaladsl.adapter._ import akka.cluster.{ MemberStatus, MultiNodeClusterSpec } import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } -import akka.actor.testkit.typed.scaladsl.TestProbe -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object MultiDcClusterSingletonSpecConfig extends MultiNodeConfig { val first: RoleName = role("first") @@ -41,8 +42,8 @@ abstract class MultiDcClusterSingletonSpec extends MultiNodeSpec(MultiDcClusterSingletonSpecConfig) with MultiNodeTypedClusterSpec { - import MultiDcPinger._ import MultiDcClusterSingletonSpecConfig._ + import MultiDcPinger._ "A cluster with multiple data centers" must { "be able to form" in { diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala index 9eb37b8e0a..368645d233 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/MultiNodeTypedClusterSpec.scala @@ -6,26 +6,27 @@ package akka.cluster.typed import java.util.concurrent.ConcurrentHashMap +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.language.implicitConversions + +import org.scalatest.Suite +import org.scalatest.matchers.should.Matchers + +import akka.actor.{ Address, Scheduler } import akka.actor.typed.ActorRef import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.Props import akka.actor.typed.SpawnProtocol -import akka.actor.typed.scaladsl.adapter._ import akka.actor.typed.scaladsl.AskPattern._ -import akka.actor.{ Address, Scheduler } +import akka.actor.typed.scaladsl.adapter._ import akka.cluster.{ ClusterEvent, MemberStatus } import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec } import akka.testkit.WatchedByCoroner import akka.util.Timeout -import org.scalatest.Suite -import org.scalatest.matchers.should.Matchers - -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.language.implicitConversions trait MultiNodeTypedClusterSpec extends Suite with STMultiNodeSpec with WatchedByCoroner with Matchers { self: MultiNodeSpec => diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala index a625a53794..53ae40e5f6 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/PubSubSpec.scala @@ -4,6 +4,8 @@ package akka.cluster.typed +import com.typesafe.config.ConfigFactory + import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.ActorRef import akka.actor.typed.internal.pubsub.TopicImpl @@ -14,7 +16,6 @@ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.serialization.jackson.CborSerializable -import com.typesafe.config.ConfigFactory object PubSubSpecConfig extends MultiNodeConfig { val first: RoleName = role("first") diff --git a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala index 97561d1478..076a013f8f 100644 --- a/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala +++ b/akka-cluster-typed/src/multi-jvm/scala/akka/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala @@ -4,6 +4,10 @@ package akka.cluster.typed.internal +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.receptionist.Receptionist import akka.actor.typed.receptionist.ServiceKey @@ -16,9 +20,6 @@ import akka.cluster.typed.MultiNodeTypedClusterSpec import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object ClusterReceptionistUnreachabilitySpecConfig extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala index 718aac7d96..167afbd916 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala @@ -4,9 +4,10 @@ package akka.cluster.ddata.typed.scaladsl +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import org.scalatest.wordspec.AnyWordSpecLike class ReplicatorSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { "Replicator" must { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala index 01bee42daa..71b6dfd5ad 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorRefIgnoreSerializationSpec.scala @@ -4,16 +4,17 @@ package akka.cluster.typed -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter._ -import akka.actor.typed.{ ActorRef, ActorRefResolver, ActorSystem } -import akka.actor.{ ExtendedActorSystem, IgnoreActorRef } import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec + import akka.{ actor => classic } +import akka.actor.{ ExtendedActorSystem, IgnoreActorRef } +import akka.actor.typed.{ ActorRef, ActorRefResolver, ActorSystem } +import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.adapter._ class ActorRefIgnoreSerializationSpec extends AnyWordSpec with ScalaFutures with Matchers with BeforeAndAfterAll { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala index 985f73c276..31bbf999a5 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ActorSystemSpec.scala @@ -11,27 +11,28 @@ import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.control.NonFatal +import com.typesafe.config.ConfigFactory +import org.scalatest._ +import org.scalatest.concurrent.Eventually +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.matchers.should.Matchers +import org.scalatest.time.Span +import org.scalatest.wordspec.AnyWordSpec + import akka.Done import akka.actor.CoordinatedShutdown import akka.actor.ExtendedActorSystem import akka.actor.InvalidMessageException -import akka.actor.testkit.typed.scaladsl.TestInbox import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.TestInbox import akka.actor.typed.ActorRef import akka.actor.typed.ActorRefResolver import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.PostStop -import akka.actor.typed.scaladsl.adapter._ import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.adapter._ import akka.serialization.SerializerWithStringManifest -import com.typesafe.config.ConfigFactory -import org.scalatest._ -import org.scalatest.concurrent.Eventually -import org.scalatest.concurrent.ScalaFutures -import org.scalatest.time.Span -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec object ActorSystemSpec { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala index 225a1e3074..d8ce526744 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterActorLoggingSpec.scala @@ -4,15 +4,16 @@ package akka.cluster.typed +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ExtendedActorSystem import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.internal.ActorMdc import akka.actor.typed.scaladsl.Behaviors -import com.typesafe.config.ConfigFactory -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike object ClusterActorLoggingSpec { def config = ConfigFactory.parseString(""" diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala index d8f979dac2..056365431a 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterApiSpec.scala @@ -4,17 +4,18 @@ package akka.cluster.typed +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.Address +import akka.actor.testkit.typed.TestKitSettings +import akka.actor.testkit.typed.scaladsl.ActorTestKit +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.scaladsl.adapter._ import akka.cluster.ClusterEvent._ import akka.cluster.MemberStatus -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.TestKitSettings -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import com.typesafe.config.ConfigFactory -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike object ClusterApiSpec { val config = diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala index d72ceb5127..a576731581 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterDispatcherSelectorSpec.scala @@ -4,9 +4,10 @@ package akka.cluster.typed -import akka.actor.typed.scaladsl.DispatcherSelectorSpec import com.typesafe.config.ConfigFactory +import akka.actor.typed.scaladsl.DispatcherSelectorSpec + class ClusterDispatcherSelectorSpec extends DispatcherSelectorSpec(ConfigFactory.parseString(""" akka.actor.provider = cluster diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala index 774f2c2f4a..7c282f5d59 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonApiSpec.scala @@ -7,6 +7,9 @@ package akka.cluster.typed import scala.concurrent.Await import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit @@ -15,8 +18,6 @@ import akka.actor.typed.ActorRef import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.serialization.jackson.CborSerializable -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object ClusterSingletonApiSpec { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala index 63f59c7e7a..7e83202fd8 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/ClusterSingletonPoisonPillSpec.scala @@ -4,17 +4,18 @@ package akka.cluster.typed +import scala.concurrent.duration._ + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } -import akka.actor.typed.internal.PoisonPill +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.{ ActorRef, Behavior } +import akka.actor.typed.internal.PoisonPill import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.cluster.typed.ClusterSingletonPoisonPillSpec.GetSelf -import scala.concurrent.duration._ - -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike object ClusterSingletonPoisonPillSpec { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala index a2ae4f39d0..3c08882490 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/GroupRouterSpec.scala @@ -4,16 +4,17 @@ package akka.cluster.typed +import scala.concurrent.Promise + +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.{ LogCapturing, ScalaTestWithActorTestKit } import akka.actor.typed.{ ActorRef, ActorSystem, Behavior } import akka.actor.typed.receptionist.{ Receptionist, ServiceKey } import akka.actor.typed.scaladsl.{ Behaviors, GroupRouter, Routers } import akka.serialization.jackson.CborSerializable import akka.util.Timeout -import com.typesafe.config.ConfigFactory - -import scala.concurrent.Promise -import org.scalatest.wordspec.AnyWordSpecLike object GroupRouterSpec { def config = ConfigFactory.parseString(s""" @@ -68,6 +69,7 @@ class GroupRouterSpec extends ScalaTestWithActorTestKit(GroupRouterSpec.config) def checkGroupRouterBehavior[T](groupRouter: GroupRouter[Ping.type], settings: GroupRouterSpecSettings)( resultCheck: (Seq[ActorRef[Ping.type]], Seq[ActorRef[Ping.type]]) => T): T = { import scala.concurrent.duration._ + import akka.actor.typed.scaladsl.AskPattern._ implicit val system1 = createSystem( diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala index 7be06e03f5..499ae24f58 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteContextAskSpec.scala @@ -8,6 +8,9 @@ import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe @@ -19,8 +22,6 @@ import akka.actor.typed.receptionist.ServiceKey import akka.actor.typed.scaladsl.Behaviors import akka.serialization.jackson.CborSerializable import akka.util.Timeout -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object RemoteContextAskSpec { def config = ConfigFactory.parseString(s""" diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala index 613c02977f..6fcbc84068 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteDeployNotAllowedSpec.scala @@ -4,17 +4,18 @@ package akka.cluster.typed -import akka.actor.typed.ActorSystem -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.testkit.typed.scaladsl.TestProbe -import com.typesafe.config.ConfigFactory import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.ActorTestKit -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing +import com.typesafe.config.ConfigFactory import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.ActorTestKit +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.testkit.typed.scaladsl.TestProbe +import akka.actor.typed.ActorSystem +import akka.actor.typed.scaladsl.Behaviors + object RemoteDeployNotAllowedSpec { def config = ConfigFactory.parseString(s""" akka { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala index 78f9c19c92..009e4d5809 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/RemoteMessageSpec.scala @@ -6,15 +6,16 @@ package akka.cluster.typed import scala.concurrent.Promise +import com.typesafe.config.ConfigFactory + import akka.Done +import akka.actor.{ ActorSystem => ClassicActorSystem } import akka.actor.typed.ActorRef import akka.actor.typed.ActorRefResolver import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ -import akka.actor.{ ActorSystem => ClassicActorSystem } import akka.serialization.jackson.CborSerializable import akka.testkit.AkkaSpec -import com.typesafe.config.ConfigFactory object RemoteMessageSpec { def config = ConfigFactory.parseString(s""" diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala index 2592b53bbf..68da21a4b6 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/AkkaClusterTypedSerializerSpec.scala @@ -4,14 +4,15 @@ package akka.cluster.typed.internal +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ExtendedActorSystem +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.cluster.typed.internal.receptionist.ClusterReceptionist import akka.serialization.SerializationExtension -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.actor.typed.scaladsl.Behaviors -import org.scalatest.wordspec.AnyWordSpecLike class AkkaClusterTypedSerializerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala index 4c84b34f7a..19ddb50f68 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala @@ -4,6 +4,8 @@ package akka.cluster.typed.internal.delivery +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ExtendedActorSystem import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit @@ -14,7 +16,6 @@ import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.serialization.SerializationExtension -import org.scalatest.wordspec.AnyWordSpecLike class ReliableDeliverySerializerSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala index c455eade12..26b9974472 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala @@ -9,6 +9,10 @@ import java.util.concurrent.ThreadLocalRandom import scala.concurrent.Await import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.RootActorPath import akka.actor.testkit.typed.FishingOutcome import akka.actor.testkit.typed.scaladsl.ActorTestKit @@ -26,9 +30,6 @@ import akka.cluster.typed.Join import akka.cluster.typed.JoinSeedNodes import akka.cluster.typed.Leave import akka.serialization.jackson.CborSerializable -import com.typesafe.config.ConfigFactory -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec object ClusterReceptionistSpec { val config = ConfigFactory.parseString(s""" diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala index 7e524d7734..4d52e3ca27 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala @@ -4,6 +4,12 @@ package akka.cluster.typed.internal.receptionist +import scala.concurrent.duration._ +import scala.concurrent.duration.Deadline + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.Address import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.internal.receptionist.AbstractServiceKey @@ -11,11 +17,6 @@ import akka.actor.typed.receptionist.ServiceKey import akka.cluster.UniqueAddress import akka.cluster.typed.internal.receptionist.ClusterReceptionist.SubscriptionsKV import akka.util.TypedMultiMap -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike - -import scala.concurrent.duration.Deadline -import scala.concurrent.duration._ class ClusterReceptionistStateSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with Matchers { diff --git a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala index 1270c4e047..a03c8bd7ef 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Cluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Cluster.scala @@ -8,26 +8,27 @@ import java.io.Closeable import java.util.concurrent.ThreadFactory import java.util.concurrent.atomic.AtomicBoolean +import scala.annotation.varargs +import scala.collection.immutable +import scala.concurrent.{ Await, ExecutionContext } +import scala.concurrent.duration._ +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory } + import akka.ConfigurationException import akka.actor._ import akka.annotation.InternalApi import akka.cluster.ClusterSettings.DataCenter import akka.dispatch.MonitorableThreadFactory import akka.event.{ Logging, LoggingAdapter } -import akka.japi.Util -import akka.pattern._ -import akka.remote.{ UniqueAddress => _, _ } -import com.typesafe.config.{ Config, ConfigFactory } -import scala.annotation.varargs -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.concurrent.{ Await, ExecutionContext } -import scala.util.control.NonFatal - import akka.event.LogMarker import akka.event.Logging.LogLevel import akka.event.MarkerLoggingAdapter -import com.github.ghik.silencer.silent +import akka.japi.Util +import akka.pattern._ +import akka.remote.{ UniqueAddress => _, _ } /** * Cluster Extension Id and factory for creating Cluster extension. diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala index 415f5655d0..3a14c9799a 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterActorRefProvider.scala @@ -4,12 +4,16 @@ package akka.cluster +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.ConfigurationException import akka.actor.ActorPath -import akka.actor.Address import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.ActorSystemImpl +import akka.actor.Address import akka.actor.Deploy import akka.actor.DynamicAccess import akka.actor.NoScopeGiven @@ -20,14 +24,11 @@ import akka.cluster.routing.ClusterRouterGroupSettings import akka.cluster.routing.ClusterRouterPool import akka.cluster.routing.ClusterRouterPoolSettings import akka.event.EventStream -import akka.remote.routing.RemoteRouterConfig import akka.remote.RemoteActorRefProvider import akka.remote.RemoteDeployer +import akka.remote.routing.RemoteRouterConfig import akka.routing.Group import akka.routing.Pool -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala index 157498bab7..7dd05fe381 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala @@ -5,26 +5,27 @@ package akka.cluster import scala.collection.immutable -import scala.concurrent.duration._ import scala.concurrent.Future import scala.concurrent.Promise +import scala.concurrent.duration._ import scala.util.control.NonFatal -import akka.actor._ -import akka.annotation.InternalApi -import akka.actor.SupervisorStrategy.Stop -import akka.cluster.MemberStatus._ -import akka.cluster.ClusterEvent._ -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import com.github.ghik.silencer.silent +import com.typesafe.config.Config + import akka.Done +import akka.actor._ +import akka.actor.SupervisorStrategy.Stop +import akka.annotation.InternalApi +import akka.cluster.ClusterEvent._ +import akka.cluster.MemberStatus._ +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.event.ActorWithLogClass +import akka.event.Logging import akka.pattern.ask import akka.remote.{ QuarantinedEvent => ClassicQuarantinedEvent } import akka.remote.artery.QuarantinedEvent import akka.util.Timeout -import akka.event.ActorWithLogClass -import akka.event.Logging -import com.github.ghik.silencer.silent -import com.typesafe.config.Config /** * Base trait for all cluster messages. All ClusterMessage's are serializable. @@ -311,13 +312,13 @@ private[cluster] object ClusterCoreDaemon { private[cluster] class ClusterCoreDaemon(publisher: ActorRef, joinConfigCompatChecker: JoinConfigCompatChecker) extends Actor with RequiresMessageQueue[UnboundedMessageQueueSemantics] { - import InternalClusterAction._ import ClusterCoreDaemon._ + import InternalClusterAction._ import MembershipState._ val cluster = Cluster(context.system) - import cluster.ClusterLogger._ import cluster.{ crossDcFailureDetector, failureDetector, scheduler, selfAddress, selfRoles } + import cluster.ClusterLogger._ import cluster.settings._ val selfDc = cluster.selfDataCenter diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala index 0fe6a21710..a4786c7cbb 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterEvent.scala @@ -4,22 +4,22 @@ package akka.cluster -import language.postfixOps import scala.collection.immutable import scala.collection.immutable.{ SortedSet, VectorBuilder } -import akka.actor.{ Actor, ActorRef, Address } -import akka.cluster.ClusterSettings.DataCenter -import akka.cluster.ClusterEvent._ -import akka.cluster.MemberStatus._ -import akka.event.EventStream -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.actor.DeadLetterSuppression -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.util.ccompat._ - import scala.runtime.AbstractFunction5 import com.github.ghik.silencer.silent +import language.postfixOps + +import akka.actor.{ Actor, ActorRef, Address } +import akka.actor.DeadLetterSuppression +import akka.annotation.{ DoNotInherit, InternalApi } +import akka.cluster.ClusterEvent._ +import akka.cluster.ClusterSettings.DataCenter +import akka.cluster.MemberStatus._ +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.event.EventStream +import akka.util.ccompat._ /** * Domain events published to the event bus. diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala index 8e7d16457e..54900b06cd 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala @@ -5,12 +5,14 @@ package akka.cluster import java.lang.management.ManagementFactory -import javax.management.StandardMBean -import akka.event.LoggingAdapter -import akka.actor.AddressFromURIString -import javax.management.ObjectName + import javax.management.InstanceAlreadyExistsException import javax.management.InstanceNotFoundException +import javax.management.ObjectName +import javax.management.StandardMBean + +import akka.actor.AddressFromURIString +import akka.event.LoggingAdapter /** * Interface for the cluster JMX MBean. diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala index 6470ed3572..2958e8e172 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala @@ -10,16 +10,16 @@ import akka.actor._ import akka.cluster.ClusterEvent.CurrentClusterState import akka.cluster.ClusterEvent.MemberEvent import akka.cluster.ClusterEvent.MemberJoined -import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterEvent.MemberRemoved +import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterEvent.MemberWeaklyUp import akka.dispatch.Dispatchers import akka.event.ActorWithLogClass import akka.event.Logging import akka.remote.FailureDetectorRegistry +import akka.remote.RARP import akka.remote.RemoteSettings import akka.remote.RemoteWatcher -import akka.remote.RARP /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala index 17533acdbd..94bfdc5779 100644 --- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala +++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala @@ -5,17 +5,17 @@ package akka.cluster import scala.collection.immutable +import scala.concurrent.duration.Duration +import scala.concurrent.duration.FiniteDuration + import com.typesafe.config.Config import com.typesafe.config.ConfigObject -import scala.concurrent.duration.Duration import akka.actor.Address import akka.actor.AddressFromURIString import akka.annotation.InternalApi -import akka.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring } - -import scala.concurrent.duration.FiniteDuration import akka.japi.Util.immutableSeq +import akka.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring } object ClusterSettings { type DataCenter = String diff --git a/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala b/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala index 07b9d3e0d0..cbdf490143 100644 --- a/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala +++ b/akka-cluster/src/main/scala/akka/cluster/CrossDcClusterHeartbeat.scala @@ -4,18 +4,18 @@ package akka.cluster +import scala.collection.SortedSet +import scala.collection.immutable + import akka.actor.{ Actor, ActorSelection, Address, NoSerializationVerificationNeeded } import akka.annotation.InternalApi import akka.cluster.ClusterEvent._ import akka.cluster.ClusterSettings.DataCenter +import akka.event.ActorWithLogClass +import akka.event.Logging import akka.remote.FailureDetectorRegistry import akka.util.ConstantFun import akka.util.ccompat._ -import scala.collection.SortedSet -import scala.collection.immutable - -import akka.event.ActorWithLogClass -import akka.event.Logging /** * INTERNAL API @@ -42,8 +42,8 @@ private[cluster] class CrossDcHeartbeatSender extends Actor { val cluster = Cluster(context.system) val verboseHeartbeat = cluster.settings.Debug.VerboseHeartbeatLogging - import cluster.settings._ import cluster.{ scheduler, selfAddress, selfDataCenter, selfUniqueAddress } + import cluster.settings._ import context.dispatcher private val clusterLogger = diff --git a/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala b/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala index b3fe1dc505..e64c1d581e 100644 --- a/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala +++ b/akka-cluster/src/main/scala/akka/cluster/DowningProvider.scala @@ -4,11 +4,11 @@ package akka.cluster +import scala.concurrent.duration.FiniteDuration + import akka.ConfigurationException import akka.actor.{ ActorSystem, ExtendedActorSystem, Props } -import scala.concurrent.duration.FiniteDuration - /** * INTERNAL API */ diff --git a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala index 0720a688d1..d045b43296 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Gossip.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Gossip.scala @@ -5,11 +5,12 @@ package akka.cluster import scala.collection.immutable +import scala.concurrent.duration.Deadline + import ClusterSettings.DataCenter import MemberStatus._ -import akka.annotation.InternalApi -import scala.concurrent.duration.Deadline +import akka.annotation.InternalApi /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala b/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala index 50ef8a2188..f7f79c75f9 100644 --- a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala +++ b/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatCheckCluster.scala @@ -4,10 +4,11 @@ package akka.cluster -import akka.annotation.InternalApi +import scala.collection.{ immutable => im } + import com.typesafe.config.Config -import scala.collection.{ immutable => im } +import akka.annotation.InternalApi /** * INTERNAL API diff --git a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala b/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala index 07e4b2b952..bf8f6090c0 100644 --- a/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala +++ b/akka-cluster/src/main/scala/akka/cluster/JoinConfigCompatChecker.scala @@ -6,13 +6,14 @@ package akka.cluster import java.util +import scala.collection.{ immutable => im } + +import com.typesafe.config.{ Config, ConfigFactory, ConfigValue } + import akka.actor.ExtendedActorSystem import akka.annotation.{ DoNotInherit, InternalApi } import akka.util.ccompat._ -import com.typesafe.config.{ Config, ConfigFactory, ConfigValue } - import akka.util.ccompat.JavaConverters._ -import scala.collection.{ immutable => im } abstract class JoinConfigCompatChecker { diff --git a/akka-cluster/src/main/scala/akka/cluster/Member.scala b/akka-cluster/src/main/scala/akka/cluster/Member.scala index 15e0a4f3ca..6af9765a09 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Member.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Member.scala @@ -4,13 +4,14 @@ package akka.cluster -import akka.actor.Address +import scala.runtime.AbstractFunction2 + import MemberStatus._ -import akka.annotation.InternalApi -import akka.cluster.ClusterSettings.DataCenter import com.github.ghik.silencer.silent -import scala.runtime.AbstractFunction2 +import akka.actor.Address +import akka.annotation.InternalApi +import akka.cluster.ClusterSettings.DataCenter /** * Represents the address, current status, and roles of a cluster member node. diff --git a/akka-cluster/src/main/scala/akka/cluster/MembershipState.scala b/akka-cluster/src/main/scala/akka/cluster/MembershipState.scala index bc12d5ea3a..f40da163f5 100644 --- a/akka-cluster/src/main/scala/akka/cluster/MembershipState.scala +++ b/akka-cluster/src/main/scala/akka/cluster/MembershipState.scala @@ -6,16 +6,16 @@ package akka.cluster import java.util.concurrent.ThreadLocalRandom -import scala.collection.immutable +import scala.annotation.tailrec import scala.collection.SortedSet +import scala.collection.immutable +import scala.util.Random + +import akka.annotation.InternalApi import akka.cluster.ClusterSettings.DataCenter import akka.cluster.MemberStatus._ -import akka.annotation.InternalApi import akka.util.ccompat._ -import scala.annotation.tailrec -import scala.util.Random - /** * INTERNAL API */ diff --git a/akka-cluster/src/main/scala/akka/cluster/Reachability.scala b/akka-cluster/src/main/scala/akka/cluster/Reachability.scala index 54f71eb3a2..f36f46aeff 100644 --- a/akka-cluster/src/main/scala/akka/cluster/Reachability.scala +++ b/akka-cluster/src/main/scala/akka/cluster/Reachability.scala @@ -4,9 +4,9 @@ package akka.cluster -import akka.annotation.InternalApi - import scala.collection.immutable + +import akka.annotation.InternalApi import akka.util.ccompat._ /** diff --git a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala b/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala index fbb2086786..0dea6c779f 100644 --- a/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala +++ b/akka-cluster/src/main/scala/akka/cluster/VectorClock.scala @@ -5,8 +5,9 @@ package akka.cluster import java.security.MessageDigest -import scala.collection.immutable.TreeMap + import scala.annotation.tailrec +import scala.collection.immutable.TreeMap /** * VectorClock module with helper classes and methods. diff --git a/akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala b/akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala index 1c2e2d8ded..869716685d 100644 --- a/akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala +++ b/akka-cluster/src/main/scala/akka/cluster/protobuf/ClusterMessageSerializer.scala @@ -7,24 +7,25 @@ package akka.cluster.protobuf import java.io.{ ByteArrayInputStream, ByteArrayOutputStream } import java.util.zip.{ GZIPInputStream, GZIPOutputStream } -import akka.actor.{ Address, ExtendedActorSystem } -import akka.cluster._ -import akka.cluster.protobuf.msg.{ ClusterMessages => cm } -import akka.serialization._ -import akka.protobufv3.internal.{ ByteString, MessageLite } - import scala.annotation.tailrec import scala.collection.immutable -import akka.util.ccompat.JavaConverters._ import scala.concurrent.duration.Deadline -import akka.annotation.InternalApi -import akka.cluster.InternalClusterAction._ -import akka.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings } -import akka.routing.Pool -import akka.util.ccompat._ + import com.github.ghik.silencer.silent import com.typesafe.config.{ Config, ConfigFactory, ConfigRenderOptions } +import akka.actor.{ Address, ExtendedActorSystem } +import akka.annotation.InternalApi +import akka.cluster._ +import akka.cluster.InternalClusterAction._ +import akka.cluster.protobuf.msg.{ ClusterMessages => cm } +import akka.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings } +import akka.protobufv3.internal.{ ByteString, MessageLite } +import akka.routing.Pool +import akka.serialization._ +import akka.util.ccompat._ +import akka.util.ccompat.JavaConverters._ + /** * INTERNAL API */ diff --git a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala index a2cb36d545..0baf1d1799 100644 --- a/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala +++ b/akka-cluster/src/main/scala/akka/cluster/routing/ClusterRouterConfig.scala @@ -6,6 +6,13 @@ package akka.cluster.routing import java.util.concurrent.atomic.AtomicInteger +import scala.annotation.{ tailrec, varargs } +import scala.collection.immutable + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.Cluster import akka.cluster.ClusterEvent._ @@ -24,12 +31,6 @@ import akka.routing.RouterActor import akka.routing.RouterConfig import akka.routing.RouterPoolActor import akka.routing.RoutingLogic -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory - -import scala.annotation.{ tailrec, varargs } -import scala.collection.immutable import akka.util.ccompat.JavaConverters._ object ClusterRouterGroupSettings { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala index 297f7cfb74..437d8f87b8 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/AttemptSysMsgRedeliverySpec.scala @@ -5,15 +5,16 @@ package akka.cluster import scala.concurrent.duration._ + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef import akka.actor.Identify +import akka.actor.PoisonPill import akka.actor.Props +import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } -import akka.actor.PoisonPill object AttemptSysMsgRedeliveryMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala index 78e2050315..018fa6a253 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala @@ -4,11 +4,13 @@ package akka.cluster +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction -import scala.concurrent.duration._ import akka.testkit._ object ClusterAccrualFailureDetectorMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala index d284e66a33..6cd94eda67 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala @@ -10,16 +10,17 @@ import scala.concurrent.Await import scala.concurrent.duration._ import scala.language.postfixOps +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.ScalaFutures + import akka.actor._ import akka.cluster.MultiNodeClusterSpec.EndActor import akka.remote.RemoteActorRef import akka.remote.RemoteWatcher import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit.TestEvent._ import akka.testkit._ -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.ScalaFutures +import akka.testkit.TestEvent._ object ClusterDeathWatchMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala index 3854c00b18..5112f2514e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala @@ -6,6 +6,9 @@ package akka.cluster import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.ScalaFutures + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef @@ -20,8 +23,6 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit.ImplicitSender import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.ScalaFutures class ClusterWatcherNoClusterWatcheeConfig(val useUnsafe: Boolean, artery: Boolean) extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala index eb2752aa72..0f1e5ffd74 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala @@ -4,14 +4,15 @@ package akka.cluster -import language.postfixOps +import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory +import language.postfixOps + +import akka.actor.Address import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ -import akka.actor.Address final case class ConvergenceMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala index afd76479ee..e9de1c319c 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/DeterministicOldestWhenJoiningSpec.scala @@ -4,16 +4,17 @@ package akka.cluster -import scala.concurrent.duration._ import scala.collection.immutable +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import akka.actor.Address -import akka.cluster.ClusterEvent.MemberUp import akka.cluster.ClusterEvent.CurrentClusterState +import akka.cluster.ClusterEvent.MemberUp import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import com.typesafe.config.ConfigFactory object DeterministicOldestWhenJoiningMultiJvmSpec extends MultiNodeConfig { val seed1 = role("seed1") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala index 2df8db8413..cce8960f01 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialHeartbeatSpec.scala @@ -4,9 +4,11 @@ package akka.cluster -import language.postfixOps import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.cluster.ClusterEvent.CurrentClusterState import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala index d775c8d9f6..e90a112887 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/InitialMembersOfNewDcSpec.scala @@ -4,11 +4,12 @@ package akka.cluster -import akka.remote.testkit._ -import akka.testkit.ImplicitSender +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ +import akka.remote.testkit._ +import akka.testkit.ImplicitSender object InitialMembersOfNewDcSpec extends MultiNodeConfig { commonConfig(ConfigFactory.parseString(s""" diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala index c6c774a898..d39274b254 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala @@ -4,11 +4,13 @@ package akka.cluster +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ object JoinInProgressMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala index 8465f7ce2f..9eae814c00 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinSeedNodeSpec.scala @@ -5,10 +5,11 @@ package akka.cluster import scala.collection.immutable + +import akka.actor.Address import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Address object JoinSeedNodeMultiJvmSpec extends MultiNodeConfig { val seed1 = role("seed1") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala index 794a585a97..3f0eab9692 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LargeMessageClusterSpec.scala @@ -6,6 +6,8 @@ package akka.cluster import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.ActorIdentity import akka.actor.ActorRef import akka.actor.ExtendedActorSystem @@ -19,7 +21,6 @@ import akka.remote.testkit.MultiNodeSpec import akka.serialization.SerializerWithStringManifest import akka.testkit._ import akka.util.unused -import com.typesafe.config.ConfigFactory object LargeMessageClusterMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala index aa6d1966f1..0680999b58 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningAllOtherNodesSpec.scala @@ -5,10 +5,12 @@ package akka.cluster import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import com.typesafe.config.ConfigFactory object LeaderDowningAllOtherNodesMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala index 16d611e587..6c0105a6fd 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala @@ -4,13 +4,14 @@ package akka.cluster -import language.postfixOps +import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ final case class LeaderDowningNodeThatIsUnreachableMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala index 165f230cb3..628ba09a9e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderElectionSpec.scala @@ -4,11 +4,13 @@ package akka.cluster +import scala.concurrent.duration._ + import language.postfixOps + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ final case class LeaderElectionMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val controller = role("controller") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala index 2ad79f3917..f4df524dbb 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/LeaderLeavingSpec.scala @@ -4,15 +4,17 @@ package akka.cluster +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + +import akka.actor.Actor +import akka.actor.Deploy +import akka.actor.Props +import akka.cluster.MemberStatus._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ -import akka.actor.Props -import akka.actor.Actor -import akka.cluster.MemberStatus._ -import akka.actor.Deploy object LeaderLeavingMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -33,8 +35,8 @@ class LeaderLeavingMultiJvmNode3 extends LeaderLeavingSpec abstract class LeaderLeavingSpec extends MultiNodeSpec(LeaderLeavingMultiJvmSpec) with MultiNodeClusterSpec { - import LeaderLeavingMultiJvmSpec._ import ClusterEvent._ + import LeaderLeavingMultiJvmSpec._ "A LEADER that is LEAVING" must { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala index 806cefe7cb..e41faa3f90 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala @@ -4,12 +4,15 @@ package akka.cluster -import language.postfixOps -import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ import java.lang.management.ManagementFactory + +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import javax.management.InstanceNotFoundException import javax.management.ObjectName +import language.postfixOps + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala index b7ea0bebac..eb3b1e2079 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MemberWeaklyUpSpec.scala @@ -4,14 +4,16 @@ package akka.cluster -import scala.language.postfixOps import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.typesafe.config.ConfigFactory + +import akka.cluster.MemberStatus.WeaklyUp import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import com.typesafe.config.ConfigFactory -import akka.cluster.MemberStatus.WeaklyUp object MemberWeaklyUpSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala index 9d46505e87..3375143384 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerExitingSpec.scala @@ -4,13 +4,13 @@ package akka.cluster +import akka.actor.Actor +import akka.actor.Deploy +import akka.actor.Props +import akka.cluster.MemberStatus._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Props -import akka.actor.Actor -import akka.cluster.MemberStatus._ -import akka.actor.Deploy object MembershipChangeListenerExitingMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -28,8 +28,8 @@ abstract class MembershipChangeListenerExitingSpec extends MultiNodeSpec(MembershipChangeListenerExitingMultiJvmSpec) with MultiNodeClusterSpec { - import MembershipChangeListenerExitingMultiJvmSpec._ import ClusterEvent._ + import MembershipChangeListenerExitingMultiJvmSpec._ "A registered MembershipChangeListener" must { "be notified when new node is EXITING" taggedAs LongRunningTest in { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala index b201ed9239..b23118c831 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerUpSpec.scala @@ -4,12 +4,12 @@ package akka.cluster +import akka.actor.Actor +import akka.actor.Deploy +import akka.actor.Props import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Props -import akka.actor.Actor -import akka.actor.Deploy object MembershipChangeListenerUpMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -27,8 +27,8 @@ abstract class MembershipChangeListenerUpSpec extends MultiNodeSpec(MembershipChangeListenerUpMultiJvmSpec) with MultiNodeClusterSpec { - import MembershipChangeListenerUpMultiJvmSpec._ import ClusterEvent._ + import MembershipChangeListenerUpMultiJvmSpec._ "A set of connected cluster systems" must { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala index 29322ab5cd..414f0a4c63 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MinMembersBeforeUpSpec.scala @@ -5,11 +5,12 @@ package akka.cluster import com.typesafe.config.ConfigFactory + +import akka.cluster.MemberStatus._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.cluster.MemberStatus._ import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala index 83e67a4534..decf649470 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala @@ -4,12 +4,13 @@ package akka.cluster +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.cluster.MemberStatus.Up import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.remote.transport.ThrottlerTransportAdapter.Direction -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ class MultiDcSpecConfig(crossDcConnections: Int = 5) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala index 82b1858f2d..3d4b088cf1 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcHeartbeatTakingOverSpec.scala @@ -4,16 +4,17 @@ package akka.cluster +import scala.collection.immutable +import scala.collection.immutable.SortedSet +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSelection import akka.annotation.InternalApi import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.collection.immutable -import scala.collection.immutable.SortedSet -import scala.concurrent.duration._ import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala index eb7a267c36..a0a9cbafd3 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcLastNodeSpec.scala @@ -4,10 +4,11 @@ package akka.cluster -import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ +import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } object MultiDcLastNodeSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala index 8fb381aa0c..a73746d177 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala @@ -4,16 +4,17 @@ package akka.cluster +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSystem import akka.cluster.ClusterEvent._ import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory - -import scala.concurrent.Await -import scala.concurrent.duration._ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala index b9fd3be8be..b3bb3ddbfb 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSunnyWeatherSpec.scala @@ -4,15 +4,16 @@ package akka.cluster +import scala.collection.immutable +import scala.collection.immutable.SortedSet +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.annotation.InternalApi import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.collection.immutable -import scala.collection.immutable.SortedSet -import scala.concurrent.duration._ object MultiDcSunnyWeatherMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala index 1135472e80..22bf90d590 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala @@ -6,6 +6,15 @@ package akka.cluster import java.util.concurrent.ConcurrentHashMap +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.language.implicitConversions + +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.{ Canceled, Outcome, Suite } +import org.scalatest.exceptions.TestCanceledException + import akka.actor.{ Actor, ActorRef, ActorSystem, Address, Deploy, PoisonPill, Props, RootActorPath } import akka.cluster.ClusterEvent.{ MemberEvent, MemberRemoved } import akka.event.Logging.ErrorLevel @@ -13,17 +22,9 @@ import akka.remote.DefaultFailureDetectorRegistry import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeSpec, STMultiNodeSpec } import akka.serialization.jackson.CborSerializable -import akka.testkit.TestEvent._ import akka.testkit._ +import akka.testkit.TestEvent._ import akka.util.ccompat._ -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.exceptions.TestCanceledException -import org.scalatest.{ Canceled, Outcome, Suite } - -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.language.implicitConversions @ccompatUsedUntil213 object MultiNodeClusterSpec { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala index e92f2a7901..941e6a528e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeChurnSpec.scala @@ -4,16 +4,17 @@ package akka.cluster +import scala.collection.immutable +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.event.Logging.Info import akka.remote.RARP import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.testkit._ import akka.testkit.TestKit -import com.typesafe.config.ConfigFactory - -import scala.collection.immutable -import scala.concurrent.duration._ object NodeChurnMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala index ac3c6a8916..137c9330e3 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeDowningAndBeingRemovedSpec.scala @@ -4,11 +4,13 @@ package akka.cluster +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ object NodeDowningAndBeingRemovedMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala index 31e6c1878b..cb2b2419e0 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala @@ -4,10 +4,11 @@ package akka.cluster +import scala.concurrent.duration._ + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ object NodeLeavingAndExitingAndBeingRemovedMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala index dae020bb15..4a6bc56f1e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeLeavingAndExitingSpec.scala @@ -4,13 +4,13 @@ package akka.cluster +import akka.actor.Actor +import akka.actor.Deploy +import akka.actor.Props +import akka.cluster.MemberStatus._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Props -import akka.actor.Actor -import akka.cluster.MemberStatus._ -import akka.actor.Deploy object NodeLeavingAndExitingMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -28,8 +28,8 @@ abstract class NodeLeavingAndExitingSpec extends MultiNodeSpec(NodeLeavingAndExitingMultiJvmSpec) with MultiNodeClusterSpec { - import NodeLeavingAndExitingMultiJvmSpec._ import ClusterEvent._ + import NodeLeavingAndExitingMultiJvmSpec._ "A node that is LEAVING a non-singleton cluster" must { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala index 125b3945bc..e7107cd4be 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala @@ -4,14 +4,16 @@ package akka.cluster +import java.util.concurrent.atomic.AtomicReference + +import scala.collection.immutable.SortedSet +import scala.concurrent.duration._ + +import akka.actor.Actor +import akka.actor.Props import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ -import scala.collection.immutable.SortedSet -import java.util.concurrent.atomic.AtomicReference -import akka.actor.Props -import akka.actor.Actor object NodeUpMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -25,8 +27,8 @@ class NodeUpMultiJvmNode2 extends NodeUpSpec abstract class NodeUpSpec extends MultiNodeSpec(NodeUpMultiJvmSpec) with MultiNodeClusterSpec { - import NodeUpMultiJvmSpec._ import ClusterEvent._ + import NodeUpMultiJvmSpec._ "A cluster node that is joining another cluster" must { "not be able to join a node that is not a cluster member" in { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala index a7be1b4d48..21ce92f9fe 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala @@ -6,13 +6,14 @@ package akka.cluster import java.util.concurrent.ThreadLocalRandom +import scala.collection.immutable +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.{ ActorSystem, Address } import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.collection.immutable -import scala.concurrent.duration._ // This test was a reproducer for issue #20639 object QuickRestartMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala index 3c152997c6..ba6e60b3ff 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala @@ -4,6 +4,9 @@ package akka.cluster +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.ScalaFutures + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.AddressFromURIString @@ -17,8 +20,6 @@ import akka.remote.RemoteWatcher.Heartbeat import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit.ImplicitSender -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.ScalaFutures class ClusterRemoteFeaturesConfig(artery: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala index 9d428e1f4c..06fb8875aa 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala @@ -4,21 +4,22 @@ package akka.cluster -import language.postfixOps import scala.collection.immutable +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + +import akka.actor.Actor +import akka.actor.ActorSystem +import akka.actor.Address +import akka.actor.Deploy +import akka.actor.Props +import akka.actor.RootActorPath +import akka.cluster.MemberStatus._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ - -import scala.concurrent.duration._ -import akka.actor.Address -import akka.actor.ActorSystem -import akka.actor.Props -import akka.actor.Actor -import akka.actor.RootActorPath -import akka.cluster.MemberStatus._ -import akka.actor.Deploy import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala index 5163808f13..5b9277e340 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode2Spec.scala @@ -7,6 +7,8 @@ package akka.cluster import scala.collection.immutable import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorSystem import akka.actor.Address @@ -17,7 +19,6 @@ import akka.cluster.MemberStatus._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import com.typesafe.config.ConfigFactory import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala index db751e7039..8bc342cf0a 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala @@ -6,6 +6,9 @@ package akka.cluster import scala.collection.immutable import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorSystem import akka.actor.Address @@ -17,7 +20,6 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import com.typesafe.config.ConfigFactory import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala index 2fb0a2dfd4..06f3e88fb2 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNodeSpec.scala @@ -7,6 +7,8 @@ package akka.cluster import scala.collection.immutable import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.Done import akka.actor.Actor import akka.actor.ActorIdentity @@ -22,7 +24,6 @@ import akka.cluster.MemberStatus._ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import com.typesafe.config.ConfigFactory import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala index 938f1a4275..dc7f760e70 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala @@ -10,17 +10,19 @@ import java.util.function.Consumer import scala.annotation.tailrec import scala.util.control.NonFatal + +import com.typesafe.config.ConfigFactory +import io.aeron.CommonContext +import io.aeron.driver.MediaDriver +import io.aeron.driver.ThreadingMode +import org.agrona.IoUtil + import akka.remote.RemoteSettings import akka.remote.artery.ArterySettings import akka.remote.artery.ArterySettings.AeronUpd import akka.remote.artery.aeron.TaskRunner import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import com.typesafe.config.ConfigFactory -import io.aeron.driver.MediaDriver -import io.aeron.driver.ThreadingMode -import org.agrona.IoUtil -import io.aeron.CommonContext object SharedMediaDriverSupport { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala index a2136f71a2..b1bf24b278 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SingletonClusterSpec.scala @@ -4,13 +4,15 @@ package akka.cluster -import akka.actor.Address +import scala.collection.immutable +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + +import akka.actor.Address import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import scala.concurrent.duration._ -import scala.collection.immutable final case class SingletonClusterMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala index 84601b3fb0..cb80356555 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SplitBrainSpec.scala @@ -4,15 +4,16 @@ package akka.cluster -import language.postfixOps +import scala.concurrent.duration._ +import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit._ -import scala.concurrent.duration._ -import scala.concurrent.duration._ import akka.remote.transport.ThrottlerTransportAdapter.Direction +import akka.testkit._ final case class SplitBrainMultiNodeConfig(failureDetectorPuppet: Boolean) extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala index 479f6c51c4..551a34c63c 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StreamRefSpec.scala @@ -4,6 +4,13 @@ package akka.cluster +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.Failure +import scala.util.Success + +import com.typesafe.config.ConfigFactory + import akka.Done import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, Identify, Props } import akka.remote.testkit.MultiNodeConfig @@ -21,12 +28,6 @@ import akka.stream.scaladsl.StreamRefs import akka.stream.testkit.TestSubscriber import akka.stream.testkit.scaladsl.TestSink import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.Failure -import scala.util.Success import akka.util.JavaDurationConverters._ object StreamRefSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala index 4b422bcd5d..14591ebf83 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala @@ -4,21 +4,26 @@ package akka.cluster -import language.postfixOps +import java.lang.management.ManagementFactory +import java.util.concurrent.ThreadLocalRandom + import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ -import java.util.concurrent.ThreadLocalRandom -import org.scalatest.BeforeAndAfterEach import com.typesafe.config.Config import com.typesafe.config.ConfigFactory +import language.postfixOps +import org.scalatest.BeforeAndAfterEach + import akka.actor.Actor +import akka.actor.ActorIdentity import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.Address import akka.actor.Deploy +import akka.actor.Identify import akka.actor.OneForOneStrategy import akka.actor.Props import akka.actor.RootActorPath @@ -29,20 +34,16 @@ import akka.cluster.ClusterEvent.CurrentInternalStats import akka.cluster.ClusterEvent.MemberEvent import akka.remote.DefaultFailureDetectorRegistry import akka.remote.PhiAccrualFailureDetector +import akka.remote.RARP import akka.remote.RemoteScope +import akka.remote.artery.ArterySettings.AeronUpd import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.routing.FromConfig import akka.testkit._ import akka.testkit.TestEvent._ -import akka.actor.Identify -import akka.actor.ActorIdentity import akka.util.Helpers.ConfigOps import akka.util.Helpers.Requiring -import java.lang.management.ManagementFactory - -import akka.remote.RARP -import akka.remote.artery.ArterySettings.AeronUpd /** * This test is intended to be used as long running stress test diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala index 13792c4643..480817662b 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala @@ -4,14 +4,17 @@ package akka.cluster +import java.util.concurrent.atomic.AtomicReference + +import scala.collection.immutable.SortedSet + import com.typesafe.config.ConfigFactory + +import akka.actor.Actor +import akka.actor.Props import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import java.util.concurrent.atomic.AtomicReference -import scala.collection.immutable.SortedSet -import akka.actor.Props -import akka.actor.Actor object SunnyWeatherMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -42,9 +45,8 @@ class SunnyWeatherMultiJvmNode5 extends SunnyWeatherSpec abstract class SunnyWeatherSpec extends MultiNodeSpec(SunnyWeatherMultiJvmSpec) with MultiNodeClusterSpec { - import SunnyWeatherMultiJvmSpec._ - import ClusterEvent._ + import SunnyWeatherMultiJvmSpec._ "A normal cluster" must { "be healthy" taggedAs LongRunningTest in { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala index c482cbc7c0..ffd1b60ea5 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/SurviveNetworkInstabilitySpec.scala @@ -7,6 +7,9 @@ package akka.cluster import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Address @@ -21,8 +24,6 @@ import akka.remote.testkit.MultiNodeSpec import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.serialization.jackson.CborSerializable import akka.testkit._ -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory object SurviveNetworkInstabilityMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala index 18d2c4e8f5..ee1f98ef9c 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/TransitionSpec.scala @@ -4,16 +4,16 @@ package akka.cluster +import InternalClusterAction._ +import MemberStatus._ +import com.typesafe.config.ConfigFactory import language.implicitConversions -import com.typesafe.config.ConfigFactory +import akka.actor.Address +import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.testkit._ -import akka.actor.Address -import akka.remote.testconductor.RoleName -import MemberStatus._ -import InternalClusterAction._ object TransitionMultiJvmSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala index c3fd52208c..76a817e01e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala @@ -4,21 +4,23 @@ package akka.cluster -import language.postfixOps import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem +import akka.actor.Props +import akka.cluster.MultiNodeClusterSpec.EndActor +import akka.remote.RARP 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.actor.Props -import akka.cluster.MultiNodeClusterSpec.EndActor -import akka.remote.RARP import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala index 72e2961f15..e35e283851 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingGroupSpec.scala @@ -4,16 +4,16 @@ package akka.cluster.routing +import scala.concurrent.Await + import akka.actor.{ Actor, ActorRef, Props } import akka.cluster.MultiNodeClusterSpec import akka.pattern.ask import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec } -import akka.routing.ConsistentHashingRouter.ConsistentHashMapping import akka.routing.{ Broadcast, ConsistentHashingGroup, GetRoutees, Routees } +import akka.routing.ConsistentHashingRouter.ConsistentHashMapping import akka.testkit._ -import scala.concurrent.Await - object ClusterConsistentHashingGroupMultiJvmSpec extends MultiNodeConfig { // using Java serialization because of `Any` in `Collected` (don't want to spend time on rewriting test) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala index b258d151e8..e29cfe5fb5 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterConsistentHashingRouterSpec.scala @@ -5,7 +5,9 @@ package akka.cluster.routing import scala.concurrent.Await + import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Address @@ -14,14 +16,14 @@ import akka.cluster.MultiNodeClusterSpec import akka.pattern.ask import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.routing.ConsistentHashingRouter.ConsistentHashMapping -import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope -import akka.routing.GetRoutees -import akka.routing.FromConfig -import akka.testkit._ import akka.routing.ActorRefRoutee import akka.routing.ConsistentHashingPool +import akka.routing.ConsistentHashingRouter.ConsistentHashMapping +import akka.routing.ConsistentHashingRouter.ConsistentHashableEnvelope +import akka.routing.FromConfig +import akka.routing.GetRoutees import akka.routing.Routees +import akka.testkit._ object ClusterConsistentHashingRouterMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala index 39a0f4a413..8bae8bd06c 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/ClusterRoundRobinSpec.scala @@ -4,10 +4,12 @@ package akka.cluster.routing -import language.postfixOps import scala.concurrent.Await import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Address @@ -17,15 +19,15 @@ import akka.cluster.MultiNodeClusterSpec import akka.pattern.ask import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit._ import akka.remote.transport.ThrottlerTransportAdapter.Direction -import akka.routing.FromConfig -import akka.routing.RoundRobinPool import akka.routing.ActorRefRoutee import akka.routing.ActorSelectionRoutee -import akka.routing.RoutedActorRef +import akka.routing.FromConfig import akka.routing.GetRoutees +import akka.routing.RoundRobinPool +import akka.routing.RoutedActorRef import akka.routing.Routees +import akka.testkit._ object ClusterRoundRobinMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala index 9752dc1d20..85ea845277 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/routing/UseRoleIgnoredSpec.scala @@ -4,6 +4,12 @@ package akka.cluster.routing +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.cluster.MultiNodeClusterSpec import akka.pattern.ask @@ -13,14 +19,9 @@ import akka.routing.GetRoutees import akka.routing.RoundRobinGroup import akka.routing.RoundRobinPool import akka.routing.Routees +import akka.testkit._ import akka.testkit.DefaultTimeout import akka.testkit.ImplicitSender -import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.language.postfixOps object UseRoleIgnoredMultiJvmSpec extends MultiNodeConfig { diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala index 3bb7ab571d..718ce9ab69 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala @@ -4,16 +4,17 @@ package akka.cluster -import language.postfixOps import scala.concurrent.duration._ -import com.typesafe.config.ConfigFactory -import akka.testkit.AkkaSpec -import akka.dispatch.Dispatchers -import akka.remote.PhiAccrualFailureDetector -import akka.util.Helpers.ConfigOps -import akka.actor.Address import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import language.postfixOps + +import akka.actor.Address +import akka.dispatch.Dispatchers +import akka.remote.PhiAccrualFailureDetector +import akka.testkit.AkkaSpec +import akka.util.Helpers.ConfigOps @silent class ClusterConfigSpec extends AkkaSpec { diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala index 6e8966d5a5..99519e7e18 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDeployerSpec.scala @@ -4,14 +4,15 @@ package akka.cluster -import akka.testkit._ -import akka.actor._ -import akka.routing._ import com.typesafe.config._ -import akka.cluster.routing.ClusterRouterPool + +import akka.actor._ import akka.cluster.routing.ClusterRouterGroup -import akka.cluster.routing.ClusterRouterPoolSettings import akka.cluster.routing.ClusterRouterGroupSettings +import akka.cluster.routing.ClusterRouterPool +import akka.cluster.routing.ClusterRouterPoolSettings +import akka.routing._ +import akka.testkit._ object ClusterDeployerSpec { val deployerConf = ConfigFactory.parseString( diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala index e593a1dbb6..098d29d161 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala @@ -5,19 +5,21 @@ package akka.cluster import scala.collection.immutable.SortedSet + import org.scalatest.BeforeAndAfterEach + +import akka.actor.ActorRef import akka.actor.Address import akka.actor.PoisonPill import akka.actor.Props -import akka.cluster.MemberStatus._ -import akka.cluster.InternalClusterAction._ import akka.cluster.ClusterEvent._ +import akka.cluster.ClusterSettings.DefaultDataCenter +import akka.cluster.InternalClusterAction._ +import akka.cluster.MemberStatus._ +import akka.remote.RARP import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import akka.actor.ActorRef -import akka.remote.RARP import akka.testkit.TestProbe -import akka.cluster.ClusterSettings.DefaultDataCenter object ClusterDomainEventPublisherSpec { val config = """ diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala index f56516eca5..3b9d5522dd 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala @@ -4,16 +4,17 @@ package akka.cluster -import akka.actor.Address - import scala.collection.immutable.SortedSet + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address + class ClusterDomainEventSpec extends AnyWordSpec with Matchers { - import MemberStatus._ import ClusterEvent._ + import MemberStatus._ val aRoles = Set("AA", "AB") val aJoining = TestMember(Address("akka", "sys", "a", 2552), Joining, aRoles) diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala index 8a0b6608c5..1d3103a2b6 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala @@ -4,13 +4,15 @@ package akka.cluster -import akka.actor.Address -import akka.remote.FailureDetector -import akka.remote.DefaultFailureDetectorRegistry import java.util.concurrent.ThreadLocalRandom + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address +import akka.remote.DefaultFailureDetectorRegistry +import akka.remote.FailureDetector + object ClusterHeartbeatSenderStateSpec { class FailureDetectorStub extends FailureDetector { diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala index 230b518e0d..219358af5e 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterLogSpec.scala @@ -4,9 +4,10 @@ package akka.cluster +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor.{ Address, ExtendedActorSystem } import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender } -import com.typesafe.config.{ Config, ConfigFactory } object ClusterLogSpec { val config = """ diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala index d4a90f3dd8..616b836d6b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala @@ -6,13 +6,19 @@ package akka.cluster import java.lang.management.ManagementFactory +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import javax.management.ObjectName + import akka.actor.ActorSystem import akka.actor.Address import akka.actor.CoordinatedShutdown import akka.actor.ExtendedActorSystem import akka.actor.Props -import akka.cluster.ClusterEvent.MemberEvent import akka.cluster.ClusterEvent._ +import akka.cluster.ClusterEvent.MemberEvent import akka.cluster.InternalClusterAction._ import akka.stream.Materializer import akka.stream.scaladsl.Sink @@ -21,11 +27,6 @@ import akka.stream.scaladsl.StreamRefs import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory -import javax.management.ObjectName - -import scala.concurrent.Await -import scala.concurrent.duration._ object ClusterSpec { val config = """ diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala index dce65ffc76..afa5ac90d0 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterTestKit.scala @@ -4,13 +4,14 @@ package akka.cluster +import scala.concurrent.duration.{ FiniteDuration, _ } +import scala.util.Random + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor.ActorSystem import akka.cluster.MemberStatus.Removed import akka.testkit.{ AkkaSpec, TestKitBase } -import com.typesafe.config.{ Config, ConfigFactory } - -import scala.concurrent.duration.{ FiniteDuration, _ } -import scala.util.Random /** * Builds on TestKitBase to provide some extra utilities to run cluster test. diff --git a/akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala b/akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala index 5124357aee..032ef93816 100644 --- a/akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/CrossDcHeartbeatSenderSpec.scala @@ -4,14 +4,14 @@ package akka.cluster +import scala.collection.immutable.SortedSet + import akka.actor.{ ActorSelection, Address, Props } import akka.cluster.ClusterEvent.CurrentClusterState import akka.cluster.ClusterHeartbeatSender.Heartbeat import akka.cluster.CrossDcHeartbeatSenderSpec.TestCrossDcHeartbeatSender import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import scala.collection.immutable.SortedSet - object CrossDcHeartbeatSenderSpec { class TestCrossDcHeartbeatSender(probe: TestProbe) extends CrossDcHeartbeatSender { // disable register for cluster events diff --git a/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala b/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala index 0bca5b5be3..57ae2c55b2 100644 --- a/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/DowningProviderSpec.scala @@ -8,15 +8,16 @@ import java.util.concurrent.atomic.AtomicBoolean import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.ConfigurationException import akka.actor.ActorSystem import akka.actor.Props import akka.testkit.TestKit.awaitCond import akka.testkit.TestKit.shutdownActorSystem import akka.util.unused -import com.typesafe.config.ConfigFactory -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class FailingDowningProvider(@unused system: ActorSystem) extends DowningProvider { override val downRemovalMargin: FiniteDuration = 20.seconds diff --git a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala index fba68c2c9e..8667b84f29 100644 --- a/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala +++ b/akka-cluster/src/test/scala/akka/cluster/FailureDetectorPuppet.scala @@ -6,9 +6,10 @@ package akka.cluster import java.util.concurrent.atomic.AtomicReference -import akka.remote.FailureDetector import com.typesafe.config.Config + import akka.event.EventStream +import akka.remote.FailureDetector import akka.util.unused /** diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala index 34159b3106..b955604086 100644 --- a/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala @@ -4,14 +4,15 @@ package akka.cluster -import akka.actor.Address -import akka.cluster.Gossip.vclockName -import akka.cluster.ClusterSettings.DefaultDataCenter - import scala.collection.immutable.SortedSet + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address +import akka.cluster.ClusterSettings.DefaultDataCenter +import akka.cluster.Gossip.vclockName + class GossipSpec extends AnyWordSpec with Matchers { import MemberStatus._ diff --git a/akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala index 80c99d8462..c23b91797b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/GossipTargetSelectorSpec.scala @@ -4,14 +4,15 @@ package akka.cluster +import scala.collection.immutable.SortedSet + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.ClusterSettings.DataCenter import akka.cluster.MemberStatus.Up -import scala.collection.immutable.SortedSet -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec - class GossipTargetSelectorSpec extends AnyWordSpec with Matchers { val aDc1 = TestMember(Address("akka", "sys", "a", 2552), Up, Set.empty, dataCenter = "dc1") diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala index e2d7249385..3b5539338b 100644 --- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingPerfSpec.scala @@ -4,10 +4,11 @@ package akka.cluster -import akka.actor.Address import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address + class HeartbeatNodeRingPerfSpec extends AnyWordSpec with Matchers { val nodesSize = sys.props.get("akka.cluster.HeartbeatNodeRingPerfSpec.nodesSize").getOrElse("250").toInt diff --git a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala index e476b92b42..8ce7ffe82f 100644 --- a/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/HeartbeatNodeRingSpec.scala @@ -4,10 +4,11 @@ package akka.cluster -import akka.actor.Address import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address + class HeartbeatNodeRingSpec extends AnyWordSpec with Matchers { val aa = UniqueAddress(Address("akka", "sys", "aa", 2552), 1L) diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala index 0c31127928..8e96959458 100644 --- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala @@ -4,11 +4,12 @@ package akka.cluster -import scala.concurrent.duration._ import scala.collection.{ immutable => im } +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } import akka.testkit.LongRunningTest -import com.typesafe.config.{ Config, ConfigFactory } object JoinConfigCompatCheckerRollingUpdateSpec { diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala index 86cfc5359a..e9180db302 100644 --- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatCheckerSpec.scala @@ -4,11 +4,12 @@ package akka.cluster -import akka.testkit.{ AkkaSpec, LongRunningTest } +import scala.collection.{ immutable => im } +import scala.concurrent.duration._ + import com.typesafe.config.{ Config, ConfigFactory } -import scala.concurrent.duration._ -import scala.collection.{ immutable => im } +import akka.testkit.{ AkkaSpec, LongRunningTest } object JoinConfigCompatCheckerSpec { diff --git a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala index 8adf879554..9bfe9ed39e 100644 --- a/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/JoinConfigCompatPreDefinedChecksSpec.scala @@ -4,9 +4,9 @@ package akka.cluster -import com.typesafe.config.{ Config, ConfigFactory } - import scala.collection.{ immutable => im } + +import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala index 33bc9eab7c..86abcd3651 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala @@ -4,15 +4,17 @@ package akka.cluster -import akka.actor.{ Address, AddressFromURIString } import scala.collection.immutable.SortedSet import scala.util.Random + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.{ Address, AddressFromURIString } + class MemberOrderingSpec extends AnyWordSpec with Matchers { - import Member.ordering import Member.addressOrdering + import Member.ordering import MemberStatus._ def m(address: Address, status: MemberStatus): Member = TestMember(address, status) diff --git a/akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala b/akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala index ed817f162e..4a454efd21 100644 --- a/akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/MembershipStateSpec.scala @@ -4,13 +4,14 @@ package akka.cluster -import akka.actor.Address -import akka.cluster.MemberStatus.Up - import scala.collection.immutable.SortedSet + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address +import akka.cluster.MemberStatus.Up + class MembershipStateSpec extends AnyWordSpec with Matchers { // DC-a is in reverse age order val a1 = TestMember(Address("akka", "sys", "a4", 2552), Up, 1, "dc-a") diff --git a/akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala index 171303c7a8..d534e34fb5 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ReachabilityPerfSpec.scala @@ -4,11 +4,12 @@ package akka.cluster -import akka.actor.Address import com.github.ghik.silencer.silent import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address + class ReachabilityPerfSpec extends AnyWordSpec with Matchers { val nodesSize = sys.props.get("akka.cluster.ReachabilityPerfSpec.nodesSize").getOrElse("250").toInt diff --git a/akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala b/akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala index 699183ba77..c0c18146fd 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ReachabilitySpec.scala @@ -4,10 +4,11 @@ package akka.cluster -import akka.actor.Address import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address + class ReachabilitySpec extends AnyWordSpec with Matchers { import Reachability.{ Reachable, Record, Terminated, Unreachable } diff --git a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala b/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala index 46682e1e72..81c964d9c1 100644 --- a/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/StartupWithOneThreadSpec.scala @@ -5,12 +5,13 @@ package akka.cluster import scala.concurrent.duration._ -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import akka.actor.Address -import akka.actor.Props + import akka.actor.Actor import akka.actor.ActorLogging +import akka.actor.Address +import akka.actor.Props +import akka.testkit.AkkaSpec +import akka.testkit.ImplicitSender object StartupWithOneThreadSpec { val config = """ diff --git a/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala b/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala index 0c3eb6a330..854022a99d 100644 --- a/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/VectorClockPerfSpec.scala @@ -5,6 +5,7 @@ package akka.cluster import scala.collection.immutable.{ SortedSet, TreeMap } + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala b/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala index a18b4e3375..efb8259de3 100644 --- a/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/VectorClockSpec.scala @@ -4,9 +4,10 @@ package akka.cluster -import akka.testkit.AkkaSpec import scala.collection.immutable.TreeMap +import akka.testkit.AkkaSpec + class VectorClockSpec extends AkkaSpec { import VectorClock._ diff --git a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala b/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala index 957dee214c..e727a47c0e 100644 --- a/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/protobuf/ClusterMessageSerializerSpec.scala @@ -4,16 +4,16 @@ package akka.cluster.protobuf -import akka.cluster._ +import collection.immutable.SortedSet +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.{ Address, ExtendedActorSystem } +import akka.cluster._ import akka.cluster.InternalClusterAction.CompatibleConfig import akka.cluster.routing.{ ClusterRouterPool, ClusterRouterPoolSettings } import akka.routing.RoundRobinPool - -import collection.immutable.SortedSet import akka.testkit.AkkaSpec -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory @silent class ClusterMessageSerializerSpec extends AkkaSpec("akka.actor.provider = cluster") { diff --git a/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala b/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala index 99011070af..08f1fa7813 100644 --- a/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/routing/ClusterRouterSupervisorSpec.scala @@ -4,10 +4,10 @@ package akka.cluster.routing -import akka.testkit._ import akka.actor._ -import akka.routing.RoundRobinPool import akka.actor.OneForOneStrategy +import akka.routing.RoundRobinPool +import akka.testkit._ object ClusterRouterSupervisorSpec { diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala index 04d42dc940..23485c29f9 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala @@ -4,11 +4,11 @@ package akka.coordination.lease +import scala.concurrent.duration.FiniteDuration + import akka.util.JavaDurationConverters._ import akka.util.PrettyDuration._ -import scala.concurrent.duration.FiniteDuration - final class LeaseUsageSettings private[akka] (val leaseImplementation: String, val leaseRetryInterval: FiniteDuration) { def getLeaseRetryInterval(): java.time.Duration = leaseRetryInterval.asJava diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala b/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala index 81b57642b7..16297c5d3e 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala @@ -4,10 +4,12 @@ package akka.coordination.lease -import com.typesafe.config.{ Config, ConfigValueType } -import akka.util.JavaDurationConverters._ import scala.concurrent.duration._ +import com.typesafe.config.{ Config, ConfigValueType } + +import akka.util.JavaDurationConverters._ + object TimeoutSettings { def apply(config: Config): TimeoutSettings = { val heartBeatTimeout = config.getDuration("heartbeat-timeout").asScala diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala b/akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala index 2d4f4a7df1..02cc582f50 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/internal/LeaseAdapter.scala @@ -8,16 +8,16 @@ import java.util.Optional import java.util.concurrent.CompletionStage import java.util.function.Consumer -import akka.annotation.InternalApi -import akka.coordination.lease.LeaseSettings -import akka.coordination.lease.scaladsl.{ Lease => ScalaLease } -import akka.coordination.lease.javadsl.{ Lease => JavaLease } - import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ import scala.concurrent.ExecutionContext import scala.concurrent.Future +import akka.annotation.InternalApi +import akka.coordination.lease.LeaseSettings +import akka.coordination.lease.javadsl.{ Lease => JavaLease } +import akka.coordination.lease.scaladsl.{ Lease => ScalaLease } + /** * INTERNAL API */ diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala b/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala index d774d00cf6..18029287f8 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala @@ -4,8 +4,8 @@ package akka.coordination.lease.javadsl -import akka.actor.ClassicActorSystemProvider import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } +import akka.actor.ClassicActorSystemProvider import akka.coordination.lease.internal.LeaseAdapter import akka.coordination.lease.internal.LeaseAdapterToScala import akka.coordination.lease.scaladsl.{ LeaseProvider => ScalaLeaseProvider } diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala index c07b37ea24..d170b51d21 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala @@ -4,10 +4,10 @@ package akka.coordination.lease.scaladsl -import akka.coordination.lease.LeaseSettings - import scala.concurrent.Future +import akka.coordination.lease.LeaseSettings + abstract class Lease(val settings: LeaseSettings) { /** diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala index d9de061bec..45a5e5a51c 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala @@ -8,18 +8,18 @@ import java.util.concurrent.ConcurrentHashMap import java.util.function.{ Function => JFunction } import scala.collection.immutable +import scala.reflect.ClassTag import scala.util.{ Failure, Success, Try } + import akka.actor.ActorSystem import akka.actor.ClassicActorSystemProvider import akka.actor.ExtendedActorSystem import akka.actor.Extension import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider -import akka.event.Logging import akka.coordination.lease.LeaseSettings import akka.coordination.lease.internal.LeaseAdapterToScala - -import scala.reflect.ClassTag +import akka.event.Logging object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider { override def get(system: ActorSystem): LeaseProvider = super.get(system) diff --git a/akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala b/akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala index a76b8173a2..27b6409b69 100644 --- a/akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala +++ b/akka-coordination/src/test/scala/akka/coordination/lease/TimeoutSettingsSpec.scala @@ -4,9 +4,9 @@ package akka.coordination.lease -import com.typesafe.config.ConfigFactory - import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala b/akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala index 0a7d391288..19ee98c2a3 100644 --- a/akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala +++ b/akka-coordination/src/test/scala/akka/coordination/lease/scaladsl/LeaseProviderSpec.scala @@ -5,12 +5,13 @@ package akka.coordination.lease.scaladsl import scala.concurrent.Future +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.ExtendedActorSystem import akka.coordination.lease.LeaseSettings import akka.testkit.{ AkkaSpec, EventFilter } -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object LeaseProviderSpec { class LeaseA(settings: LeaseSettings) extends Lease(settings) { diff --git a/akka-discovery/src/main/scala/akka/discovery/Discovery.scala b/akka-discovery/src/main/scala/akka/discovery/Discovery.scala index 380a0c6f61..822d6600b9 100644 --- a/akka-discovery/src/main/scala/akka/discovery/Discovery.scala +++ b/akka-discovery/src/main/scala/akka/discovery/Discovery.scala @@ -7,11 +7,11 @@ package akka.discovery import java.util.concurrent.ConcurrentHashMap import java.util.function.{ Function => JFunction } +import scala.util.{ Failure, Success, Try } + import akka.actor._ import akka.annotation.InternalApi -import scala.util.{ Failure, Success, Try } - final class Discovery(implicit system: ExtendedActorSystem) extends Extension { Discovery.checkClassPathForOldDiscovery(system) diff --git a/akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala b/akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala index 9dc955f6a4..96557bee21 100644 --- a/akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala +++ b/akka-discovery/src/main/scala/akka/discovery/ServiceDiscovery.scala @@ -13,6 +13,7 @@ import scala.collection.immutable import scala.compat.java8.OptionConverters._ import scala.concurrent.Future import scala.concurrent.duration.FiniteDuration + import akka.actor.{ DeadLetterSuppression, NoSerializationVerificationNeeded } import akka.util.HashCode diff --git a/akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala b/akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala index 3866832f6f..ced8bb91a1 100644 --- a/akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala +++ b/akka-discovery/src/main/scala/akka/discovery/aggregate/AggregateServiceDiscovery.scala @@ -4,20 +4,21 @@ package akka.discovery.aggregate -import akka.actor.ExtendedActorSystem -import akka.annotation.InternalApi -import akka.discovery.ServiceDiscovery.Resolved -import akka.discovery.aggregate.AggregateServiceDiscovery.Methods -import akka.discovery.{ Discovery, Lookup, ServiceDiscovery } -import akka.event.Logging -import akka.util.Helpers.Requiring -import com.typesafe.config.Config - -import akka.util.ccompat.JavaConverters._ import scala.concurrent.Future import scala.concurrent.duration.FiniteDuration import scala.util.control.NonFatal + +import com.typesafe.config.Config + +import akka.actor.ExtendedActorSystem +import akka.annotation.InternalApi +import akka.discovery.{ Discovery, Lookup, ServiceDiscovery } +import akka.discovery.ServiceDiscovery.Resolved +import akka.discovery.aggregate.AggregateServiceDiscovery.Methods import akka.dispatch.MessageDispatcher +import akka.event.Logging +import akka.util.Helpers.Requiring +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API 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 80e03e6ced..caaf2e84cf 100644 --- a/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala +++ b/akka-discovery/src/main/scala/akka/discovery/config/ConfigServiceDiscovery.scala @@ -4,16 +4,17 @@ package akka.discovery.config +import scala.concurrent.Future +import scala.concurrent.duration.FiniteDuration + +import com.typesafe.config.Config + import akka.actor.ExtendedActorSystem import akka.annotation.InternalApi import akka.discovery.{ Lookup, ServiceDiscovery } import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } import akka.event.Logging -import com.typesafe.config.Config - import akka.util.ccompat.JavaConverters._ -import scala.concurrent.Future -import scala.concurrent.duration.FiniteDuration /** * INTERNAL API diff --git a/akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala b/akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala index a15a66a31e..472a7b1462 100644 --- a/akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala +++ b/akka-discovery/src/main/scala/akka/discovery/dns/DnsServiceDiscovery.scala @@ -6,31 +6,29 @@ package akka.discovery.dns import java.net.InetAddress -import akka.actor.ActorRef - -import scala.concurrent.duration._ -import akka.actor.ExtendedActorSystem -import akka.annotation.InternalApi -import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } -import akka.event.Logging -import akka.io.{ Dns, IO } -import akka.pattern.ask - -import scala.concurrent.Future -import scala.concurrent.duration.FiniteDuration -import akka.discovery._ -import akka.io.SimpleDnsCache -import akka.io.dns.DnsProtocol.{ Ip, Srv } -import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord } - import scala.collection.{ immutable => im } +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.concurrent.duration.FiniteDuration import scala.util.Failure import scala.util.Success + +import akka.actor.ActorRef +import akka.actor.ExtendedActorSystem +import akka.annotation.InternalApi +import akka.discovery._ +import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } +import akka.dispatch.MessageDispatcher +import akka.event.Logging +import akka.io.{ Dns, IO } +import akka.io.SimpleDnsCache +import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord } +import akka.io.dns.DnsProtocol.{ Ip, Srv } import akka.io.dns.internal.AsyncDnsManager import akka.pattern.AskTimeoutException +import akka.pattern.ask import akka.util.OptionVal import akka.util.Timeout -import akka.dispatch.MessageDispatcher /** * INTERNAL API @@ -71,7 +69,6 @@ private object DnsServiceDiscovery { private[akka] class DnsServiceDiscovery(system: ExtendedActorSystem) extends ServiceDiscovery { import DnsServiceDiscovery._ - import ServiceDiscovery._ private val log = Logging(system, getClass) diff --git a/akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala b/akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala index 64aa1e393f..4f17e084b1 100644 --- a/akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala +++ b/akka-discovery/src/test/scala/akka/discovery/DiscoveryConfigurationSpec.scala @@ -6,13 +6,15 @@ package akka.discovery import scala.concurrent.Future import scala.concurrent.duration.FiniteDuration -import akka.actor.ActorSystem -import akka.discovery.ServiceDiscovery.Resolved -import akka.testkit.TestKit + import com.typesafe.config.ConfigFactory import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem +import akka.discovery.ServiceDiscovery.Resolved +import akka.testkit.TestKit + class DiscoveryConfigurationSpec extends AnyWordSpec with Matchers { "ServiceDiscovery" should { diff --git a/akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala b/akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala index 7b7d4e73c0..1e07ca4428 100644 --- a/akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala +++ b/akka-discovery/src/test/scala/akka/discovery/aggregate/AggregateServiceDiscoverySpec.scala @@ -4,21 +4,22 @@ package akka.discovery.aggregate -import akka.actor.{ ActorSystem, ExtendedActorSystem } -import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } -import akka.discovery.{ Discovery, Lookup, ServiceDiscovery } -import akka.testkit.TestKit -import akka.util.unused -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.concurrent.ScalaFutures -import org.scalatest.BeforeAndAfterAll - +import scala.collection.immutable import scala.concurrent.Future import scala.concurrent.duration._ -import scala.collection.immutable + +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.BeforeAndAfterAll +import org.scalatest.concurrent.ScalaFutures import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.{ ActorSystem, ExtendedActorSystem } +import akka.discovery.{ Discovery, Lookup, ServiceDiscovery } +import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } +import akka.testkit.TestKit +import akka.util.unused + class StubbedServiceDiscovery(@unused system: ExtendedActorSystem) extends ServiceDiscovery { override def lookup(query: Lookup, resolveTimeout: FiniteDuration): Future[Resolved] = { diff --git a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala b/akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala index ea9ae725ce..cc12c5c256 100644 --- a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala +++ b/akka-discovery/src/test/scala/akka/discovery/config/ConfigServiceDiscoverySpec.scala @@ -4,18 +4,19 @@ package akka.discovery.config +import scala.collection.immutable +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.BeforeAndAfterAll +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorSystem import akka.discovery.Discovery import akka.discovery.ServiceDiscovery.ResolvedTarget import akka.testkit.TestKit -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.concurrent.ScalaFutures -import org.scalatest.BeforeAndAfterAll - -import scala.concurrent.duration._ -import scala.collection.immutable -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike object ConfigServiceDiscoverySpec { diff --git a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala b/akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala index e7560e1010..1fcb83d966 100644 --- a/akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala +++ b/akka-discovery/src/test/scala/akka/discovery/config/ConfigServicesParserSpec.scala @@ -4,14 +4,15 @@ package akka.discovery.config -import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } -import akka.discovery.config.ConfigServicesParserSpec._ -import com.typesafe.config.{ Config, ConfigFactory } - import scala.collection.immutable + +import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } +import akka.discovery.config.ConfigServicesParserSpec._ + object ConfigServicesParserSpec { val exampleConfig: Config = ConfigFactory.parseString(""" services { diff --git a/akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala b/akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala index 8eacff8f29..d497d42931 100644 --- a/akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala +++ b/akka-discovery/src/test/scala/akka/discovery/dns/DnsDiscoverySpec.scala @@ -6,15 +6,16 @@ package akka.discovery.dns import java.net.InetAddress +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSystem import akka.discovery.{ Discovery, Lookup } +import akka.discovery.ServiceDiscovery import akka.discovery.ServiceDiscovery.ResolvedTarget import akka.io.dns.DockerBindDnsService import akka.testkit.{ AkkaSpec, SocketUtil, TestKit } -import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ - -import akka.discovery.ServiceDiscovery object DnsDiscoverySpec { diff --git a/akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala b/akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala index 0e4d2ff9d1..0695e8f4f4 100644 --- a/akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala +++ b/akka-discovery/src/test/scala/akka/discovery/dns/DnsServiceDiscoverySpec.scala @@ -6,22 +6,23 @@ package akka.discovery.dns import java.net.{ Inet6Address, InetAddress } +import scala.collection.{ immutable => im } +import scala.concurrent.duration._ + +import org.scalatest.concurrent.ScalaFutures +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorRef import akka.actor.ExtendedActorSystem import akka.discovery import akka.discovery.ServiceDiscovery -import akka.discovery.ServiceDiscovery.DiscoveryTimeoutException import akka.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget } -import akka.io.dns.CachePolicy.Ttl +import akka.discovery.ServiceDiscovery.DiscoveryTimeoutException import akka.io.dns.{ AAAARecord, ARecord, DnsProtocol, SRVRecord } +import akka.io.dns.CachePolicy.Ttl import akka.testkit.AkkaSpec import akka.testkit.TestProbe -import org.scalatest.wordspec.AnyWordSpecLike -import org.scalatest.concurrent.ScalaFutures -import org.scalatest.matchers.should.Matchers - -import scala.collection.{ immutable => im } -import scala.concurrent.duration._ class DnsServiceDiscoverySpec extends AkkaSpec with AnyWordSpecLike with Matchers with ScalaFutures { diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala index 757efa32d4..4b38fea365 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/DurableStore.scala @@ -8,11 +8,17 @@ import java.io.File import java.nio.ByteBuffer import java.util.concurrent.TimeUnit -import akka.util.ccompat.JavaConverters._ import scala.concurrent.duration._ import scala.util.Try import scala.util.control.NonFatal +import com.typesafe.config.Config +import org.lmdbjava.Dbi +import org.lmdbjava.DbiFlags +import org.lmdbjava.Env +import org.lmdbjava.EnvFlags +import org.lmdbjava.Txn + import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorRef @@ -27,12 +33,7 @@ import akka.serialization.SerializationExtension import akka.serialization.SerializerWithStringManifest import akka.util.ByteString import akka.util.OptionVal -import com.typesafe.config.Config -import org.lmdbjava.DbiFlags -import org.lmdbjava.Env -import org.lmdbjava.EnvFlags -import org.lmdbjava.Txn -import org.lmdbjava.Dbi +import akka.util.ccompat.JavaConverters._ /** * An actor implementing the durable store for the Distributed Data `Replicator` @@ -112,8 +113,8 @@ object LmdbDurableStore { final class LmdbDurableStore(config: Config) extends Actor with ActorLogging { import DurableStore._ - import LmdbDurableStore.WriteBehind import LmdbDurableStore.Lmdb + import LmdbDurableStore.WriteBehind val serialization = SerializationExtension(context.system) val serializer = serialization.serializerFor(classOf[DurableDataEnvelope]).asInstanceOf[SerializerWithStringManifest] diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala index 016b79b29d..e242c585a8 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/GCounter.scala @@ -4,10 +4,11 @@ package akka.cluster.ddata +import java.math.BigInteger + +import akka.annotation.InternalApi import akka.cluster.Cluster import akka.cluster.UniqueAddress -import java.math.BigInteger -import akka.annotation.InternalApi object GCounter { val empty: GCounter = new GCounter diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala index 7da7fd803b..4a5b7b1225 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMap.scala @@ -4,13 +4,13 @@ package akka.cluster.ddata +import scala.collection.immutable + +import akka.annotation.InternalApi import akka.cluster.Cluster import akka.cluster.UniqueAddress -import akka.util.HashCode -import akka.annotation.InternalApi import akka.cluster.ddata.ORMap.ZeroTag - -import scala.collection.immutable +import akka.util.HashCode object ORMap { private val _empty: ORMap[Any, ReplicatedData] = new ORMap(ORSet.empty, Map.empty, VanillaORMapTag) diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala index deb50d6ec6..da6875fb90 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORMultiMap.scala @@ -5,8 +5,8 @@ package akka.cluster.ddata import akka.annotation.InternalApi -import akka.cluster.ddata.ORMap._ import akka.cluster.{ Cluster, UniqueAddress } +import akka.cluster.ddata.ORMap._ object ORMultiMap { diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala index a67ac0986f..affe898569 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala @@ -6,10 +6,11 @@ package akka.cluster.ddata import scala.annotation.tailrec import scala.collection.immutable + +import akka.annotation.InternalApi import akka.cluster.Cluster import akka.cluster.UniqueAddress import akka.util.{ unused, HashCode } -import akka.annotation.InternalApi object ORSet { private val _empty: ORSet[Any] = new ORSet(Map.empty, VersionVector.empty) diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala index 84965f82d6..dc93dd59a9 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/PNCounter.scala @@ -4,12 +4,12 @@ package akka.cluster.ddata -import akka.cluster.Cluster -import akka.cluster.UniqueAddress -import akka.util.HashCode import java.math.BigInteger import akka.annotation.InternalApi +import akka.cluster.Cluster +import akka.cluster.UniqueAddress +import akka.util.HashCode object PNCounter { val empty: PNCounter = new PNCounter(GCounter.empty, GCounter.empty) diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala index 506ff437ba..60e8904517 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/PruningState.scala @@ -5,9 +5,9 @@ package akka.cluster.ddata import akka.actor.Address +import akka.annotation.InternalApi import akka.cluster.Member import akka.cluster.UniqueAddress -import akka.annotation.InternalApi import akka.util.unused /** diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala index 3a2593f44e..503df856d4 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ReplicatedData.scala @@ -4,10 +4,12 @@ package akka.cluster.ddata -import akka.cluster.UniqueAddress -import scala.compat.java8.OptionConverters._ import java.util.Optional +import scala.compat.java8.OptionConverters._ + +import akka.cluster.UniqueAddress + /** * Interface for implementing a state based convergent * replicated data type (CvRDT). diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala index e58adaf5ce..21879dc47a 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/Replicator.scala @@ -5,66 +5,60 @@ package akka.cluster.ddata import java.security.MessageDigest +import java.util.Optional +import java.util.concurrent.ThreadLocalRandom +import java.util.concurrent.TimeUnit +import java.util.function.{ Function => JFunction } +import scala.annotation.varargs import scala.collection.immutable +import scala.collection.immutable.TreeSet import scala.collection.mutable import scala.concurrent.duration._ import scala.concurrent.duration.FiniteDuration -import java.util.concurrent.ThreadLocalRandom - import scala.util.Failure import scala.util.Success import scala.util.Try import scala.util.control.NoStackTrace +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config import akka.actor.Actor +import akka.actor.ActorInitializationException import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.ActorSelection import akka.actor.ActorSystem import akka.actor.Address -import akka.actor.NoSerializationVerificationNeeded +import akka.actor.Cancellable +import akka.actor.DeadLetterSuppression import akka.actor.Deploy +import akka.actor.ExtendedActorSystem +import akka.actor.NoSerializationVerificationNeeded +import akka.actor.OneForOneStrategy import akka.actor.Props import akka.actor.ReceiveTimeout +import akka.actor.SupervisorStrategy import akka.actor.Terminated +import akka.annotation.InternalApi import akka.cluster.Cluster import akka.cluster.ClusterEvent._ import akka.cluster.ClusterEvent.InitialStateAsEvents import akka.cluster.Member +import akka.cluster.MemberStatus import akka.cluster.UniqueAddress +import akka.cluster.ddata.DurableStore._ +import akka.cluster.ddata.Key.KeyId +import akka.cluster.ddata.Key.KeyR +import akka.dispatch.Dispatchers +import akka.event.Logging import akka.serialization.SerializationExtension import akka.util.ByteString -import com.typesafe.config.Config -import java.util.function.{ Function => JFunction } - -import akka.dispatch.Dispatchers -import akka.actor.DeadLetterSuppression -import akka.cluster.ddata.Key.KeyR -import java.util.Optional - -import akka.cluster.ddata.DurableStore._ -import akka.actor.ExtendedActorSystem -import akka.actor.SupervisorStrategy -import akka.actor.OneForOneStrategy -import akka.actor.ActorInitializationException -import java.util.concurrent.TimeUnit - import akka.util.Helpers.toRootLowerCase -import akka.actor.Cancellable -import scala.util.control.NonFatal - -import akka.cluster.ddata.Key.KeyId -import akka.annotation.InternalApi -import scala.collection.immutable.TreeSet - -import akka.cluster.MemberStatus -import scala.annotation.varargs - -import akka.event.Logging import akka.util.JavaDurationConverters._ import akka.util.ccompat._ -import com.github.ghik.silencer.silent @ccompatUsedUntil213 object ReplicatorSettings { @@ -1301,10 +1295,10 @@ object Replicator { */ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLogging { + import PruningState._ import Replicator._ import Replicator.Internal._ import Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder - import PruningState._ import settings._ val cluster = Cluster(context.system) @@ -2460,9 +2454,9 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog extends ReadWriteAggregator with ActorLogging { + import ReadWriteAggregator._ import Replicator._ import Replicator.Internal._ - import ReadWriteAggregator._ override def timeout: FiniteDuration = consistency.timeout @@ -2605,9 +2599,9 @@ final class Replicator(settings: ReplicatorSettings) extends Actor with ActorLog extends ReadWriteAggregator with ActorLogging { + import ReadWriteAggregator._ import Replicator._ import Replicator.Internal._ - import ReadWriteAggregator._ override def timeout: FiniteDuration = consistency.timeout diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala index dde0e94bed..75466e1a8f 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/VersionVector.scala @@ -5,11 +5,13 @@ package akka.cluster.ddata import java.util.concurrent.atomic.AtomicLong + import scala.annotation.tailrec import scala.collection.immutable.TreeMap + +import akka.annotation.InternalApi import akka.cluster.Cluster import akka.cluster.UniqueAddress -import akka.annotation.InternalApi /** * VersionVector module with helper classes and methods. diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala index e07c8bce9b..19da5d8a29 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializer.scala @@ -5,32 +5,32 @@ package akka.cluster.ddata.protobuf import java.{ util, lang => jl } +import java.io.NotSerializableException +import java.util import java.util.ArrayList import java.util.Collections import java.util.Comparator import scala.annotation.tailrec -import akka.util.ccompat.JavaConverters._ - import scala.collection.immutable + +import com.github.ghik.silencer.silent + +import akka.actor.ActorRef import akka.actor.ExtendedActorSystem import akka.cluster.ddata._ import akka.cluster.ddata.Replicator.Internal._ import akka.cluster.ddata.protobuf.msg.{ ReplicatedDataMessages => rd } import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm } -import akka.serialization.SerializerWithStringManifest -import akka.serialization.BaseSerializer -import akka.protobufv3.internal.{ ByteString, GeneratedMessageV3 } -import akka.util.ByteString.UTF_8 -import java.io.NotSerializableException -import java.util - -import com.github.ghik.silencer.silent -import akka.actor.ActorRef import akka.cluster.ddata.protobuf.msg.ReplicatorMessages.OtherMessage +import akka.protobufv3.internal.{ ByteString, GeneratedMessageV3 } import akka.protobufv3.internal.GeneratedMessageV3 +import akka.serialization.BaseSerializer import akka.serialization.Serialization +import akka.serialization.SerializerWithStringManifest +import akka.util.ByteString.UTF_8 import akka.util.ccompat._ +import akka.util.ccompat.JavaConverters._ @ccompatUsedUntil213 private object ReplicatedDataSerializer { diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala index 21ff8c5209..4b37f8ca16 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala @@ -4,35 +4,37 @@ package akka.cluster.ddata.protobuf -import scala.concurrent.duration._ +import java.io.NotSerializableException import java.util.concurrent.TimeUnit -import akka.util.ccompat.JavaConverters._ +import java.util.concurrent.atomic.AtomicInteger + +import scala.annotation.tailrec import scala.collection.immutable +import scala.concurrent.duration._ import scala.concurrent.duration.Duration +import scala.concurrent.duration.FiniteDuration + +import akka.actor.Address import akka.actor.ExtendedActorSystem +import akka.annotation.InternalApi import akka.cluster.Member import akka.cluster.UniqueAddress +import akka.cluster.ddata.DurableStore.DurableDataEnvelope +import akka.cluster.ddata.Key.KeyR import akka.cluster.ddata.PruningState +import akka.cluster.ddata.PruningState.PruningPerformed import akka.cluster.ddata.ReplicatedData import akka.cluster.ddata.Replicator._ import akka.cluster.ddata.Replicator.Internal._ +import akka.cluster.ddata.VersionVector import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm } +import akka.protobufv3.internal.ByteString +import akka.serialization.BaseSerializer import akka.serialization.Serialization import akka.serialization.SerializerWithStringManifest -import akka.serialization.BaseSerializer import akka.util.{ ByteString => AkkaByteString } -import akka.protobufv3.internal.ByteString -import akka.cluster.ddata.Key.KeyR -import java.util.concurrent.atomic.AtomicInteger -import scala.annotation.tailrec -import scala.concurrent.duration.FiniteDuration -import akka.cluster.ddata.DurableStore.DurableDataEnvelope -import java.io.NotSerializableException -import akka.actor.Address -import akka.cluster.ddata.VersionVector -import akka.annotation.InternalApi -import akka.cluster.ddata.PruningState.PruningPerformed import akka.util.ccompat._ +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API diff --git a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala index e3e68f4bfa..e146e313fc 100644 --- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala +++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/protobuf/SerializationSupport.scala @@ -8,19 +8,21 @@ import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.util.zip.GZIPInputStream import java.util.zip.GZIPOutputStream + import scala.annotation.tailrec import scala.collection.immutable.TreeMap -import akka.util.ccompat.JavaConverters._ + import akka.actor.ActorRef import akka.actor.Address import akka.actor.ExtendedActorSystem import akka.cluster.UniqueAddress +import akka.cluster.ddata.VersionVector import akka.cluster.ddata.protobuf.msg.{ ReplicatorMessages => dm } -import akka.serialization._ import akka.protobufv3.internal.ByteString import akka.protobufv3.internal.MessageLite -import akka.cluster.ddata.VersionVector +import akka.serialization._ import akka.util.ccompat._ +import akka.util.ccompat.JavaConverters._ /** * Some useful serialization helper methods. diff --git 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 index 9ce697e8cc..cf2b2d34db 100644 --- 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") diff --git 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 index f21ae1b582..730df3fd4e 100644 --- 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 diff --git 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 index 5ab555eeeb..6e8d0cc008 100644 --- 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") diff --git 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 index 140b4087a1..1337b699a6 100644 --- 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") diff --git 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 index 110d86057e..88fffacd60 100644 --- 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 diff --git 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 index b78501caaf..4b2ebd7d1a 100644 --- 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") diff --git 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 index 8bffebdb23..4991522558 100644 --- 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") diff --git 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 index 525e3903a7..83def61b72 100644 --- 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") diff --git 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 index 7d6e95fd43..e0230ddccc 100644 --- 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 diff --git 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 index 257c22e917..caaf45267d 100644 --- 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 diff --git 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 index 605d0045fb..15ce9cfbc2 100644 --- 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 */ diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala index bd8bc85176..49d4a10661 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/DataEnvelopeSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Internal.DataEnvelope -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class DataEnvelopeSpec extends AnyWordSpec with Matchers { import PruningState._ diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala index 4b1a22bee3..4f08aa64cb 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/DeltaPropagationSelectorSpec.scala @@ -4,6 +4,10 @@ package akka.cluster.ddata +import org.scalactic.TypeCheckedTripleEquals +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Key.KeyId @@ -11,9 +15,6 @@ import akka.cluster.ddata.Replicator.Internal.DataEnvelope import akka.cluster.ddata.Replicator.Internal.Delta import akka.cluster.ddata.Replicator.Internal.DeltaPropagation import akka.cluster.ddata.Replicator.Internal.DeltaPropagation.NoDeltaPlaceholder -import org.scalactic.TypeCheckedTripleEquals -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec object DeltaPropagationSelectorSpec { class TestSelector(val selfUniqueAddress: UniqueAddress, override val allNodes: Vector[UniqueAddress]) diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala index 1099f132eb..fc481fba70 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/FlagSpec.scala @@ -4,10 +4,11 @@ package akka.cluster.ddata -import akka.cluster.ddata.Replicator.Changed import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.cluster.ddata.Replicator.Changed + class FlagSpec extends AnyWordSpec with Matchers { "A Flag" must { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala index feb0fd310b..e61becd8af 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/GCounterSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class GCounterSpec extends AnyWordSpec with Matchers { val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L) diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala index 5095b1b343..d0b148a8de 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/GSetSpec.scala @@ -4,10 +4,11 @@ package akka.cluster.ddata -import akka.cluster.ddata.Replicator.Changed import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.cluster.ddata.Replicator.Changed + class GSetSpec extends AnyWordSpec with Matchers { val user1 = """{"username":"john","password":"coltrane"}""" diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala index 14cfb99eb7..1a4f58be14 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWMapSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class LWWMapSpec extends AnyWordSpec with Matchers { import LWWRegister.defaultClock diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala index 6637ca485f..47f049d209 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LWWRegisterSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class LWWRegisterSpec extends AnyWordSpec with Matchers { import LWWRegister.defaultClock diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala index e01188ca0b..1a293a1661 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala @@ -4,16 +4,17 @@ package akka.cluster.ddata +import com.typesafe.config.ConfigFactory +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.Actor import akka.actor.ActorSystem import akka.actor.Props import akka.actor.Stash import akka.testkit.ImplicitSender import akka.testkit.TestKit -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfterAll -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike object LocalConcurrencySpec { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala index fa37a81ebb..a448dd7e6d 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LotsOfDataBot.scala @@ -8,11 +8,12 @@ import java.util.concurrent.ThreadLocalRandom import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorSystem import akka.actor.Props -import com.typesafe.config.ConfigFactory /** * This "sample" simulates lots of data entries, and can be used for diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala index d1a7294953..69dc7eef77 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMapSpec.scala @@ -4,12 +4,13 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.ORSet.AddDeltaOp import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class ORMapSpec extends AnyWordSpec with Matchers { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala index e004071069..aba0c8546a 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORMultiMapSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class ORMultiMapSpec extends AnyWordSpec with Matchers { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala index 3e273b4bbd..535c4c770b 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ORSetSpec.scala @@ -6,11 +6,12 @@ package akka.cluster.ddata import scala.collection.immutable.TreeMap +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class ORSetSpec extends AnyWordSpec with Matchers { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala index 983ad22bae..f4b8467e42 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterMapSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class PNCounterMapSpec extends AnyWordSpec with Matchers { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala index 88fee0fba1..8f3e44f298 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/PNCounterSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.Address import akka.cluster.UniqueAddress import akka.cluster.ddata.Replicator.Changed -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class PNCounterSpec extends AnyWordSpec with Matchers { val node1 = UniqueAddress(Address("akka", "Sys", "localhost", 2551), 1L) diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala index ceedee1077..5a92443671 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/PruningStateSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata -import akka.actor.Address -import akka.cluster.UniqueAddress import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.Address +import akka.cluster.UniqueAddress + class PruningStateSpec extends AnyWordSpec with Matchers { import PruningState._ diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala index 83f311aecf..a5d8039348 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/ReplicatorSettingsSpec.scala @@ -4,11 +4,12 @@ package akka.cluster.ddata -import akka.testkit.AkkaSpec import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.wordspec.AnyWordSpecLike +import akka.testkit.AkkaSpec + object ReplicatorSettingsSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala index 9f236d7eaa..145610ef5d 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/VersionVectorSpec.scala @@ -4,13 +4,14 @@ package akka.cluster.ddata +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorSystem import akka.actor.Address import akka.cluster.UniqueAddress import akka.testkit.TestKit -import org.scalatest.BeforeAndAfterAll -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike class VersionVectorSpec extends TestKit(ActorSystem("VersionVectorSpec")) diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala index b17ed3794f..0b233fd755 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/WriteAggregatorSpec.scala @@ -4,6 +4,7 @@ package akka.cluster.ddata +import scala.concurrent.Future import scala.concurrent.duration._ import akka.actor.Actor @@ -12,14 +13,12 @@ import akka.actor.ActorSelection import akka.actor.ActorSystem import akka.actor.Address import akka.actor.Props -import akka.testkit._ -import akka.cluster.ddata.Replicator.Internal._ -import akka.cluster.ddata.Replicator._ -import akka.remote.RARP -import scala.concurrent.Future - import akka.cluster.Cluster import akka.cluster.UniqueAddress +import akka.cluster.ddata.Replicator._ +import akka.cluster.ddata.Replicator.Internal._ +import akka.remote.RARP +import akka.testkit._ object WriteAggregatorSpec { diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala index 761a3807c4..2ebf8ec347 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala @@ -6,25 +6,26 @@ package akka.cluster.ddata.protobuf import java.util.Base64 -import akka.actor.ActorIdentity -import akka.actor.ActorRef +import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.ActorIdentity +import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.Address import akka.actor.ExtendedActorSystem import akka.actor.Identify -import akka.cluster.ddata._ -import akka.cluster.ddata.Replicator.Internal._ -import akka.testkit.TestKit -import akka.cluster.UniqueAddress -import akka.remote.RARP -import com.typesafe.config.ConfigFactory import akka.actor.Props import akka.actor.RootActorPath import akka.cluster.Cluster +import akka.cluster.UniqueAddress +import akka.cluster.ddata._ +import akka.cluster.ddata.Replicator.Internal._ +import akka.remote.RARP import akka.testkit.TestActors +import akka.testkit.TestKit class ReplicatedDataSerializerSpec extends TestKit( diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala index b2884b8bd5..a8f0ea018f 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala @@ -5,29 +5,31 @@ package akka.cluster.ddata.protobuf import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.ActorSystem import akka.actor.Address import akka.actor.ExtendedActorSystem import akka.actor.Props +import akka.cluster.UniqueAddress +import akka.cluster.ddata.DurableStore.DurableDataEnvelope +import akka.cluster.ddata.GCounter import akka.cluster.ddata.GSet import akka.cluster.ddata.GSetKey +import akka.cluster.ddata.ORMultiMap +import akka.cluster.ddata.ORSet import akka.cluster.ddata.PruningState.PruningInitialized import akka.cluster.ddata.PruningState.PruningPerformed import akka.cluster.ddata.Replicator._ import akka.cluster.ddata.Replicator.Internal._ +import akka.cluster.ddata.VersionVector +import akka.remote.RARP import akka.testkit.TestKit import akka.util.{ unused, ByteString } -import akka.cluster.UniqueAddress -import akka.remote.RARP -import com.typesafe.config.ConfigFactory -import akka.cluster.ddata.DurableStore.DurableDataEnvelope -import akka.cluster.ddata.GCounter -import akka.cluster.ddata.VersionVector -import akka.cluster.ddata.ORSet -import akka.cluster.ddata.ORMultiMap class ReplicatorMessageSerializerSpec extends TestKit( diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala index a372ff04fa..310fab7bb6 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Conductor.scala @@ -4,8 +4,27 @@ package akka.remote.testconductor -import language.postfixOps +import java.net.InetSocketAddress +import java.util.concurrent.ConcurrentHashMap +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.reflect.classTag +import scala.util.control.NoStackTrace + +import RemoteConnection.getAddrString +import language.postfixOps +import org.jboss.netty.channel.{ + Channel, + ChannelHandlerContext, + ChannelStateEvent, + MessageEvent, + SimpleChannelUpstreamHandler +} + +import akka.AkkaException +import akka.ConfigurationException import akka.actor.{ Actor, ActorRef, @@ -19,28 +38,11 @@ import akka.actor.{ Status, SupervisorStrategy } -import akka.AkkaException -import akka.ConfigurationException -import akka.event.LoggingReceive import akka.event.{ Logging, LoggingAdapter } +import akka.event.LoggingReceive import akka.pattern.ask import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.util.Timeout -import java.net.InetSocketAddress -import java.util.concurrent.ConcurrentHashMap -import org.jboss.netty.channel.{ - Channel, - ChannelHandlerContext, - ChannelStateEvent, - MessageEvent, - SimpleChannelUpstreamHandler -} -import RemoteConnection.getAddrString -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.concurrent.Future -import scala.reflect.classTag -import scala.util.control.NoStackTrace /** * The conductor is the one orchestrating the test: it governs the @@ -337,8 +339,8 @@ private[akka] object ServerFSM { private[akka] class ServerFSM(val controller: ActorRef, val channel: Channel) extends Actor with LoggingFSM[ServerFSM.State, Option[ActorRef]] { - import ServerFSM._ import Controller._ + import ServerFSM._ var roleName: RoleName = null @@ -420,8 +422,8 @@ private[akka] object Controller { * INTERNAL API. */ private[akka] class Controller(private var initialParticipants: Int, controllerPort: InetSocketAddress) extends Actor { - import Controller._ import BarrierCoordinator._ + import Controller._ val settings = TestConductor().Settings val connection = RemoteConnection( diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala index e243008237..0537efaaa2 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/DataTypes.scala @@ -4,15 +4,16 @@ package akka.remote.testconductor -import language.implicitConversions - -import org.jboss.netty.handler.codec.oneone.OneToOneEncoder -import org.jboss.netty.channel.ChannelHandlerContext -import org.jboss.netty.channel.Channel -import akka.remote.testconductor.{ TestConductorProtocol => TCP } -import akka.actor.Address -import org.jboss.netty.handler.codec.oneone.OneToOneDecoder import scala.concurrent.duration._ + +import language.implicitConversions +import org.jboss.netty.channel.Channel +import org.jboss.netty.channel.ChannelHandlerContext +import org.jboss.netty.handler.codec.oneone.OneToOneDecoder +import org.jboss.netty.handler.codec.oneone.OneToOneEncoder + +import akka.actor.Address +import akka.remote.testconductor.{ TestConductorProtocol => TCP } import akka.remote.testconductor.TestConductorProtocol.BarrierOp import akka.remote.transport.ThrottlerTransportAdapter.Direction diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala index b2ccb8b8a3..8f4aeb7e74 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Extension.scala @@ -4,12 +4,13 @@ package akka.remote.testconductor -import akka.actor.ClassicActorSystemProvider +import com.typesafe.config.Config + import akka.actor.{ ActorContext, ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } +import akka.actor.ClassicActorSystemProvider +import akka.dispatch.ThreadPoolConfig import akka.remote.RemoteActorRefProvider import akka.util.Timeout -import com.typesafe.config.Config -import akka.dispatch.ThreadPoolConfig /** * Access to the [[akka.remote.testconductor.TestConductorExt]] extension: diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala index cdc4bc6702..a8f466c81e 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/Player.scala @@ -4,17 +4,16 @@ package akka.remote.testconductor +import java.net.{ ConnectException, InetSocketAddress } import java.util.concurrent.TimeoutException -import akka.actor._ -import akka.remote.testconductor.RemoteConnection.getAddrString - import scala.collection.immutable import scala.concurrent.{ Await, ExecutionContext, Future } import scala.concurrent.duration._ -import scala.util.control.NoStackTrace import scala.reflect.classTag -import akka.util.Timeout +import scala.util.control.NoStackTrace +import scala.util.control.NonFatal + import org.jboss.netty.channel.{ Channel, ChannelHandlerContext, @@ -24,23 +23,23 @@ import org.jboss.netty.channel.{ SimpleChannelUpstreamHandler, WriteCompletionEvent } -import akka.pattern.{ ask, AskTimeoutException } -import akka.event.{ Logging, LoggingAdapter } -import java.net.{ ConnectException, InetSocketAddress } -import akka.remote.transport.ThrottlerTransportAdapter.{ Blackhole, SetThrottle, TokenBucket, Unthrottled } +import akka.actor._ import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.event.{ Logging, LoggingAdapter } +import akka.pattern.{ ask, AskTimeoutException } +import akka.remote.testconductor.RemoteConnection.getAddrString +import akka.remote.transport.ThrottlerTransportAdapter.{ Blackhole, SetThrottle, TokenBucket, Unthrottled } +import akka.util.Timeout import akka.util.ccompat._ -import scala.util.control.NonFatal - @ccompatUsedUntil213 object Player { final class Waiter extends Actor with RequiresMessageQueue[UnboundedMessageQueueSemantics] { - import FSM._ import ClientFSM._ + import FSM._ var waiting: ActorRef = _ diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala index 75aeb66322..49cf4c7d7a 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testconductor/RemoteConnection.scala @@ -4,6 +4,13 @@ package akka.remote.testconductor +import java.net.InetSocketAddress +import java.util.concurrent.Executors + +import scala.util.control.NonFatal + +import org.jboss.netty.bootstrap.{ ClientBootstrap, ServerBootstrap } +import org.jboss.netty.buffer.ChannelBuffer import org.jboss.netty.channel.{ Channel, ChannelPipeline, @@ -11,20 +18,14 @@ import org.jboss.netty.channel.{ ChannelUpstreamHandler, DefaultChannelPipeline } +import org.jboss.netty.channel.ChannelHandlerContext import org.jboss.netty.channel.socket.nio.{ NioClientSocketChannelFactory, NioServerSocketChannelFactory } -import org.jboss.netty.bootstrap.{ ClientBootstrap, ServerBootstrap } import org.jboss.netty.handler.codec.frame.{ LengthFieldBasedFrameDecoder, LengthFieldPrepender } -import java.net.InetSocketAddress -import java.util.concurrent.Executors - -import scala.util.control.NonFatal +import org.jboss.netty.handler.codec.oneone.{ OneToOneDecoder, OneToOneEncoder } import akka.event.Logging -import akka.util.Helpers -import org.jboss.netty.handler.codec.oneone.{ OneToOneDecoder, OneToOneEncoder } -import org.jboss.netty.channel.ChannelHandlerContext import akka.protobufv3.internal.Message -import org.jboss.netty.buffer.ChannelBuffer +import akka.util.Helpers /** * INTERNAL API. diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala index 554bde8aa4..edffba336b 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala @@ -4,27 +4,27 @@ package akka.remote.testkit -import language.implicitConversions import java.net.{ InetAddress, InetSocketAddress } -import com.typesafe.config.{ Config, ConfigFactory, ConfigObject } - -import scala.concurrent.{ Await, Awaitable } -import scala.util.control.NonFatal import scala.collection.immutable -import akka.actor._ -import akka.util.Timeout -import akka.remote.testconductor.{ TestConductor, TestConductorExt } -import akka.testkit._ -import akka.testkit.TestKit -import akka.testkit.TestEvent._ - +import scala.concurrent.{ Await, Awaitable } import scala.concurrent.duration._ -import akka.remote.testconductor.RoleName +import scala.util.control.NonFatal + +import com.typesafe.config.{ Config, ConfigFactory, ConfigObject } +import language.implicitConversions +import org.jboss.netty.channel.ChannelException + +import akka.actor._ import akka.actor.RootActorPath import akka.event.{ Logging, LoggingAdapter } import akka.remote.RemoteTransportException -import org.jboss.netty.channel.ChannelException +import akka.remote.testconductor.{ TestConductor, TestConductorExt } +import akka.remote.testconductor.RoleName +import akka.testkit._ +import akka.testkit.TestEvent._ +import akka.testkit.TestKit +import akka.util.Timeout import akka.util.ccompat._ /** diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala index a144b6d6de..d96f253fac 100644 --- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala +++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala @@ -6,11 +6,11 @@ package akka.remote.testkit import java.io.File -import akka.remote.testconductor.RoleName - import scala.concurrent.Future import scala.concurrent.duration._ +import akka.remote.testconductor.RoleName + /** * INTERNAL API: Support trait allowing trivially recording perf metrics from [[MultiNodeSpec]]s */ diff --git a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala index 2ade238922..2c2aa71a91 100644 --- a/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala +++ b/akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala @@ -4,13 +4,14 @@ package akka.osgi -import akka.actor.{ ActorRefFactory, ActorSystem } import java.util.{ Dictionary, Properties } -import akka.util.unused +import com.typesafe.config.{ Config, ConfigFactory } import org.osgi.framework._ import org.osgi.service.log.LogService -import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor.{ ActorRefFactory, ActorSystem } +import akka.util.unused /** * Abstract bundle activator implementation to bootstrap and configure an actor system in an diff --git a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala b/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala index cfa381d216..384c4ca342 100644 --- a/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala +++ b/akka-osgi/src/main/scala/akka/osgi/BundleDelegatingClassLoader.scala @@ -6,13 +6,16 @@ package akka.osgi import java.net.URL import java.util.Enumeration -import org.osgi.framework.{ Bundle, BundleContext } -import scala.util.Try -import org.osgi.framework.wiring.{ BundleRevision, BundleWire, BundleWiring } -import akka.util.ccompat.JavaConverters._ -import scala.util.Success -import scala.util.Failure + import scala.annotation.tailrec +import scala.util.Failure +import scala.util.Success +import scala.util.Try + +import org.osgi.framework.{ Bundle, BundleContext } +import org.osgi.framework.wiring.{ BundleRevision, BundleWire, BundleWiring } + +import akka.util.ccompat.JavaConverters._ /* * Companion object to create bundle delegating ClassLoader instances diff --git a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala b/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala index 6ca8fc5bf6..5cd7ff107d 100644 --- a/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala +++ b/akka-osgi/src/main/scala/akka/osgi/DefaultOSGiLogger.scala @@ -4,8 +4,9 @@ package akka.osgi -import akka.event.Logging import org.osgi.service.log.LogService + +import akka.event.Logging import akka.event.Logging.{ DefaultLogger, LogEvent } import akka.event.Logging.Error.NoCause diff --git a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala index fda8b653d0..d6a4a96670 100644 --- a/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala +++ b/akka-osgi/src/main/scala/akka/osgi/OsgiActorSystemFactory.scala @@ -4,11 +4,12 @@ package akka.osgi -import akka.actor.ActorSystem -import akka.util.unused import com.typesafe.config.{ Config, ConfigFactory } import org.osgi.framework.BundleContext +import akka.actor.ActorSystem +import akka.util.unused + /** * Factory class to create ActorSystem implementations in an OSGi environment. This mainly involves dealing with * bundle classloaders appropriately to ensure that configuration files and classes get loaded properly diff --git a/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala b/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala index 2bccfb466f..546bddc51b 100644 --- a/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala +++ b/akka-osgi/src/test/scala/akka/osgi/ActorSystemActivatorTest.scala @@ -4,20 +4,21 @@ package akka.osgi +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ + +import PojoSRTestSupport.bundle +import de.kalpatec.pojosr.framework.launch.BundleDescriptor import language.postfixOps +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec +import test.{ PingPongActorSystemActivator, RuntimeNameActorSystemActivator, TestActivators } +import test.PingPong._ import akka.actor.ActorSystem import akka.pattern.ask -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.collection.immutable import akka.util.Timeout -import de.kalpatec.pojosr.framework.launch.BundleDescriptor -import test.{ PingPongActorSystemActivator, RuntimeNameActorSystemActivator, TestActivators } -import test.PingPong._ -import PojoSRTestSupport.bundle -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec /** * Test cases for [[akka.osgi.ActorSystemActivator]] in 2 different scenarios: diff --git a/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala b/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala index f55b417a29..7445f87d86 100644 --- a/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala +++ b/akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala @@ -4,21 +4,22 @@ package akka.osgi -import de.kalpatec.pojosr.framework.launch.{ BundleDescriptor, ClasspathScanner, PojoServiceRegistryFactory } - -import akka.util.ccompat.JavaConverters._ -import org.apache.commons.io.IOUtils.copy - -import org.osgi.framework._ -import java.net.URL -import java.util.jar.JarInputStream import java.io._ -import org.scalatest.{ BeforeAndAfterAll, Suite } +import java.net.URL import java.util.{ Date, HashMap, ServiceLoader, UUID } -import scala.reflect.ClassTag +import java.util.jar.JarInputStream + +import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ -import scala.annotation.tailrec +import scala.reflect.ClassTag + +import de.kalpatec.pojosr.framework.launch.{ BundleDescriptor, ClasspathScanner, PojoServiceRegistryFactory } +import org.apache.commons.io.IOUtils.copy +import org.osgi.framework._ +import org.scalatest.{ BeforeAndAfterAll, Suite } + +import akka.util.ccompat.JavaConverters._ /** * Trait that provides support for building akka-osgi tests using PojoSR diff --git a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala b/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala index 74f998b1ec..04be8bd200 100644 --- a/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala +++ b/akka-osgi/src/test/scala/akka/osgi/test/TestActivators.scala @@ -4,11 +4,12 @@ package akka.osgi.test -import akka.osgi.ActorSystemActivator -import akka.actor.{ ActorSystem, Props } import PingPong._ import org.osgi.framework.BundleContext +import akka.actor.{ ActorSystem, Props } +import akka.osgi.ActorSystemActivator + /** * A set of [[akka.osgi.ActorSystemActivator]]s for testing purposes */ diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala index 9aa68c5170..11c45f3fb1 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/PersistenceQuery.scala @@ -4,14 +4,15 @@ package akka.persistence.query -import akka.actor._ -import akka.annotation.InternalApi -import akka.persistence.query.scaladsl.ReadJournal -import akka.persistence.{ PersistencePlugin, PluginProvider } -import akka.util.unused +import scala.reflect.ClassTag + import com.typesafe.config.{ Config, ConfigFactory } -import scala.reflect.ClassTag +import akka.actor._ +import akka.annotation.InternalApi +import akka.persistence.{ PersistencePlugin, PluginProvider } +import akka.persistence.query.scaladsl.ReadJournal +import akka.util.unused /** * Persistence extension for queries. diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala index 9299818c08..050130f65d 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/CurrentEventsByPersistenceIdQuery.scala @@ -5,8 +5,8 @@ package akka.persistence.query.javadsl import akka.NotUsed -import akka.stream.javadsl.Source import akka.persistence.query.EventEnvelope +import akka.stream.javadsl.Source /** * A plugin may optionally support this query by implementing this interface. diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala index a0b6f5973e..857b7525c3 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/javadsl/EventsByPersistenceIdQuery.scala @@ -5,8 +5,8 @@ package akka.persistence.query.javadsl import akka.NotUsed -import akka.stream.javadsl.Source import akka.persistence.query.EventEnvelope +import akka.stream.javadsl.Source /** * A plugin may optionally support this query by implementing this interface. diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala index 3018924e3d..1fbfcfbc06 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdStage.scala @@ -4,6 +4,8 @@ package akka.persistence.query.journal.leveldb +import scala.concurrent.duration.FiniteDuration + import akka.NotUsed import akka.actor.ActorRef import akka.annotation.InternalApi @@ -26,8 +28,6 @@ import akka.stream.stage.GraphStageLogic import akka.stream.stage.OutHandler import akka.stream.stage.TimerGraphStageLogicWithLogging -import scala.concurrent.duration.FiniteDuration - /** * INTERNAL API */ diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala index d500b1cb8d..79569a587a 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/EventsByTagStage.scala @@ -4,6 +4,8 @@ package akka.persistence.query.journal.leveldb +import scala.concurrent.duration.FiniteDuration + import akka.NotUsed import akka.actor.ActorRef import akka.annotation.InternalApi @@ -14,19 +16,17 @@ import akka.persistence.journal.leveldb.LeveldbJournal import akka.persistence.journal.leveldb.LeveldbJournal.ReplayTaggedMessages import akka.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage import akka.persistence.journal.leveldb.LeveldbJournal.TaggedEventAppended -import akka.persistence.query.journal.leveldb.EventsByTagStage.Continue import akka.persistence.query.EventEnvelope import akka.persistence.query.Sequence +import akka.persistence.query.journal.leveldb.EventsByTagStage.Continue +import akka.stream.Attributes import akka.stream.Materializer +import akka.stream.Outlet +import akka.stream.SourceShape import akka.stream.stage.GraphStage import akka.stream.stage.GraphStageLogic import akka.stream.stage.OutHandler import akka.stream.stage.TimerGraphStageLogicWithLogging -import akka.stream.Attributes -import akka.stream.Outlet -import akka.stream.SourceShape - -import scala.concurrent.duration.FiniteDuration /** * INTERNAL API diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala index 738bfb764d..1c5fc7a1af 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/LeveldbReadJournalProvider.scala @@ -4,9 +4,10 @@ package akka.persistence.query.journal.leveldb +import com.typesafe.config.Config + import akka.actor.ExtendedActorSystem import akka.persistence.query.ReadJournalProvider -import com.typesafe.config.Config class LeveldbReadJournalProvider(system: ExtendedActorSystem, config: Config) extends ReadJournalProvider { diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala index 5b888e4c42..0e3a81d19c 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/journal/leveldb/scaladsl/LeveldbReadJournal.scala @@ -6,24 +6,25 @@ package akka.persistence.query.journal.leveldb.scaladsl import java.net.URLEncoder +import scala.concurrent.duration._ + +import com.typesafe.config.Config + import akka.NotUsed import akka.actor.ExtendedActorSystem import akka.event.Logging -import akka.persistence.query.journal.leveldb.AllPersistenceIdsStage -import akka.persistence.query.journal.leveldb.EventsByPersistenceIdStage -import akka.persistence.query.journal.leveldb.EventsByTagStage -import akka.persistence.query.scaladsl.ReadJournal -import akka.persistence.query.scaladsl._ import akka.persistence.query.EventEnvelope import akka.persistence.query.NoOffset import akka.persistence.query.Offset import akka.persistence.query.Sequence +import akka.persistence.query.journal.leveldb.AllPersistenceIdsStage +import akka.persistence.query.journal.leveldb.EventsByPersistenceIdStage +import akka.persistence.query.journal.leveldb.EventsByTagStage +import akka.persistence.query.scaladsl._ +import akka.persistence.query.scaladsl.ReadJournal import akka.stream.scaladsl.Source import akka.util.ByteString import akka.util.unused -import com.typesafe.config.Config - -import scala.concurrent.duration._ /** * Scala API [[akka.persistence.query.scaladsl.ReadJournal]] implementation for LevelDB. diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala index d2626fa5e2..d27f56889d 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/CurrentEventsByPersistenceIdQuery.scala @@ -5,8 +5,8 @@ package akka.persistence.query.scaladsl import akka.NotUsed -import akka.stream.scaladsl.Source import akka.persistence.query.EventEnvelope +import akka.stream.scaladsl.Source /** * A plugin may optionally support this query by implementing this trait. diff --git a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala b/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala index c72d428699..96b0e31562 100644 --- a/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala +++ b/akka-persistence-query/src/main/scala/akka/persistence/query/scaladsl/EventsByPersistenceIdQuery.scala @@ -5,8 +5,8 @@ package akka.persistence.query.scaladsl import akka.NotUsed -import akka.stream.scaladsl.Source import akka.persistence.query.EventEnvelope +import akka.stream.scaladsl.Source /** * A plugin may optionally support this query by implementing this trait. diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala index 3edc22a36a..75a6107941 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/DummyReadJournal.scala @@ -4,10 +4,11 @@ package akka.persistence.query -import akka.NotUsed -import akka.stream.scaladsl.Source import com.typesafe.config.{ Config, ConfigFactory } + +import akka.NotUsed import akka.actor.ExtendedActorSystem +import akka.stream.scaladsl.Source import akka.util.unused /** diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala index 8178974829..54b15f46e4 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/OffsetSpec.scala @@ -7,6 +7,7 @@ package akka.persistence.query import java.util.UUID import scala.util.Random + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala index c4b89db255..d88d857369 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/PersistenceQuerySpec.scala @@ -6,15 +6,16 @@ package akka.persistence.query import java.util.concurrent.atomic.AtomicInteger -import akka.actor.ActorSystem -import akka.persistence.journal.{ EventSeq, ReadEventAdapter } +import scala.concurrent.Await +import scala.concurrent.duration._ + import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import scala.concurrent.Await -import scala.concurrent.duration._ +import akka.actor.ActorSystem +import akka.persistence.journal.{ EventSeq, ReadEventAdapter } class PersistenceQuerySpec extends AnyWordSpecLike with Matchers with BeforeAndAfterAll { diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala index 41ef933f88..257744adbc 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/AllPersistenceIdsSpec.scala @@ -4,6 +4,8 @@ package akka.persistence.query.journal.leveldb +import scala.concurrent.duration._ + import akka.persistence.query.PersistenceQuery import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal import akka.persistence.query.scaladsl.PersistenceIdsQuery @@ -11,8 +13,6 @@ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import scala.concurrent.duration._ - object AllPersistenceIdsSpec { val config = """ akka.loglevel = INFO diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala index 28e60dfb4c..8e0f9d3e2f 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/Cleanup.scala @@ -4,10 +4,12 @@ package akka.persistence.query.journal.leveldb -import akka.testkit.AkkaSpec import java.io.File + import org.apache.commons.io.FileUtils +import akka.testkit.AkkaSpec + trait Cleanup { this: AkkaSpec => val storageLocations = List( diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala index 70db3ba583..3c72e8e0ee 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByPersistenceIdSpec.scala @@ -4,16 +4,16 @@ package akka.persistence.query.journal.leveldb +import scala.concurrent.duration._ + import akka.actor.ActorRef +import akka.persistence.query.EventEnvelope import akka.persistence.query.PersistenceQuery import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal import akka.persistence.query.scaladsl.EventsByTagQuery import akka.stream.testkit.scaladsl.TestSink import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import scala.concurrent.duration._ - -import akka.persistence.query.EventEnvelope object EventsByPersistenceIdSpec { val config = """ diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala index c64466e18b..cb8520e8a6 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/EventsByTagSpec.scala @@ -4,20 +4,20 @@ package akka.persistence.query.journal.leveldb +import scala.concurrent.duration._ + import akka.persistence.journal.Tagged import akka.persistence.journal.WriteEventAdapter -import akka.persistence.query.NoOffset -import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal -import akka.persistence.query.scaladsl.EventsByTagQuery import akka.persistence.query.EventEnvelope +import akka.persistence.query.NoOffset import akka.persistence.query.PersistenceQuery import akka.persistence.query.Sequence +import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal +import akka.persistence.query.scaladsl.EventsByTagQuery import akka.stream.testkit.scaladsl.TestSink import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import scala.concurrent.duration._ - object EventsByTagSpec { val config = s""" akka.loglevel = INFO diff --git a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala index 314db7e650..06c3f6ff57 100644 --- a/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala +++ b/akka-persistence-query/src/test/scala/akka/persistence/query/journal/leveldb/TestActor.scala @@ -4,8 +4,8 @@ package akka.persistence.query.journal.leveldb -import akka.persistence.PersistentActor import akka.actor.Props +import akka.persistence.PersistentActor object TestActor { def props(persistenceId: String): Props = diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala index b1d2da558f..449410f838 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/PersistencePluginProxySpec.scala @@ -4,11 +4,12 @@ package akka.persistence.journal.leveldb +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.persistence._ import akka.persistence.journal.PersistencePluginProxy import akka.testkit.{ AkkaSpec, TestProbe } -import com.typesafe.config.ConfigFactory object PersistencePluginProxySpec { lazy val config = diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala index 454be1f371..e29b66d8fc 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/journal/leveldb/SharedLeveldbJournalSpec.scala @@ -4,10 +4,11 @@ package akka.persistence.journal.leveldb +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.persistence._ import akka.testkit.{ AkkaSpec, TestProbe } -import com.typesafe.config.ConfigFactory object SharedLeveldbJournalSpec { val config = ConfigFactory.parseString(s""" diff --git a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala b/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala index 57b12e1065..40f3003700 100644 --- a/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala +++ b/akka-persistence-shared/src/test/scala/akka/persistence/serialization/SerializerSpec.scala @@ -6,16 +6,19 @@ package akka.persistence.serialization import java.io.NotSerializableException import java.util.UUID + +import scala.concurrent.Await +import scala.concurrent.duration.Duration + +import com.typesafe.config._ +import org.apache.commons.codec.binary.Hex.{ decodeHex, encodeHex } + import akka.actor._ -import akka.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedDelivery } import akka.persistence._ +import akka.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedDelivery } import akka.serialization._ import akka.testkit._ import akka.util.ByteString.UTF_8 -import com.typesafe.config._ -import org.apache.commons.codec.binary.Hex.{ decodeHex, encodeHex } -import scala.concurrent.Await -import scala.concurrent.duration.Duration object SerializerSpecConfigs { val customSerializers = diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala index 674f73c10e..3241f90217 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/PluginSpec.scala @@ -4,16 +4,19 @@ package akka.persistence +import java.util.UUID import java.util.concurrent.atomic.AtomicInteger + import scala.reflect.ClassTag -import akka.actor._ -import akka.testkit._ + import com.typesafe.config._ import org.scalatest._ -import java.util.UUID import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor._ +import akka.testkit._ + abstract class PluginSpec(val config: Config) extends TestKitBase with AnyWordSpecLike diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala index 5601623aa5..303ba45870 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalPerfSpec.scala @@ -4,12 +4,13 @@ package akka.persistence.japi.journal -import akka.persistence.CapabilityFlag -import akka.persistence.journal.JournalPerfSpec import com.typesafe.config.Config import org.scalactic.source.Position import org.scalatest.Informer +import akka.persistence.CapabilityFlag +import akka.persistence.journal.JournalPerfSpec + /** * JAVA API * diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala index 625d8c01ef..093f5a3f5c 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/japi/journal/JavaJournalSpec.scala @@ -4,9 +4,10 @@ package akka.persistence.japi.journal +import com.typesafe.config.Config + import akka.persistence.CapabilityFlag import akka.persistence.journal.JournalSpec -import com.typesafe.config.Config /** * JAVA API diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala index 2cef3c4117..b8b92cdc84 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/japi/snapshot/JavaSnapshotStoreSpec.scala @@ -4,9 +4,10 @@ package akka.persistence.japi.snapshot +import com.typesafe.config.Config + import akka.persistence.CapabilityFlag import akka.persistence.snapshot.SnapshotStoreSpec -import com.typesafe.config.Config /** * JAVA API diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala index 24a8f4ad92..37f23fd9c2 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalPerfSpec.scala @@ -9,6 +9,9 @@ import java.nio.charset.StandardCharsets import scala.collection.immutable import scala.concurrent.duration._ +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.Props @@ -19,8 +22,6 @@ import akka.persistence.journal.JournalPerfSpec.Cmd import akka.persistence.journal.JournalPerfSpec.ResetCounter import akka.serialization.SerializerWithStringManifest import akka.testkit.TestProbe -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory object JournalPerfSpec { class BenchActor(override val persistenceId: String, replyTo: ActorRef, replyAfter: Int) diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala index 76d35d92fd..854b7faa70 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/journal/JournalSpec.scala @@ -4,15 +4,16 @@ package akka.persistence.journal -import akka.persistence.scalatest.{ MayVerb, OptionalTests } - import scala.concurrent.duration._ + +import com.typesafe.config._ + import akka.actor._ import akka.persistence._ import akka.persistence.JournalProtocol._ +import akka.persistence.scalatest.{ MayVerb, OptionalTests } import akka.testkit._ import akka.util.unused -import com.typesafe.config._ object JournalSpec { val config: Config = ConfigFactory.parseString(s""" diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala b/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala index dea5c32694..316e885e9f 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/scalatest/OptionalTests.scala @@ -4,9 +4,10 @@ package akka.persistence.scalatest -import akka.persistence.CapabilityFlag import org.scalatest.Informing +import akka.persistence.CapabilityFlag + trait OptionalTests { this: Informing => diff --git a/akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala b/akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala index 3c506d4c2b..702bedb37f 100644 --- a/akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala +++ b/akka-persistence-tck/src/main/scala/akka/persistence/snapshot/SnapshotStoreSpec.scala @@ -4,15 +4,16 @@ package akka.persistence.snapshot -import akka.persistence.scalatest.{ MayVerb, OptionalTests } - import scala.collection.immutable.Seq + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.persistence._ import akka.persistence.SnapshotProtocol._ +import akka.persistence.scalatest.{ MayVerb, OptionalTests } import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory -import com.typesafe.config.Config object SnapshotStoreSpec { val config: Config = ConfigFactory.parseString(s""" diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala b/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala index f9214b4bd0..7176fe5a58 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/PluginCleanup.scala @@ -5,6 +5,7 @@ package akka.persistence import java.io.File + import org.apache.commons.io.FileUtils import org.scalatest.BeforeAndAfterAll diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala index b118ae940d..567f784d60 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/japi/JavaJournalSpecSpec.scala @@ -4,10 +4,11 @@ package akka.persistence.japi -import akka.persistence.japi.journal.JavaJournalSpec import com.typesafe.config.ConfigFactory import org.scalatest.DoNotDiscover +import akka.persistence.japi.journal.JavaJournalSpec + /* Only checking that compilation works with the constructor here as expected (no other abstract fields leaked) */ @DoNotDiscover class JavaJournalSpecSpec extends JavaJournalSpec(ConfigFactory.parseString("")) diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala index 8e31fca109..216b42fe57 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalJavaSpec.scala @@ -4,8 +4,8 @@ package akka.persistence.journal.leveldb -import akka.persistence.journal.JournalSpec import akka.persistence.{ PersistenceSpec, PluginCleanup } +import akka.persistence.journal.JournalSpec class LeveldbJournalJavaSpec extends JournalSpec( diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala index ee658500b9..06bbf34363 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativePerfSpec.scala @@ -4,9 +4,9 @@ package akka.persistence.journal.leveldb -import akka.persistence.journal.JournalPerfSpec import akka.persistence.PersistenceSpec import akka.persistence.PluginCleanup +import akka.persistence.journal.JournalPerfSpec class LeveldbJournalNativePerfSpec extends JournalPerfSpec( diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala index b4eb285a34..d5fa8b35d2 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNativeSpec.scala @@ -4,8 +4,8 @@ package akka.persistence.journal.leveldb -import akka.persistence.journal.JournalSpec import akka.persistence.{ PersistenceSpec, PluginCleanup } +import akka.persistence.journal.JournalSpec class LeveldbJournalNativeSpec extends JournalSpec( diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala index 2a9e6cf254..22c0e988fd 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/journal/leveldb/LeveldbJournalNoAtomicPersistMultipleEventsSpec.scala @@ -4,8 +4,8 @@ package akka.persistence.journal.leveldb -import akka.persistence.journal.JournalSpec import akka.persistence.{ PersistenceSpec, PluginCleanup } +import akka.persistence.journal.JournalSpec class LeveldbJournalNoAtomicPersistMultipleEventsSpec extends JournalSpec( diff --git a/akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala b/akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala index f2d70314e5..27d13cb38e 100644 --- a/akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala +++ b/akka-persistence-tck/src/test/scala/akka/persistence/snapshot/local/LocalSnapshotStoreSpec.scala @@ -4,8 +4,9 @@ package akka.persistence.snapshot.local -import akka.persistence.CapabilityFlag import com.typesafe.config.ConfigFactory + +import akka.persistence.CapabilityFlag import akka.persistence.PluginCleanup import akka.persistence.snapshot.SnapshotStoreSpec diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala index ee730e279f..070e39901f 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/EventStorage.scala @@ -4,15 +4,16 @@ package akka.persistence.testkit +import java.util.{ List => JList } + +import scala.collection.immutable +import scala.util.{ Failure, Success, Try } + import akka.annotation.InternalApi import akka.persistence.PersistentRepr import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies import akka.persistence.testkit.internal.TestKitStorage import akka.util.ccompat.JavaConverters._ -import java.util.{ List => JList } - -import scala.collection.immutable -import scala.util.{ Failure, Success, Try } /** * INTERNAL API diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala index c619776057..9730e8a918 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/PersistenceTestKitPlugin.scala @@ -4,16 +4,17 @@ package akka.persistence.testkit +import scala.collection.immutable +import scala.concurrent.Future +import scala.util.Try + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.annotation.InternalApi import akka.persistence._ import akka.persistence.journal.{ AsyncWriteJournal, Tagged } import akka.persistence.snapshot.SnapshotStore import akka.persistence.testkit.internal.{ InMemStorageExtension, SnapshotStorageEmulatorExtension } -import com.typesafe.config.{ Config, ConfigFactory } - -import scala.collection.immutable -import scala.concurrent.Future -import scala.util.Try /** * INTERNAL API diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala index 3ab098f97a..1c66d012b8 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/SnapshotStorage.scala @@ -4,13 +4,13 @@ package akka.persistence.testkit +import scala.util.Success + import akka.annotation.InternalApi import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria } import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies import akka.persistence.testkit.internal.TestKitStorage -import scala.util.Success - /** * INTERNAL API */ diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala index 7861fd6f3f..fb55631be1 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/InMemStorageExtension.scala @@ -6,8 +6,8 @@ package akka.persistence.testkit.internal import akka.actor.{ ActorSystem, ExtendedActorSystem, ExtensionId, ExtensionIdProvider } import akka.annotation.InternalApi -import akka.persistence.testkit.scaladsl.PersistenceTestKit import akka.persistence.testkit.EventStorage +import akka.persistence.testkit.scaladsl.PersistenceTestKit /** * INTERNAL API diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala index 88cd10c76d..9d25479dba 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SerializedEventStorageImpl.scala @@ -4,14 +4,14 @@ package akka.persistence.testkit.internal +import scala.util.Try + import akka.actor.{ ActorSystem, ExtendedActorSystem } import akka.annotation.InternalApi import akka.persistence.PersistentRepr import akka.persistence.testkit.EventStorage import akka.serialization.{ Serialization, SerializationExtension } -import scala.util.Try - /** * INTERNAL API */ diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala index cab5938335..276a72897a 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/SnapshotStorageEmulatorExtension.scala @@ -6,8 +6,8 @@ package akka.persistence.testkit.internal import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } import akka.annotation.InternalApi -import akka.persistence.testkit.scaladsl.SnapshotTestKit import akka.persistence.testkit.SnapshotStorage +import akka.persistence.testkit.scaladsl.SnapshotTestKit /** * INTERNAL API diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala index 3b28acc2dc..0b3fd01981 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/internal/TestKitStorage.scala @@ -7,12 +7,12 @@ package akka.persistence.testkit.internal import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicReference +import scala.collection.immutable + import akka.actor.Extension import akka.annotation.InternalApi import akka.persistence.testkit.ProcessingPolicy -import scala.collection.immutable - /** * INTERNAL API */ diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala index 1e01da1b44..75e381593c 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/PersistenceTestKit.scala @@ -4,16 +4,16 @@ package akka.persistence.testkit.javadsl -import akka.actor.ActorSystem -import akka.persistence.testkit.scaladsl.{ PersistenceTestKit => ScalaTestKit } -import akka.util.JavaDurationConverters._ -import akka.util.ccompat.JavaConverters._ import java.time.Duration import java.util.{ List => JList } import java.util.{ function => jf } +import akka.actor.ActorSystem import akka.annotation.ApiMayChange import akka.persistence.testkit.{ EventStorage, ExpectedFailure, ExpectedRejection, JournalOperation } +import akka.persistence.testkit.scaladsl.{ PersistenceTestKit => ScalaTestKit } +import akka.util.JavaDurationConverters._ +import akka.util.ccompat.JavaConverters._ /** * Class for testing persisted events in persistent actors. diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala index 11e4806c33..275ce5282a 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/javadsl/SnapshotTestKit.scala @@ -4,17 +4,17 @@ package akka.persistence.testkit.javadsl -import akka.actor.ActorSystem -import akka.persistence.testkit.scaladsl.{ SnapshotTestKit => ScalaTestKit } -import akka.persistence.testkit.{ ExpectedFailure, SnapshotMeta, SnapshotOperation, SnapshotStorage } -import akka.util.JavaDurationConverters._ -import akka.util.ccompat.JavaConverters._ import java.time.Duration import java.util.{ List => JList } import java.util.{ function => jf } +import akka.actor.ActorSystem import akka.annotation.ApiMayChange import akka.japi.Pair +import akka.persistence.testkit.{ ExpectedFailure, SnapshotMeta, SnapshotOperation, SnapshotStorage } +import akka.persistence.testkit.scaladsl.{ SnapshotTestKit => ScalaTestKit } +import akka.util.JavaDurationConverters._ +import akka.util.ccompat.JavaConverters._ /** * Class for testing persisted snapshots in persistent actors. diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala index 2e61a5135f..4216894ce8 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceInit.scala @@ -47,8 +47,9 @@ object PersistenceInit { extSystem.systemActorOf( PersistenceInitImpl.props(journalPluginId, snapshotPluginId, persistenceId), persistenceId) - import akka.pattern.ask import extSystem.dispatcher + + import akka.pattern.ask implicit val askTimeout: Timeout = timeout (ref ? "start").map(_ => Done) } diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala index cbdca4a262..f8fa04a348 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/PersistenceTestKit.scala @@ -4,19 +4,20 @@ package akka.persistence.testkit.scaladsl -import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId } -import akka.actor.typed.{ ActorSystem => TypedActorSystem } -import akka.annotation.ApiMayChange -import akka.persistence.testkit._ -import akka.persistence.testkit.internal.{ InMemStorageExtension, SnapshotStorageEmulatorExtension } -import akka.persistence.{ Persistence, PersistentRepr, SnapshotMetadata } -import akka.testkit.TestProbe -import com.typesafe.config.Config - import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import scala.util.Try +import com.typesafe.config.Config + +import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId } +import akka.actor.typed.{ ActorSystem => TypedActorSystem } +import akka.annotation.ApiMayChange +import akka.persistence.{ Persistence, PersistentRepr, SnapshotMetadata } +import akka.persistence.testkit._ +import akka.persistence.testkit.internal.{ InMemStorageExtension, SnapshotStorageEmulatorExtension } +import akka.testkit.TestProbe + private[testkit] trait CommonTestKitOps[S, P] extends ClearOps with PolicyOpsTestKit[P] { this: HasStorage[P, S] => diff --git a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala index 5ff497a955..89b6251c1d 100644 --- a/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala +++ b/akka-persistence-testkit/src/main/scala/akka/persistence/testkit/scaladsl/TestOps.scala @@ -4,17 +4,17 @@ package akka.persistence.testkit.scaladsl -import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies -import akka.persistence.testkit.internal.TestKitStorage -import akka.persistence.testkit.{ ExpectedFailure, ExpectedRejection } -import akka.testkit.TestKitBase -import akka.util -import akka.util.BoxedType - import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag +import akka.persistence.testkit.{ ExpectedFailure, ExpectedRejection } +import akka.persistence.testkit.ProcessingPolicy.DefaultPolicies +import akka.persistence.testkit.internal.TestKitStorage +import akka.testkit.TestKitBase +import akka.util +import akka.util.BoxedType + private[testkit] trait RejectSupport[U] { this: PolicyOpsTestKit[U] with HasStorage[U, _] => @@ -119,6 +119,7 @@ private[testkit] trait ExpectOps[U] { private[testkit] val probe: TestKitBase import probe._ + import akka.testkit._ private[testkit] def pollInterval: FiniteDuration diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala index 3c6694c0e9..f8a47a60e9 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/CommonUtils.scala @@ -6,11 +6,12 @@ package akka.persistence.testkit import java.util.UUID +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.{ ActorRef, ActorSystem } import akka.persistence._ import akka.testkit.TestKitBase -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike trait CommonUtils extends AnyWordSpecLike with TestKitBase { diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala index 4011529e95..40028e9ff8 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonSnapshotTests.scala @@ -4,14 +4,15 @@ package akka.persistence.testkit.javadsl +import org.scalatest.matchers.should.Matchers._ + import akka.actor.Props +import akka.actor.typed.javadsl.Adapter +import akka.japi.Pair import akka.persistence._ import akka.persistence.testkit._ import akka.testkit.EventFilter -import org.scalatest.matchers.should.Matchers._ import akka.util.ccompat.JavaConverters._ -import akka.japi.Pair -import akka.actor.typed.javadsl.Adapter trait CommonSnapshotTests extends JavaDslUtils { diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala index 2095741ab0..1ceb61f662 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/CommonTestKitTests.scala @@ -4,13 +4,14 @@ package akka.persistence.testkit.javadsl +import org.scalatest.matchers.should.Matchers._ + import akka.actor.Props +import akka.actor.typed.javadsl.Adapter import akka.persistence._ import akka.persistence.testkit._ import akka.testkit.EventFilter -import org.scalatest.matchers.should.Matchers._ import akka.util.ccompat.JavaConverters._ -import akka.actor.typed.javadsl.Adapter trait CommonTestKitTests extends JavaDslUtils { diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala index 3bd6c127b0..640416af9d 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/javadsl/JavaDslUtils.scala @@ -7,9 +7,9 @@ package akka.persistence.testkit.javadsl import java.util import akka.actor.typed.ActorRef -import akka.persistence.typed.javadsl.{ CommandHandler, EventHandler, EventSourcedBehavior, SignalHandler } import akka.persistence.testkit.{ Cmd, CommonUtils, EmptyState, Evt, Passivate, Recovered, Stopped, TestCommand } import akka.persistence.typed.{ PersistenceId, RecoveryCompleted } +import akka.persistence.typed.javadsl.{ CommandHandler, EventHandler, EventSourcedBehavior, SignalHandler } trait JavaDslUtils extends CommonUtils { diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala index 6a3f8756e4..08bb5ed021 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonSnapshotTests.scala @@ -4,12 +4,13 @@ package akka.persistence.testkit.scaladsl +import org.scalatest.matchers.should.Matchers._ + import akka.actor.Props +import akka.actor.typed.scaladsl.adapter._ import akka.persistence._ import akka.persistence.testkit._ import akka.testkit.EventFilter -import org.scalatest.matchers.should.Matchers._ -import akka.actor.typed.scaladsl.adapter._ trait CommonSnapshotTests extends ScalaDslUtils { diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala index 6acd0ac63d..6f0acc9c7c 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/CommonTestKitTests.scala @@ -4,12 +4,13 @@ package akka.persistence.testkit.scaladsl -import akka.actor.Props -import akka.persistence.{ DeleteMessagesFailure, DeleteMessagesSuccess } -import akka.testkit.EventFilter -import akka.persistence.testkit._ import org.scalatest.matchers.should.Matchers._ + +import akka.actor.Props import akka.actor.typed.scaladsl.adapter._ +import akka.persistence.{ DeleteMessagesFailure, DeleteMessagesSuccess } +import akka.persistence.testkit._ +import akka.testkit.EventFilter trait CommonTestKitTests extends ScalaDslUtils { diff --git a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala index 432f5fe4d5..ba55a0f45b 100644 --- a/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala +++ b/akka-persistence-testkit/src/test/scala/akka/persistence/testkit/scaladsl/ScalaDslUtils.scala @@ -5,10 +5,10 @@ package akka.persistence.testkit.scaladsl import akka.actor.typed.ActorRef -import akka.persistence.typed.RecoveryCompleted -import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } import akka.persistence.testkit.{ Cmd, CommonUtils, EmptyState, Evt, Passivate, Recovered, Stopped, TestCommand } import akka.persistence.typed.PersistenceId +import akka.persistence.typed.RecoveryCompleted +import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } trait ScalaDslUtils extends CommonUtils { diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala index b40fdcace4..c923343570 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/delivery/EventSourcedProducerQueue.scala @@ -8,7 +8,8 @@ import java.time.{ Duration => JavaDuration } import scala.concurrent.duration._ -import akka.util.JavaDurationConverters._ +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.actor.typed.SupervisorStrategy @@ -21,7 +22,7 @@ import akka.persistence.typed.delivery.EventSourcedProducerQueue.CleanupTick import akka.persistence.typed.scaladsl.Effect import akka.persistence.typed.scaladsl.EventSourcedBehavior import akka.persistence.typed.scaladsl.RetentionCriteria -import com.typesafe.config.Config +import akka.util.JavaDurationConverters._ /** * [[DurableProducerQueue]] that can be used with [[akka.actor.typed.delivery.ProducerController]] diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala index b338cd8f83..1ff5521cfd 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/BehaviorSetup.scala @@ -4,19 +4,20 @@ package akka.persistence.typed.internal -import akka.actor.typed.Signal -import akka.actor.typed.scaladsl.ActorContext -import akka.actor.{ ActorRef, Cancellable } -import akka.annotation.InternalApi -import akka.persistence._ -import akka.persistence.typed.scaladsl.{ EventSourcedBehavior, RetentionCriteria } -import akka.persistence.typed.{ EventAdapter, PersistenceId, SnapshotAdapter } -import akka.util.OptionVal -import org.slf4j.{ Logger, MDC } - import scala.concurrent.ExecutionContext import scala.util.control.NonFatal +import org.slf4j.{ Logger, MDC } + +import akka.actor.{ ActorRef, Cancellable } +import akka.actor.typed.Signal +import akka.actor.typed.scaladsl.ActorContext +import akka.annotation.InternalApi +import akka.persistence._ +import akka.persistence.typed.{ EventAdapter, PersistenceId, SnapshotAdapter } +import akka.persistence.typed.scaladsl.{ EventSourcedBehavior, RetentionCriteria } +import akka.util.OptionVal + /** * INTERNAL API */ @@ -51,6 +52,7 @@ private[akka] final class BehaviorSetup[C, E, S]( import BehaviorSetup._ import InternalProtocol.RecoveryTickEvent + import akka.actor.typed.scaladsl.adapter._ val persistence: Persistence = Persistence(context.system.toClassic) diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala index 3bbe0aed65..c5682151d2 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EffectImpl.scala @@ -6,10 +6,10 @@ package akka.persistence.typed.internal import scala.collection.immutable +import akka.actor.typed.ActorRef import akka.annotation.InternalApi import akka.persistence.typed.javadsl import akka.persistence.typed.scaladsl -import akka.actor.typed.ActorRef /** INTERNAL API */ @InternalApi diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala index 995e4921c7..9a14f72635 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedBehaviorImpl.scala @@ -29,14 +29,14 @@ import akka.persistence.typed.DeleteSnapshotsCompleted import akka.persistence.typed.DeleteSnapshotsFailed import akka.persistence.typed.DeletionTarget import akka.persistence.typed.EventAdapter -import akka.persistence.typed.SnapshotAdapter import akka.persistence.typed.NoOpEventAdapter import akka.persistence.typed.PersistenceId +import akka.persistence.typed.SnapshotAdapter import akka.persistence.typed.SnapshotCompleted import akka.persistence.typed.SnapshotFailed import akka.persistence.typed.SnapshotSelectionCriteria -import akka.persistence.typed.scaladsl.RetentionCriteria import akka.persistence.typed.scaladsl._ +import akka.persistence.typed.scaladsl.RetentionCriteria import akka.util.ConstantFun import akka.util.unused diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala index 88a002436a..8ca98cb068 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/EventSourcedSettings.scala @@ -8,10 +8,11 @@ import java.util.concurrent.TimeUnit import scala.concurrent.duration._ +import com.typesafe.config.Config + import akka.actor.typed.ActorSystem import akka.annotation.InternalApi import akka.persistence.Persistence -import com.typesafe.config.Config /** * INTERNAL API diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala index c82937481a..abe744434d 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ExternalInteractions.scala @@ -16,11 +16,9 @@ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.LoggerOps import akka.annotation.InternalApi import akka.annotation.InternalStableApi - +import akka.persistence._ import akka.persistence.JournalProtocol.ReplayMessages import akka.persistence.SnapshotProtocol.LoadSnapshot -import akka.persistence._ - import akka.util.unused /** INTERNAL API */ diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala index dc538923ad..4049b6ff5f 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingEvents.scala @@ -4,8 +4,8 @@ package akka.persistence.typed.internal -import scala.util.control.NonFatal import scala.concurrent.duration._ +import scala.util.control.NonFatal import akka.actor.typed.{ Behavior, Signal } import akka.actor.typed.internal.PoisonPill @@ -13,18 +13,18 @@ import akka.actor.typed.internal.UnstashException import akka.actor.typed.scaladsl.{ AbstractBehavior, ActorContext, Behaviors, LoggerOps } import akka.annotation.{ InternalApi, InternalStableApi } import akka.event.Logging -import akka.persistence.JournalProtocol._ import akka.persistence._ +import akka.persistence.JournalProtocol._ import akka.persistence.typed.EmptyEventSeq import akka.persistence.typed.EventsSeq -import akka.persistence.typed.RecoveryFailed import akka.persistence.typed.RecoveryCompleted +import akka.persistence.typed.RecoveryFailed import akka.persistence.typed.SingleEventSeq import akka.persistence.typed.internal.ReplayingEvents.ReplayingState import akka.persistence.typed.internal.Running.WithSeqNrAccessible import akka.util.OptionVal -import akka.util.unused import akka.util.PrettyDuration._ +import akka.util.unused /*** * INTERNAL API diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala index 2052e003a0..efd3db7055 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/ReplayingSnapshot.scala @@ -8,9 +8,9 @@ import akka.actor.typed.Behavior import akka.actor.typed.internal.PoisonPill import akka.actor.typed.scaladsl.{ ActorContext, Behaviors } import akka.annotation.{ InternalApi, InternalStableApi } +import akka.persistence._ import akka.persistence.SnapshotProtocol.LoadSnapshotFailed import akka.persistence.SnapshotProtocol.LoadSnapshotResult -import akka.persistence._ import akka.persistence.typed.RecoveryFailed import akka.util.unused diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala index 15a97f7986..5ca922fde0 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/RetentionCriteriaImpl.scala @@ -5,8 +5,8 @@ package akka.persistence.typed.internal import akka.annotation.InternalApi -import akka.persistence.typed.scaladsl import akka.persistence.typed.javadsl +import akka.persistence.typed.scaladsl /** * INTERNAL API diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala index a0545c9615..480bd80503 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/Running.scala @@ -6,6 +6,7 @@ package akka.persistence.typed.internal import scala.annotation.tailrec import scala.collection.immutable + import akka.actor.UnhandledMessage import akka.actor.typed.Behavior import akka.actor.typed.Signal @@ -25,17 +26,17 @@ import akka.persistence.SaveSnapshotFailure import akka.persistence.SaveSnapshotSuccess import akka.persistence.SnapshotProtocol import akka.persistence.journal.Tagged -import akka.persistence.typed.DeleteSnapshotsCompleted -import akka.persistence.typed.DeleteSnapshotsFailed import akka.persistence.typed.DeleteEventsCompleted import akka.persistence.typed.DeleteEventsFailed +import akka.persistence.typed.DeleteSnapshotsCompleted +import akka.persistence.typed.DeleteSnapshotsFailed import akka.persistence.typed.DeletionTarget import akka.persistence.typed.EventRejectedException import akka.persistence.typed.SnapshotCompleted import akka.persistence.typed.SnapshotFailed -import akka.persistence.typed.internal.Running.WithSeqNrAccessible import akka.persistence.typed.SnapshotMetadata import akka.persistence.typed.SnapshotSelectionCriteria +import akka.persistence.typed.internal.Running.WithSeqNrAccessible import akka.persistence.typed.scaladsl.Effect import akka.util.unused @@ -91,9 +92,9 @@ private[akka] object Running { extends JournalInteractions[C, E, S] with SnapshotInteractions[C, E, S] with StashManagement[C, E, S] { + import BehaviorSetup._ import InternalProtocol._ import Running.RunningState - import BehaviorSetup._ final class HandlingCommands(state: RunningState[S]) extends AbstractBehavior[InternalProtocol](setup.context) diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala index d11506bbbf..d474038de8 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/internal/StashManagement.scala @@ -4,13 +4,13 @@ package akka.persistence.typed.internal -import akka.actor.typed.Behavior import akka.actor.Dropped -import akka.actor.typed.scaladsl.adapter._ -import akka.actor.typed.scaladsl.StashOverflowException +import akka.actor.typed.Behavior import akka.actor.typed.scaladsl.ActorContext import akka.actor.typed.scaladsl.LoggerOps import akka.actor.typed.scaladsl.StashBuffer +import akka.actor.typed.scaladsl.StashOverflowException +import akka.actor.typed.scaladsl.adapter._ import akka.annotation.InternalApi import akka.util.ConstantFun diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala index 21800d0f51..2c77aef16f 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandler.scala @@ -7,12 +7,12 @@ package akka.persistence.typed.javadsl import java.util.Objects import java.util.function.{ BiFunction, Predicate, Supplier, Function => JFunction } +import scala.compat.java8.FunctionConverters._ + import akka.annotation.InternalApi import akka.persistence.typed.internal._ import akka.util.OptionVal -import scala.compat.java8.FunctionConverters._ - /** * FunctionalInterface for reacting on commands * diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala index b8c6270b50..4fc7db9d59 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/CommandHandlerWithReply.scala @@ -7,12 +7,12 @@ package akka.persistence.typed.javadsl import java.util.Objects import java.util.function.{ BiFunction, Predicate, Supplier, Function => JFunction } +import scala.compat.java8.FunctionConverters._ + import akka.annotation.InternalApi import akka.persistence.typed.internal._ import akka.util.OptionVal -import scala.compat.java8.FunctionConverters._ - /* Note that this is a copy of CommandHandler.scala to support ReplyEffect * s/Effect/ReplyEffect/ * s/CommandHandler/CommandHandlerWithReply/ diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala index 418de29531..2fe8d4e750 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/Effect.scala @@ -4,13 +4,13 @@ package akka.persistence.typed.javadsl -import akka.util.ccompat.JavaConverters._ +import akka.actor.typed.ActorRef import akka.annotation.DoNotInherit import akka.annotation.InternalApi import akka.japi.function -import akka.persistence.typed.internal.SideEffect import akka.persistence.typed.internal._ -import akka.actor.typed.ActorRef +import akka.persistence.typed.internal.SideEffect +import akka.util.ccompat.JavaConverters._ /** * INTERNAL API: see `class EffectFactories` diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala index 113c2b9368..d5b9ce4433 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventHandler.scala @@ -7,11 +7,11 @@ package akka.persistence.typed.javadsl import java.util.Objects import java.util.function.{ BiFunction, Predicate, Supplier, Function => JFunction } +import scala.compat.java8.FunctionConverters._ + import akka.annotation.InternalApi import akka.util.OptionVal -import scala.compat.java8.FunctionConverters._ - /** * FunctionalInterface for reacting on events having been persisted * diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala index 15976bded4..672d75dcb1 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/EventSourcedBehavior.scala @@ -13,8 +13,8 @@ import akka.actor.typed.Behavior import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior import akka.actor.typed.javadsl.ActorContext import akka.annotation.InternalApi -import akka.persistence.typed.EventAdapter import akka.persistence.typed._ +import akka.persistence.typed.EventAdapter import akka.persistence.typed.internal._ import akka.util.unused diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala index 6fbaaf846f..f645a352ec 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/javadsl/PersistentFSMMigration.scala @@ -6,11 +6,12 @@ package akka.persistence.typed.javadsl import java.time.Duration import java.util.Optional -import akka.japi.function.Function3 -import akka.util.JavaDurationConverters._ + import scala.compat.java8.OptionConverters._ +import akka.japi.function.Function3 import akka.persistence.typed.SnapshotAdapter +import akka.util.JavaDurationConverters._ /** * Helper functions for migration from PersistentFSM to Persistence Typed diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala index ea33b17591..65cc3cf839 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/Effect.scala @@ -5,10 +5,11 @@ package akka.persistence.typed.scaladsl import scala.collection.{ immutable => im } -import akka.annotation.DoNotInherit -import akka.persistence.typed.internal.SideEffect -import akka.persistence.typed.internal._ + import akka.actor.typed.ActorRef +import akka.annotation.DoNotInherit +import akka.persistence.typed.internal._ +import akka.persistence.typed.internal.SideEffect /** * Factory methods for creating [[Effect]] directives - how an event sourced actor reacts on a command. diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala index 44fddfd5ea..22e7dee699 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/EventSourcedBehavior.scala @@ -5,17 +5,18 @@ package akka.persistence.typed.scaladsl import scala.annotation.tailrec + import akka.actor.typed.BackoffSupervisorStrategy import akka.actor.typed.Behavior -import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior import akka.actor.typed.Signal +import akka.actor.typed.internal.BehaviorImpl.DeferredBehavior import akka.actor.typed.internal.InterceptorImpl import akka.actor.typed.internal.LoggerClass import akka.actor.typed.scaladsl.ActorContext import akka.annotation.DoNotInherit import akka.persistence.typed.EventAdapter -import akka.persistence.typed.SnapshotAdapter import akka.persistence.typed.PersistenceId +import akka.persistence.typed.SnapshotAdapter import akka.persistence.typed.SnapshotSelectionCriteria import akka.persistence.typed.internal._ diff --git a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala index 9a002989da..f939e1f8bb 100644 --- a/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala +++ b/akka-persistence-typed/src/main/scala/akka/persistence/typed/scaladsl/PersistentFSMMigration.scala @@ -4,11 +4,11 @@ package akka.persistence.typed.scaladsl +import scala.concurrent.duration.FiniteDuration + import akka.persistence.fsm.PersistentFSM.PersistentFSMSnapshot import akka.persistence.typed.SnapshotAdapter -import scala.concurrent.duration.FiniteDuration - /** * Helper functions for migration from PersistentFSM to Persistence Typed */ diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala index 4ffe53da65..69940c21ba 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/ClusterSingletonPersistenceSpec.scala @@ -4,19 +4,20 @@ package akka.persistence.typed +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.ActorRef +import akka.actor.typed.ActorSystem import akka.actor.typed.Behavior import akka.cluster.typed.ClusterSingleton import akka.cluster.typed.SingletonActor import akka.persistence.typed.scaladsl.Effect import akka.persistence.typed.scaladsl.EventSourcedBehavior -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor -import akka.actor.typed.ActorSystem object ClusterSingletonPersistenceSpec { val config = ConfigFactory.parseString(""" @@ -57,6 +58,7 @@ class ClusterSingletonPersistenceSpec with AnyWordSpecLike with LogCapturing { import ClusterSingletonPersistenceSpec._ + import akka.actor.typed.scaladsl.adapter._ implicit val s: ActorSystem[Nothing] = system diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala index e343fa64ca..908e237556 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/ManyRecoveriesSpec.scala @@ -4,19 +4,20 @@ package akka.persistence.typed -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps -import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler -import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } -import akka.testkit.TestLatch -import akka.actor.testkit.typed.scaladsl.TestProbe import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit +import akka.actor.testkit.typed.scaladsl.TestProbe +import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.adapter.TypedActorSystemOps +import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } +import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler +import akka.testkit.TestLatch + object ManyRecoveriesSpec { sealed case class Cmd(s: String) diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala index 26673fd55d..1a417b6750 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/PersistenceIdSpec.scala @@ -4,10 +4,11 @@ package akka.persistence.typed -import akka.actor.testkit.typed.scaladsl.LogCapturing import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.testkit.typed.scaladsl.LogCapturing + class PersistenceIdSpec extends AnyWordSpec with Matchers with LogCapturing { "PersistenceId" must { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala index ec44854444..a6d2455878 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/StashingWhenSnapshottingSpec.scala @@ -6,25 +6,26 @@ package akka.persistence.typed import java.util.concurrent.CyclicBarrier +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.util.Success + +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe import akka.actor.typed.ActorSystem import akka.actor.typed.Extension import akka.actor.typed.ExtensionId +import akka.actor.typed.scaladsl.adapter._ import akka.persistence import akka.persistence.SelectedSnapshot import akka.persistence.snapshot.SnapshotStore -import com.typesafe.config.ConfigFactory -import akka.actor.typed.scaladsl.adapter._ import akka.persistence.typed.StashingWhenSnapshottingSpec.ControllableSnapshotStoreExt import akka.persistence.typed.scaladsl.Effect import akka.persistence.typed.scaladsl.EventSourcedBehavior -import scala.concurrent.Future -import scala.concurrent.Promise -import scala.util.Success - -import akka.actor.testkit.typed.scaladsl.LogCapturing -import org.scalatest.wordspec.AnyWordSpecLike object StashingWhenSnapshottingSpec { object ControllableSnapshotStoreExt extends ExtensionId[ControllableSnapshotStoreExt] { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala index b3e620b0a2..472a2f5e98 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/EventSourcedProducerQueueSpec.scala @@ -6,10 +6,14 @@ package akka.persistence.typed.delivery import java.util.UUID import java.util.concurrent.atomic.AtomicInteger + import scala.concurrent.duration._ +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ -import akka.actor.typed.eventstream.EventStream import akka.actor.typed.delivery.DurableProducerQueue.Confirmed import akka.actor.typed.delivery.DurableProducerQueue.LoadState import akka.actor.typed.delivery.DurableProducerQueue.MessageSent @@ -18,11 +22,9 @@ import akka.actor.typed.delivery.DurableProducerQueue.State import akka.actor.typed.delivery.DurableProducerQueue.StoreMessageConfirmed import akka.actor.typed.delivery.DurableProducerQueue.StoreMessageSent import akka.actor.typed.delivery.DurableProducerQueue.StoreMessageSentAck +import akka.actor.typed.eventstream.EventStream import akka.persistence.journal.inmem.InmemJournal import akka.persistence.typed.PersistenceId -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedProducerQueueSpec { def conf: Config = diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala index 0e019dcc35..9b719c337f 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/ReliableDeliveryWithEventSourcedProducerQueueSpec.scala @@ -6,13 +6,14 @@ package akka.persistence.typed.delivery import java.util.UUID +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.delivery.ConsumerController import akka.actor.typed.delivery.ProducerController import akka.persistence.typed.PersistenceId -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object ReliableDeliveryWithEventSourcedProducerQueueSpec { def conf: Config = diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala index 82d88ddf6d..5cc2949c16 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/delivery/WorkPullingWithEventSourcedProducerQueueSpec.scala @@ -7,15 +7,16 @@ package akka.persistence.typed.delivery import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.FishingOutcome import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.delivery.ConsumerController import akka.actor.typed.delivery.WorkPullingProducerController import akka.actor.typed.receptionist.ServiceKey import akka.persistence.typed.PersistenceId -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object WorkPullingWithEventSourcedProducerQueueSpec { def conf: Config = diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala index 7dbd615e2a..666a42c234 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RecoveryPermitterSpec.scala @@ -4,25 +4,26 @@ package akka.persistence.typed.internal -import akka.actor.PoisonPill -import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.typed.scaladsl.Behaviors -import akka.actor.typed.scaladsl.adapter.{ TypedActorRefOps, TypedActorSystemOps } -import akka.actor.typed.{ ActorRef, Behavior } -import akka.persistence.Persistence -import akka.persistence.RecoveryPermitter.{ RecoveryPermitGranted, RequestRecoveryPermit, ReturnRecoveryPermit } -import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler -import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.ActorSystem +import akka.actor.PoisonPill +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.actor.testkit.typed.scaladsl.TestProbe +import akka.actor.typed.{ ActorRef, Behavior } +import akka.actor.typed.scaladsl.Behaviors +import akka.actor.typed.scaladsl.adapter.{ TypedActorRefOps, TypedActorSystemOps } +import akka.persistence.Persistence +import akka.persistence.RecoveryPermitter.{ RecoveryPermitGranted, RequestRecoveryPermit, ReturnRecoveryPermit } import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted -import org.scalatest.wordspec.AnyWordSpecLike -import akka.actor.ActorSystem +import akka.persistence.typed.scaladsl.{ Effect, EventSourcedBehavior } +import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler object RecoveryPermitterSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala index 81dca58b1e..9ee081a609 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/RetentionCriteriaSpec.scala @@ -4,12 +4,13 @@ package akka.persistence.typed.internal -import akka.actor.testkit.typed.scaladsl.LogCapturing -import akka.persistence.typed.scaladsl.RetentionCriteria import org.scalatest.TestSuite import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike +import akka.actor.testkit.typed.scaladsl.LogCapturing +import akka.persistence.typed.scaladsl.RetentionCriteria + class RetentionCriteriaSpec extends TestSuite with Matchers with AnyWordSpecLike with LogCapturing { "RetentionCriteria" must { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala index 40bd752dfa..9db11c23d9 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/internal/StashStateSpec.scala @@ -6,14 +6,15 @@ package akka.persistence.typed.internal import scala.concurrent.duration._ +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.Behavior import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.internal.InternalProtocol.IncomingCommand import akka.persistence.typed.internal.InternalProtocol.RecoveryPermitGranted -import org.scalatest.wordspec.AnyWordSpecLike class StashStateSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike with LogCapturing { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala index a5732632f6..3cf4ee20ac 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorFailureSpec.scala @@ -9,6 +9,10 @@ import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Try +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.scaladsl._ @@ -27,9 +31,6 @@ import akka.persistence.typed.RecoveryCompleted import akka.persistence.typed.RecoveryCompleted import akka.persistence.typed.RecoveryFailed import akka.persistence.typed.internal.JournalFailureException -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike class ChaosJournal extends InmemJournal { var counts = Map.empty[String, Int] diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala index 7a3a330d30..4be6ba60e4 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorInterceptorSpec.scala @@ -6,6 +6,10 @@ package akka.persistence.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior @@ -13,9 +17,6 @@ import akka.actor.typed.BehaviorInterceptor import akka.actor.typed.TypedActorContext import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.PersistenceId -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorInterceptorSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala index c7b37b79c8..f045ef793f 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRecoveryTimeoutSpec.scala @@ -8,6 +8,10 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.duration._ +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior @@ -17,9 +21,6 @@ import akka.persistence.journal.SteppingInmemJournal import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryFailed import akka.persistence.typed.internal.JournalFailureException -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorRecoveryTimeoutSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala index 297a4fab97..50133e4666 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorReplySpec.scala @@ -7,6 +7,10 @@ package akka.persistence.typed.scaladsl import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef @@ -15,9 +19,6 @@ import akka.actor.typed.scaladsl.ActorContext import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.PersistenceId import akka.serialization.jackson.CborSerializable -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorReplySpec { def conf: Config = ConfigFactory.parseString(s""" diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala index 08ccdda1d6..6e47cd74f8 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorRetentionSpec.scala @@ -7,8 +7,15 @@ package akka.persistence.typed.scaladsl import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.duration._ import scala.util.Success import scala.util.Try + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior @@ -26,11 +33,6 @@ import akka.persistence.typed.SnapshotFailed import akka.persistence.typed.SnapshotSelectionCriteria import akka.serialization.jackson.CborSerializable import akka.util.unused -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorRetentionSpec extends Matchers { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala index d966f75e0e..8e4b491893 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorSpec.scala @@ -14,6 +14,10 @@ import scala.util.Failure import scala.util.Success import scala.util.Try +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.ActorInitializationException import akka.actor.testkit.typed.TestException @@ -25,6 +29,8 @@ import akka.actor.typed.SupervisorStrategy import akka.actor.typed.Terminated import akka.actor.typed.scaladsl.ActorContext import akka.actor.typed.scaladsl.Behaviors +import akka.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata } +import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria } import akka.persistence.SelectedSnapshot import akka.persistence.journal.inmem.InmemJournal import akka.persistence.query.EventEnvelope @@ -37,13 +43,8 @@ import akka.persistence.typed.RecoveryCompleted import akka.persistence.typed.SnapshotCompleted import akka.persistence.typed.SnapshotFailed import akka.persistence.typed.SnapshotMetadata -import akka.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata } -import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria } import akka.serialization.jackson.CborSerializable import akka.stream.scaladsl.Sink -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala index 050e0118d7..654025151f 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorStashSpec.scala @@ -10,13 +10,17 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.duration._ +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.NotUsed +import akka.actor.Dropped +import akka.actor.UnhandledMessage import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior -import akka.actor.Dropped -import akka.actor.UnhandledMessage import akka.actor.typed.PostStop import akka.actor.typed.SupervisorStrategy import akka.actor.typed.eventstream.EventStream @@ -26,9 +30,6 @@ import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.adapter._ import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorStashSpec { def conf: Config = ConfigFactory.parseString(s""" diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala index e012ea1383..c6ec83b203 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorTimersSpec.scala @@ -9,14 +9,15 @@ import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.duration._ +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.PersistenceId -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorTimersSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala index b2afca57ba..c76407b217 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedBehaviorWatchSpec.scala @@ -6,11 +6,14 @@ package akka.persistence.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.scaladsl.{ LogCapturing, LoggingTestKit, ScalaTestWithActorTestKit, TestProbe } import akka.actor.typed._ import akka.actor.typed.scaladsl.{ ActorContext, Behaviors } import akka.persistence.Recovery +import akka.persistence.typed.{ NoOpEventAdapter, PersistenceId, RecoveryCompleted } import akka.persistence.typed.internal.{ BehaviorSetup, EventSourcedSettings, @@ -19,10 +22,8 @@ import akka.persistence.typed.internal.{ StashState } import akka.persistence.typed.internal.EventSourcedBehaviorImpl.WriterIdentity -import akka.persistence.typed.{ NoOpEventAdapter, PersistenceId, RecoveryCompleted } import akka.serialization.jackson.CborSerializable import akka.util.ConstantFun -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedBehaviorWatchSpec { sealed trait Command extends CborSerializable diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala index 41391ce6a2..2ac9907a5e 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedEventAdapterSpec.scala @@ -7,9 +7,12 @@ package akka.persistence.typed.scaladsl import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorRef import akka.actor.typed.scaladsl.Behaviors import akka.persistence.query.EventEnvelope @@ -22,8 +25,6 @@ import akka.persistence.typed.PersistenceId import akka.serialization.jackson.CborSerializable import akka.stream.scaladsl.Sink import akka.testkit.JavaSerializable -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedEventAdapterSpec { @@ -84,7 +85,6 @@ class EventSourcedEventAdapterSpec extends ScalaTestWithActorTestKit(EventSourcedEventAdapterSpec.conf) with AnyWordSpecLike with LogCapturing { - import EventSourcedEventAdapterSpec._ import EventSourcedBehaviorSpec.{ counter, Command, @@ -95,6 +95,7 @@ class EventSourcedEventAdapterSpec Incremented, State } + import EventSourcedEventAdapterSpec._ val pidCounter = new AtomicInteger(0) private def nextPid(): PersistenceId = PersistenceId.ofUniqueId(s"c${pidCounter.incrementAndGet()})") diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala index 768e8febe4..3c3947ab30 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSequenceNumberSpec.scala @@ -4,14 +4,15 @@ package akka.persistence.typed.scaladsl -import akka.actor.testkit.typed.scaladsl.LogCapturing +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.{ ScalaTestWithActorTestKit, TestProbe } +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.{ ActorRef, Behavior } import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedSequenceNumberSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala index 31bbc7a8ca..7d75da5e2b 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/EventSourcedSnapshotAdapterSpec.scala @@ -7,6 +7,10 @@ package akka.persistence.typed.scaladsl import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe @@ -16,9 +20,6 @@ import akka.persistence.query.journal.leveldb.scaladsl.LeveldbReadJournal import akka.persistence.typed.PersistenceId import akka.persistence.typed.SnapshotAdapter import akka.serialization.jackson.CborSerializable -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object EventSourcedSnapshotAdapterSpec { private val conf: Config = ConfigFactory.parseString(s""" @@ -38,6 +39,7 @@ class EventSourcedSnapshotAdapterSpec with AnyWordSpecLike with LogCapturing { import EventSourcedSnapshotAdapterSpec._ + import akka.actor.typed.scaladsl.adapter._ val pidCounter = new AtomicInteger(0) diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala index 296bb42bf8..707117b162 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/LoggerSourceSpec.scala @@ -5,17 +5,18 @@ package akka.persistence.typed.scaladsl import java.util.concurrent.atomic.AtomicInteger +import org.scalatest.wordspec.AnyWordSpecLike +import org.slf4j.event.Level + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.Behavior import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted import akka.persistence.typed.SnapshotCompleted import akka.persistence.typed.SnapshotFailed -import org.slf4j.event.Level -import org.scalatest.wordspec.AnyWordSpecLike // Note that the spec name here is important since there are heuristics in place to avoid names // starting with EventSourcedBehavior diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala index e25146f6b1..433f10b57f 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/NullEmptyStateSpec.scala @@ -4,14 +4,15 @@ package akka.persistence.typed.scaladsl +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestKitSettings import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object NullEmptyStateSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala index 9150c5a78a..13939e2f07 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/OptionalSnapshotStoreSpec.scala @@ -6,14 +6,15 @@ package akka.persistence.typed.scaladsl import java.util.UUID +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LoggingTestKit import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.persistence.typed.PersistenceId import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler import akka.serialization.jackson.CborSerializable -import org.scalatest.wordspec.AnyWordSpecLike object OptionalSnapshotStoreSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala index 37abf4628d..ff63266e5d 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PerformanceSpec.scala @@ -8,18 +8,19 @@ import java.util.UUID import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.TestException +import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.testkit.typed.scaladsl.TestProbe -import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.typed.ActorRef import akka.actor.typed.SupervisorStrategy import akka.actor.typed.scaladsl.Behaviors import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted import akka.persistence.typed.scaladsl.EventSourcedBehavior.CommandHandler -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object PerformanceSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala index 545fac3c6c..bbb6d6741e 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PersistentActorCompileOnlyTest.scala @@ -4,18 +4,18 @@ package akka.persistence.typed.scaladsl -import akka.actor.typed.ActorSystem - import scala.concurrent.ExecutionContext +import scala.concurrent.Future import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent + import akka.actor.typed.{ ActorRef, Behavior } +import akka.actor.typed.ActorSystem import akka.actor.typed.scaladsl.Behaviors import akka.actor.typed.scaladsl.TimerScheduler import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted -import com.github.ghik.silencer.silent - -import scala.concurrent.Future // unused names in pattern match can be useful in the docs @silent diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala index 073810d06e..1fa472d7e3 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/PrimitiveStateSpec.scala @@ -4,13 +4,14 @@ package akka.persistence.typed.scaladsl +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior import akka.persistence.typed.PersistenceId import akka.persistence.typed.RecoveryCompleted -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object PrimitiveStateSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala index e145e8d19f..7d77e1717e 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SlowInMemorySnapshotStore.scala @@ -4,13 +4,13 @@ package akka.persistence.typed.scaladsl +import scala.concurrent.Future + +import akka.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata } +import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria } import akka.persistence.SelectedSnapshot import akka.persistence.snapshot.SnapshotStore import akka.persistence.typed.scaladsl.SnapshotMutableStateSpec.MutableState -import akka.persistence.{ SnapshotSelectionCriteria => ClassicSnapshotSelectionCriteria } -import akka.persistence.{ SnapshotMetadata => ClassicSnapshotMetadata } - -import scala.concurrent.Future class SlowInMemorySnapshotStore extends SnapshotStore { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala index 15a3ad6aa2..c05108fb59 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotMutableStateSpec.scala @@ -7,6 +7,10 @@ package akka.persistence.typed.scaladsl import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.Behavior @@ -14,9 +18,6 @@ import akka.persistence.typed.PersistenceId import akka.persistence.typed.SnapshotCompleted import akka.persistence.typed.SnapshotFailed import akka.serialization.jackson.CborSerializable -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.wordspec.AnyWordSpecLike object SnapshotMutableStateSpec { diff --git a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala index 68deea04c3..4ed257cc2d 100644 --- a/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala +++ b/akka-persistence-typed/src/test/scala/akka/persistence/typed/scaladsl/SnapshotRecoveryWithEmptyJournalSpec.scala @@ -7,6 +7,11 @@ package akka.persistence.typed.scaladsl import java.io.File import java.util.UUID +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.apache.commons.io.FileUtils +import org.scalatest.wordspec.AnyWordSpecLike + import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.ActorRef @@ -16,10 +21,6 @@ import akka.persistence.serialization.Snapshot import akka.persistence.typed.PersistenceId import akka.serialization.Serialization import akka.serialization.SerializationExtension -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.apache.commons.io.FileUtils -import org.scalatest.wordspec.AnyWordSpecLike object SnapshotRecoveryWithEmptyJournalSpec { val survivingSnapshotPath = s"target/survivingSnapshotPath-${UUID.randomUUID().toString}" diff --git a/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala b/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala index dffbbd5fb0..166633e1ae 100644 --- a/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala +++ b/akka-persistence/src/main/scala/akka/persistence/AtLeastOnceDelivery.scala @@ -8,11 +8,11 @@ import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import akka.actor.{ ActorPath, ActorSelection, NotInfluenceReceiveTimeout } -import akka.persistence.serialization.Message import akka.actor.Cancellable import akka.actor.DeadLetterSuppression import akka.annotation.InternalApi import akka.persistence.AtLeastOnceDelivery.Internal.Delivery +import akka.persistence.serialization.Message import akka.util.ccompat._ @ccompatUsedUntil213 diff --git a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala index 3245cf99b6..c4397bc78d 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Eventsourced.scala @@ -7,17 +7,18 @@ package akka.persistence import java.util.UUID import java.util.concurrent.atomic.AtomicInteger +import scala.collection.immutable +import scala.concurrent.duration.FiniteDuration +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorCell, DeadLetter, StashOverflowException } import akka.annotation.{ InternalApi, InternalStableApi } import akka.dispatch.Envelope import akka.event.{ Logging, LoggingAdapter } import akka.util.Helpers.ConfigOps -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory - -import scala.collection.immutable -import scala.concurrent.duration.FiniteDuration -import scala.util.control.NonFatal /** INTERNAL API */ @InternalApi diff --git a/akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala b/akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala index a748593c8e..a0bfd4748e 100644 --- a/akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala +++ b/akka-persistence/src/main/scala/akka/persistence/JournalProtocol.scala @@ -4,10 +4,10 @@ package akka.persistence -import akka.actor._ - import scala.collection.immutable +import akka.actor._ + /** * INTERNAL API. * diff --git a/akka-persistence/src/main/scala/akka/persistence/Persistence.scala b/akka-persistence/src/main/scala/akka/persistence/Persistence.scala index 1c168e357c..317c5f32be 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Persistence.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Persistence.scala @@ -7,20 +7,20 @@ package akka.persistence import java.util.concurrent.atomic.AtomicReference import java.util.function.Consumer +import scala.annotation.tailrec +import scala.concurrent.duration._ +import scala.util.control.NonFatal + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor._ +import akka.annotation.InternalApi +import akka.annotation.InternalStableApi import akka.event.{ Logging, LoggingAdapter } import akka.persistence.journal.{ EventAdapters, IdentityEventAdapters } import akka.util.Collections.EmptyImmutableSeq import akka.util.Helpers.ConfigOps -import com.typesafe.config.{ Config, ConfigFactory } -import scala.annotation.tailrec -import scala.concurrent.duration._ - import akka.util.Reflect -import scala.util.control.NonFatal - -import akka.annotation.InternalApi -import akka.annotation.InternalStableApi /** * Persistence configuration. diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala b/akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala index f8e70ac3d2..2515054ce3 100644 --- a/akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala +++ b/akka-persistence/src/main/scala/akka/persistence/PersistencePlugin.scala @@ -6,15 +6,16 @@ package akka.persistence import java.util.concurrent.atomic.AtomicReference +import scala.annotation.tailrec +import scala.reflect.ClassTag +import scala.util.Failure + +import com.typesafe.config.Config + import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId } import akka.annotation.InternalApi import akka.event.Logging import akka.persistence.PersistencePlugin.PluginHolder -import com.typesafe.config.Config - -import scala.annotation.tailrec -import scala.reflect.ClassTag -import scala.util.Failure /** * INTERNAL API diff --git a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala b/akka-persistence/src/main/scala/akka/persistence/Persistent.scala index 20164a9314..f260f79124 100644 --- a/akka-persistence/src/main/scala/akka/persistence/Persistent.scala +++ b/akka-persistence/src/main/scala/akka/persistence/Persistent.scala @@ -4,11 +4,11 @@ package akka.persistence -import akka.actor.{ ActorRef, NoSerializationVerificationNeeded } -import akka.persistence.serialization.Message import scala.collection.immutable +import akka.actor.{ ActorRef, NoSerializationVerificationNeeded } import akka.annotation.DoNotInherit +import akka.persistence.serialization.Message import akka.util.HashCode /** diff --git a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala b/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala index 9b45ef855c..474b2a9641 100644 --- a/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala +++ b/akka-persistence/src/main/scala/akka/persistence/PersistentActor.scala @@ -9,11 +9,12 @@ import java.lang.{ Iterable => JIterable } import scala.collection.immutable import scala.util.control.NoStackTrace +import com.typesafe.config.Config + import akka.actor._ import akka.annotation.InternalApi import akka.japi.Procedure import akka.japi.Util -import com.typesafe.config.Config abstract class RecoveryCompleted diff --git a/akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala b/akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala index a9a596b280..4f07df4ec3 100644 --- a/akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala +++ b/akka-persistence/src/main/scala/akka/persistence/RecoveryPermitter.scala @@ -4,12 +4,12 @@ package akka.persistence -import akka.annotation.{ InternalApi, InternalStableApi } import akka.actor.Actor import akka.actor.ActorLogging import akka.actor.ActorRef import akka.actor.Props import akka.actor.Terminated +import akka.annotation.{ InternalApi, InternalStableApi } import akka.util.MessageBuffer /** diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala index fca43099e6..510c8b9134 100644 --- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala +++ b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSM.scala @@ -4,20 +4,21 @@ package akka.persistence.fsm -import akka.actor._ -import akka.annotation.InternalApi -import akka.persistence.fsm.PersistentFSM.FSMState -import akka.persistence.serialization.Message -import akka.persistence.{ PersistentActor, RecoveryCompleted, SnapshotOffer } -import akka.util.JavaDurationConverters +import scala.annotation.varargs +import scala.collection.immutable +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration._ +import scala.reflect.ClassTag + import com.github.ghik.silencer.silent import com.typesafe.config.Config -import scala.annotation.varargs -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.reflect.ClassTag -import scala.concurrent.ExecutionContextExecutor +import akka.actor._ +import akka.annotation.InternalApi +import akka.persistence.{ PersistentActor, RecoveryCompleted, SnapshotOffer } +import akka.persistence.fsm.PersistentFSM.FSMState +import akka.persistence.serialization.Message +import akka.util.JavaDurationConverters /** * SnapshotAfter Extension Id and factory for creating SnapshotAfter extension diff --git a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala index eb33fe0295..6f325d9dc0 100644 --- a/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala +++ b/akka-persistence/src/main/scala/akka/persistence/fsm/PersistentFSMBase.scala @@ -4,15 +4,16 @@ package akka.persistence.fsm +import scala.collection.mutable +import scala.concurrent.duration.FiniteDuration + +import language.implicitConversions + import akka.actor._ import akka.japi.pf.{ FSMTransitionHandlerBuilder, UnitMatch, UnitPFBuilder } -import language.implicitConversions -import scala.collection.mutable - import akka.routing.{ Deafen, Listen, Listeners } -import akka.util.unused import akka.util.JavaDurationConverters._ -import scala.concurrent.duration.FiniteDuration +import akka.util.unused /** * Finite State Machine actor trait. Use as follows: @@ -720,11 +721,13 @@ object AbstractPersistentFSMBase { */ @deprecated("Use EventSourcedBehavior", "2.6.0") abstract class AbstractPersistentFSMBase[S, D, E] extends PersistentFSMBase[S, D, E] { + import java.util.{ List => JList } + + import PersistentFSM._ + + import akka.japi.pf.FI._ import akka.persistence.fsm.japi.pf.FSMStateFunctionBuilder import akka.persistence.fsm.japi.pf.FSMStopBuilder - import akka.japi.pf.FI._ - import java.util.{ List => JList } - import PersistentFSM._ /** * Returns this AbstractActor's ActorContext diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala index f47cea2c46..33426702fe 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteJournal.scala @@ -4,19 +4,18 @@ package akka.persistence.journal -import scala.concurrent.duration._ - -import akka.actor._ -import akka.pattern.pipe -import akka.persistence._ -import akka.util.Helpers.toRootLowerCase import scala.collection.immutable import scala.concurrent.ExecutionContext import scala.concurrent.Future +import scala.concurrent.duration._ import scala.util.{ Failure, Success, Try } import scala.util.control.NonFatal +import akka.actor._ import akka.pattern.CircuitBreaker +import akka.pattern.pipe +import akka.persistence._ +import akka.util.Helpers.toRootLowerCase /** * Abstract journal, optimized for asynchronous, non-blocking writes. diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala index 6327a29909..4834552630 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/AsyncWriteProxy.scala @@ -4,16 +4,16 @@ package akka.persistence.journal +import scala.collection.immutable +import scala.concurrent._ +import scala.concurrent.duration.Duration +import scala.util.Try + import akka.AkkaException import akka.actor._ import akka.pattern.ask import akka.persistence._ import akka.util._ -import scala.util.Try - -import scala.collection.immutable -import scala.concurrent._ -import scala.concurrent.duration.Duration /** * INTERNAL API. diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala b/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala index 46cfd25953..de13145a93 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/EventAdapters.scala @@ -7,16 +7,17 @@ package akka.persistence.journal import java.util import java.util.concurrent.ConcurrentHashMap -import akka.actor.ExtendedActorSystem -import akka.event.{ Logging, LoggingAdapter } -import akka.util.ccompat._ -import com.typesafe.config.Config - import scala.collection.immutable import scala.collection.mutable.ArrayBuffer import scala.reflect.ClassTag import scala.util.Try +import com.typesafe.config.Config + +import akka.actor.ExtendedActorSystem +import akka.event.{ Logging, LoggingAdapter } +import akka.util.ccompat._ + /** * `EventAdapters` serves as a per-journal collection of bound event adapters. */ diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala b/akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala index af8ecde096..e33296cec1 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/PersistencePluginProxy.scala @@ -7,6 +7,10 @@ package akka.persistence.journal import java.net.URISyntaxException import java.util.concurrent.TimeoutException +import scala.concurrent.duration._ + +import com.typesafe.config.Config + import akka.actor._ import akka.persistence.{ AtomicWrite, @@ -20,9 +24,6 @@ import akka.persistence.{ SnapshotProtocol } import akka.util.Helpers.Requiring -import com.typesafe.config.Config - -import scala.concurrent.duration._ object PersistencePluginProxy { final case class TargetLocation(address: Address) @@ -72,8 +73,8 @@ object PersistencePluginProxyExtension } final class PersistencePluginProxy(config: Config) extends Actor with Stash with ActorLogging { - import PersistencePluginProxy._ import JournalProtocol._ + import PersistencePluginProxy._ import SnapshotProtocol._ private val pluginId = self.path.name diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala b/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala index 8134c06392..f23e8608ea 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/ReplayFilter.scala @@ -4,14 +4,16 @@ package akka.persistence.journal -import akka.actor.ActorRef -import akka.actor.Actor -import akka.persistence.JournalProtocol import java.util.LinkedList -import akka.actor.Props -import akka.actor.ActorLogging + import scala.collection.mutable.LinkedHashSet +import akka.actor.Actor +import akka.actor.ActorLogging +import akka.actor.ActorRef +import akka.actor.Props +import akka.persistence.JournalProtocol + /** * INTERNAL API * diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala b/akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala index 79e223a648..bc97417ef6 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/WriteJournalBase.scala @@ -4,9 +4,10 @@ package akka.persistence.journal +import scala.collection.immutable + import akka.actor.Actor import akka.persistence.{ Persistence, PersistentEnvelope, PersistentRepr } -import scala.collection.immutable import akka.persistence.AtomicWrite private[akka] trait WriteJournalBase { diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala index 4dcf15c24b..be2f0122ef 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/inmem/InmemJournal.scala @@ -8,16 +8,18 @@ import scala.collection.immutable import scala.concurrent.Future import scala.util.Try import scala.util.control.NonFatal -import akka.annotation.ApiMayChange -import akka.annotation.InternalApi -import akka.persistence.journal.{ AsyncWriteJournal, Tagged } -import akka.persistence.PersistentRepr -import akka.persistence.AtomicWrite -import akka.serialization.SerializationExtension -import akka.serialization.Serializers + import com.typesafe.config.Config import com.typesafe.config.ConfigFactory +import akka.annotation.ApiMayChange +import akka.annotation.InternalApi +import akka.persistence.AtomicWrite +import akka.persistence.PersistentRepr +import akka.persistence.journal.{ AsyncWriteJournal, Tagged } +import akka.serialization.SerializationExtension +import akka.serialization.Serializers + /** * The InmemJournal publishes writes and deletes to the `eventStream`, which tests may use to * verify that expected events have been persisted or deleted. diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala b/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala index 0ce692b075..d0c8ed2e93 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncRecovery.scala @@ -5,11 +5,12 @@ package akka.persistence.journal.japi import java.util.function.Consumer + import scala.concurrent.Future import akka.actor.Actor -import akka.persistence.journal.{ AsyncRecovery => SAsyncReplay } import akka.persistence.PersistentRepr +import akka.persistence.journal.{ AsyncRecovery => SAsyncReplay } /** * Java API: asynchronous message replay and sequence number recovery interface. diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala index 1b3ddfb3df..8b3eac5f0d 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/japi/AsyncWriteJournal.scala @@ -5,13 +5,14 @@ package akka.persistence.journal.japi import scala.collection.immutable -import akka.util.ccompat.JavaConverters._ +import scala.concurrent.Future +import scala.util.Failure +import scala.util.Try + import akka.persistence._ import akka.persistence.journal.{ AsyncWriteJournal => SAsyncWriteJournal } import akka.util.ccompat._ -import scala.concurrent.Future -import scala.util.Try -import scala.util.Failure +import akka.util.ccompat.JavaConverters._ /** * Java API: abstract journal, optimized for asynchronous, non-blocking writes. diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala index a97fada79e..67c6d6f9f7 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbIdMapping.scala @@ -5,6 +5,7 @@ package akka.persistence.journal.leveldb import org.iq80.leveldb.DBIterator + import akka.actor.Actor import akka.util.ByteString.UTF_8 import akka.util.unused diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala index b6380262d7..7129b96e8a 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbJournal.scala @@ -4,20 +4,21 @@ package akka.persistence.journal.leveldb -import akka.actor._ -import akka.persistence.Persistence -import akka.persistence.journal._ -import akka.util.Timeout -import akka.util.Helpers.ConfigOps -import akka.persistence.PersistentRepr import scala.concurrent.Future -import akka.persistence.JournalProtocol.RecoverySuccess -import akka.persistence.JournalProtocol.ReplayMessagesFailure -import akka.pattern.pipe import com.typesafe.config.Config import com.typesafe.config.ConfigFactory +import akka.actor._ +import akka.pattern.pipe +import akka.persistence.JournalProtocol.RecoverySuccess +import akka.persistence.JournalProtocol.ReplayMessagesFailure +import akka.persistence.Persistence +import akka.persistence.PersistentRepr +import akka.persistence.journal._ +import akka.util.Helpers.ConfigOps +import akka.util.Timeout + /** * INTERNAL API. * diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala index 1a8700761c..8bca84e264 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbRecovery.scala @@ -5,9 +5,11 @@ package akka.persistence.journal.leveldb import scala.concurrent.Future + +import org.iq80.leveldb.DBIterator + import akka.persistence._ import akka.persistence.journal.AsyncRecovery -import org.iq80.leveldb.DBIterator import akka.persistence.journal.leveldb.LeveldbJournal.ReplayedTaggedMessage /** diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala index 11caeee05c..64328f8183 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala @@ -6,20 +6,21 @@ package akka.persistence.journal.leveldb import java.io.File +import scala.collection.immutable import scala.collection.mutable -import akka.actor._ -import akka.persistence._ -import akka.persistence.journal.WriteJournalBase -import akka.serialization.SerializationExtension +import scala.concurrent.Future +import scala.util._ +import scala.util.control.NonFatal + +import com.typesafe.config.{ Config, ConfigFactory, ConfigObject } import org.iq80.leveldb._ -import scala.collection.immutable -import akka.util.ccompat.JavaConverters._ -import scala.util._ -import scala.concurrent.Future -import scala.util.control.NonFatal +import akka.actor._ +import akka.persistence._ import akka.persistence.journal.Tagged -import com.typesafe.config.{ Config, ConfigFactory, ConfigObject } +import akka.persistence.journal.WriteJournalBase +import akka.serialization.SerializationExtension +import akka.util.ccompat.JavaConverters._ private[persistence] object LeveldbStore { val emptyConfig = ConfigFactory.empty() diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala index 2d003cac9d..48cbeb9086 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/SharedLeveldbStore.scala @@ -4,15 +4,17 @@ package akka.persistence.journal.leveldb -import akka.persistence.journal.AsyncWriteTarget -import akka.pattern.pipe -import scala.util.Try -import scala.util.Success -import scala.util.Failure -import scala.util.control.NonFatal -import akka.persistence.AtomicWrite -import com.typesafe.config.Config import scala.concurrent.Future +import scala.util.Failure +import scala.util.Success +import scala.util.Try +import scala.util.control.NonFatal + +import com.typesafe.config.Config + +import akka.pattern.pipe +import akka.persistence.AtomicWrite +import akka.persistence.journal.AsyncWriteTarget /** * A LevelDB store that can be shared by multiple actor systems. The shared store must be diff --git a/akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala b/akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala index f4ca47e722..8916b0bb7a 100644 --- a/akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala +++ b/akka-persistence/src/main/scala/akka/persistence/serialization/MessageSerializer.scala @@ -4,24 +4,25 @@ package akka.persistence.serialization -import akka.actor.{ ActorPath, ExtendedActorSystem } -import akka.persistence.AtLeastOnceDelivery._ -import akka.persistence._ -import akka.persistence.fsm.PersistentFSM.{ PersistentFSMSnapshot, StateChangeEvent } -import akka.persistence.serialization.{ MessageFormats => mf } -import akka.serialization._ -import akka.protobufv3.internal.ByteString +import java.io.NotSerializableException + import scala.collection.immutable import scala.collection.immutable.VectorBuilder import scala.concurrent.duration -import akka.actor.Actor -import akka.util.ccompat._ - import scala.concurrent.duration.Duration -import java.io.NotSerializableException import com.github.ghik.silencer.silent +import akka.actor.{ ActorPath, ExtendedActorSystem } +import akka.actor.Actor +import akka.persistence._ +import akka.persistence.AtLeastOnceDelivery._ +import akka.persistence.fsm.PersistentFSM.{ PersistentFSMSnapshot, StateChangeEvent } +import akka.persistence.serialization.{ MessageFormats => mf } +import akka.protobufv3.internal.ByteString +import akka.serialization._ +import akka.util.ccompat._ + /** * Marker trait for all protobuf-serializable messages in `akka.persistence`. */ diff --git a/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala b/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala index c556d9e9e6..66da0f6a0c 100644 --- a/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala +++ b/akka-persistence/src/main/scala/akka/persistence/serialization/SnapshotSerializer.scala @@ -5,6 +5,7 @@ package akka.persistence.serialization import java.io._ + import akka.actor._ import akka.serialization._ import akka.util.ByteString.UTF_8 diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala b/akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala index 81883603d4..6229f21f76 100644 --- a/akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/snapshot/NoSnapshotStore.scala @@ -4,10 +4,10 @@ package akka.persistence.snapshot -import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria } - import scala.concurrent.Future +import akka.persistence.{ SelectedSnapshot, SnapshotMetadata, SnapshotSelectionCriteria } + /** * Used as default snapshot-store in case no other store was configured. * diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala b/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala index c4e7db49ca..31094b8100 100644 --- a/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/snapshot/SnapshotStore.scala @@ -5,13 +5,13 @@ package akka.persistence.snapshot import scala.concurrent.ExecutionContext -import scala.concurrent.duration._ import scala.concurrent.Future +import scala.concurrent.duration._ import akka.actor._ +import akka.pattern.CircuitBreaker import akka.pattern.pipe import akka.persistence._ -import akka.pattern.CircuitBreaker /** * Abstract snapshot store. diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala b/akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala index af7d1f5cab..adf9064bb7 100644 --- a/akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/snapshot/japi/SnapshotStore.scala @@ -4,11 +4,11 @@ package akka.persistence.snapshot.japi +import scala.concurrent.Future + +import akka.japi.Util._ import akka.persistence._ import akka.persistence.snapshot.{ SnapshotStore => SSnapshotStore } -import akka.japi.Util._ - -import scala.concurrent.Future /** * Java API: abstract snapshot store. diff --git a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala b/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala index ec3087072c..de860b1479 100644 --- a/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/snapshot/local/LocalSnapshotStore.scala @@ -6,6 +6,13 @@ package akka.persistence.snapshot.local import java.io._ import java.net.{ URLDecoder, URLEncoder } +import java.nio.file.Files + +import scala.collection.immutable +import scala.concurrent.Future +import scala.util._ + +import com.typesafe.config.Config import akka.actor.ActorLogging import akka.persistence._ @@ -14,12 +21,6 @@ import akka.persistence.snapshot._ import akka.serialization.SerializationExtension import akka.util.ByteString.UTF_8 import akka.util.ccompat._ -import com.typesafe.config.Config - -import scala.collection.immutable -import scala.concurrent.Future -import scala.util._ -import java.nio.file.Files /** * INTERNAL API diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala index 7615990621..9c923a618a 100644 --- a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryCrashSpec.scala @@ -4,12 +4,12 @@ package akka.persistence +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.actor._ import akka.actor.SupervisorStrategy.{ Escalate, Stop } import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } -import scala.concurrent.duration._ - -import scala.util.control.NoStackTrace object AtLeastOnceDeliveryCrashSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala index 2f07447d7f..e78004c5fa 100644 --- a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliveryFailureSpec.scala @@ -4,8 +4,9 @@ package akka.persistence -import scala.concurrent.duration._ import java.util.concurrent.ThreadLocalRandom + +import scala.concurrent.duration._ import scala.language.postfixOps import com.typesafe.config.ConfigFactory diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala index 332f32365a..d3ef5e7e96 100644 --- a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala @@ -4,15 +4,16 @@ package akka.persistence -import akka.actor._ -import akka.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedWarning } -import akka.testkit._ -import com.typesafe.config._ - import scala.concurrent.duration._ import scala.util.Failure import scala.util.control.NoStackTrace +import com.typesafe.config._ + +import akka.actor._ +import akka.persistence.AtLeastOnceDelivery.{ AtLeastOnceDeliverySnapshot, UnconfirmedWarning } +import akka.testkit._ + object AtLeastOnceDeliverySpec { case class Req(payload: String) diff --git a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala index 4f09f88366..8b6a66a0e8 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EndToEndEventAdapterSpec.scala @@ -6,18 +6,19 @@ package akka.persistence import java.io.File -import akka.actor._ -import akka.persistence.journal.{ EventAdapter, EventSeq } -import akka.testkit.TestProbe -import akka.util.unused +import scala.concurrent.Await +import scala.concurrent.duration._ + import com.typesafe.config.{ Config, ConfigFactory } import org.apache.commons.io.FileUtils import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpecLike -import scala.concurrent.Await -import scala.concurrent.duration._ +import akka.actor._ +import akka.persistence.journal.{ EventAdapter, EventSeq } +import akka.testkit.TestProbe +import akka.util.unused object EndToEndEventAdapterSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala index 3ed0b0b7b9..7e1e338f2c 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala @@ -4,14 +4,15 @@ package akka.persistence +import scala.collection.immutable + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor._ import akka.event.Logging import akka.persistence.EventAdapterSpec.{ Tagged, UserDataChanged } import akka.persistence.journal.{ EventAdapter, EventSeq, SingleEventSeq } import akka.testkit.ImplicitSender -import com.typesafe.config.{ Config, ConfigFactory } - -import scala.collection.immutable object EventAdapterSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala index 04af3df211..8160ac5d81 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorDeleteFailureSpec.scala @@ -4,16 +4,16 @@ package akka.persistence +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.actor._ import akka.event.Logging import akka.event.Logging.Warning import akka.persistence.journal.inmem.InmemJournal import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace - object EventSourcedActorDeleteFailureSpec { case class DeleteTo(n: Long) diff --git a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala index d81fc9ecda..0712f9af4c 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EventSourcedActorFailureSpec.scala @@ -4,17 +4,16 @@ package akka.persistence +import scala.collection.immutable +import scala.concurrent.Future +import scala.util.{ Failure, Try } +import scala.util.control.NoStackTrace + import akka.actor.{ OneForOneStrategy, _ } import akka.persistence.journal.AsyncWriteJournal import akka.persistence.journal.inmem.InmemJournal import akka.testkit.{ EventFilter, ImplicitSender, TestEvent, TestProbe } -import scala.collection.immutable -import scala.util.control.NoStackTrace -import scala.util.{ Failure, Try } - -import scala.concurrent.Future - object EventSourcedActorFailureSpec { import PersistentActorSpec.{ Cmd, Evt, ExamplePersistentActor } diff --git a/akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala b/akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala index 99e66ad8c3..ecca8b476a 100644 --- a/akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/LoadPluginSpec.scala @@ -4,10 +4,11 @@ package akka.persistence -import akka.persistence.journal.inmem.InmemJournal import com.typesafe.config.Config -import akka.testkit.ImplicitSender + import akka.actor.Actor +import akka.persistence.journal.inmem.InmemJournal +import akka.testkit.ImplicitSender import akka.util.unused object LoadPluginSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala b/akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala index 6c4b73cf14..d834ca7e7f 100644 --- a/akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/ManyRecoveriesSpec.scala @@ -4,11 +4,13 @@ package akka.persistence +import scala.concurrent.Await import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.testkit._ -import com.typesafe.config.ConfigFactory -import scala.concurrent.Await object ManyRecoveriesSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala b/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala index 2a9e67a021..b5fd531491 100644 --- a/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/OptionalSnapshotStoreSpec.scala @@ -4,11 +4,12 @@ package akka.persistence +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, Props } import akka.event.Logging import akka.event.Logging.Warning import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } -import com.typesafe.config.ConfigFactory object OptionalSnapshotStoreSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala index 35e9082b75..4acf2339e3 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistenceSpec.scala @@ -7,16 +7,14 @@ package akka.persistence import java.io.File import java.util.concurrent.atomic.AtomicInteger -import org.scalatest.matchers.{ MatchResult, Matcher } - import scala.collection.immutable import scala.reflect.ClassTag import scala.util.control.NoStackTrace import com.typesafe.config.{ Config, ConfigFactory } - import org.apache.commons.io.FileUtils import org.scalatest.BeforeAndAfterEach +import org.scalatest.matchers.{ MatchResult, Matcher } import akka.actor.Props import akka.testkit.AkkaSpec diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala index fd01ed848c..8f2cc14948 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorBoundedStashingSpec.scala @@ -4,16 +4,17 @@ package akka.persistence -import akka.actor.DeadLetter -import akka.persistence.PersistentActorBoundedStashingSpec._ -import akka.persistence.journal.SteppingInmemJournal -import akka.testkit.TestEvent.Mute -import akka.testkit.EventFilter -import akka.testkit.ImplicitSender +import scala.concurrent.duration._ + import com.typesafe.config.Config import org.scalatest.BeforeAndAfterEach -import scala.concurrent.duration._ +import akka.actor.DeadLetter +import akka.persistence.PersistentActorBoundedStashingSpec._ +import akka.persistence.journal.SteppingInmemJournal +import akka.testkit.EventFilter +import akka.testkit.ImplicitSender +import akka.testkit.TestEvent.Mute object PersistentActorBoundedStashingSpec { final case class Cmd(data: Any) diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala index 939416522f..e14a74bd7c 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorJournalProtocolSpec.scala @@ -4,11 +4,13 @@ package akka.persistence -import akka.actor._ -import akka.testkit._ import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + +import akka.actor._ import akka.persistence.JournalProtocol._ +import akka.testkit._ object PersistentActorJournalProtocolSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala index 3672c25fec..d8b8699a16 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorRecoveryTimeoutSpec.scala @@ -4,13 +4,14 @@ package akka.persistence -import akka.actor.Status.Failure -import akka.actor.{ Actor, ActorLogging, ActorRef, Props } -import akka.persistence.journal.SteppingInmemJournal -import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ +import akka.actor.{ Actor, ActorLogging, ActorRef, Props } +import akka.actor.Status.Failure +import akka.persistence.journal.SteppingInmemJournal +import akka.testkit.{ AkkaSpec, ImplicitSender, TestProbe } object PersistentActorRecoveryTimeoutSpec { val journalId = "persistent-actor-recovery-timeout-spec" diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala index 1f4feb50c4..fdf692f668 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorSpec.scala @@ -6,18 +6,19 @@ package akka.persistence import java.util.concurrent.atomic.AtomicInteger -import akka.actor._ -import akka.persistence.PersistentActorSpec._ -import akka.testkit.{ EventFilter, ImplicitSender, TestLatch, TestProbe } -import com.github.ghik.silencer.silent -import com.typesafe.config.{ Config, ConfigFactory } - import scala.collection.immutable.Seq import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Random import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor._ +import akka.persistence.PersistentActorSpec._ +import akka.testkit.{ EventFilter, ImplicitSender, TestLatch, TestProbe } + object PersistentActorSpec { final case class Cmd(data: Any) diff --git a/akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala b/akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala index 3ee8544a64..3f12c57af3 100644 --- a/akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/PersistentActorStashingSpec.scala @@ -4,15 +4,16 @@ package akka.persistence -import akka.actor.SupervisorStrategy.Resume +import scala.concurrent.duration._ +import scala.reflect.ClassTag + +import com.typesafe.config.Config + import akka.actor.{ Actor, ActorRef, OneForOneStrategy, Props } +import akka.actor.SupervisorStrategy.Resume import akka.persistence.journal.SteppingInmemJournal import akka.testkit.ImplicitSender import akka.util.unused -import com.typesafe.config.Config - -import scala.concurrent.duration._ -import scala.reflect.ClassTag object PersistentActorStashingSpec { final case class Cmd(data: Any) diff --git a/akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala index c47d6b647e..47e3d71bcc 100644 --- a/akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/RecoveryPermitterSpec.scala @@ -7,11 +7,12 @@ package akka.persistence import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } -import com.typesafe.config.ConfigFactory -import akka.testkit.TestProbe import akka.testkit.TestActors +import akka.testkit.TestProbe object RecoveryPermitterSpec { @@ -48,8 +49,8 @@ class RecoveryPermitterSpec extends PersistenceSpec(ConfigFactory.parseString(s" akka.persistence.journal.plugin = "akka.persistence.journal.inmem" akka.actor.warn-about-java-serializer-usage = off """)) with ImplicitSender { - import RecoveryPermitterSpec._ import RecoveryPermitter._ + import RecoveryPermitterSpec._ system.eventStream.publish(TestEvent.Mute(EventFilter[TestExc]())) diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala index 727cf0a470..e7123d6d2b 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotFailureRobustnessSpec.scala @@ -6,15 +6,16 @@ package akka.persistence import java.io.IOException +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.typesafe.config.Config + import akka.actor.{ ActorRef, Props } import akka.event.Logging import akka.persistence.snapshot.local.LocalSnapshotStore import akka.testkit.{ EventFilter, ImplicitSender, TestEvent } -import com.typesafe.config.Config - -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.language.postfixOps object SnapshotFailureRobustnessSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala index 85264b4839..e0e628f0da 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotRecoveryWithEmptyJournalSpec.scala @@ -6,11 +6,12 @@ package akka.persistence import java.io.File +import org.apache.commons.io.FileUtils + import akka.actor._ import akka.persistence.serialization.Snapshot import akka.serialization.{ Serialization, SerializationExtension } import akka.testkit._ -import org.apache.commons.io.FileUtils object SnapshotRecoveryWithEmptyJournalSpec { val survivingSnapshotPath = "target/survivingSnapshotPath" diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala index 54d2c7d30e..8fcda64722 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotSerializationSpec.scala @@ -4,10 +4,11 @@ package akka.persistence +import java.io._ + import akka.actor.{ ActorRef, Props } import akka.serialization.Serializer -import akka.testkit.{ ImplicitSender } -import java.io._ +import akka.testkit.ImplicitSender object SnapshotSerializationSpec { trait SerializationMarker diff --git a/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala b/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala index 7ef097537c..a4702b3eb9 100644 --- a/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/SnapshotSpec.scala @@ -84,8 +84,8 @@ object SnapshotSpec { } class SnapshotSpec extends PersistenceSpec(PersistenceSpec.config("leveldb", "SnapshotSpec")) with ImplicitSender { - import SnapshotSpec._ import SnapshotProtocol._ + import SnapshotSpec._ override protected def beforeEach(): Unit = { super.beforeEach() diff --git a/akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala b/akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala index dbdf39afd6..fad5a7b62d 100644 --- a/akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/TimerPersistentActorSpec.scala @@ -8,10 +8,11 @@ import scala.concurrent.duration._ import scala.runtime.BoxedUnit import scala.runtime.BoxedUnit +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.japi.Procedure import akka.testkit.{ EventFilter, ImplicitSender } -import com.typesafe.config.ConfigFactory import akka.testkit.TestEvent.Mute object TimerPersistentActorSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala b/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala index 56d7e3b217..b9e91051ed 100644 --- a/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/fsm/PersistentFSMSpec.scala @@ -6,17 +6,18 @@ package akka.persistence.fsm import java.io.File -import akka.actor.{ ActorSystem, _ } -import akka.persistence._ -import akka.persistence.fsm.PersistentFSM._ -import akka.testkit._ +import scala.concurrent.duration._ +import scala.language.postfixOps +import scala.reflect.ClassTag + import com.github.ghik.silencer.silent import com.typesafe.config.{ Config, ConfigFactory } import org.apache.commons.io.FileUtils -import scala.concurrent.duration._ -import scala.language.postfixOps -import scala.reflect.ClassTag +import akka.actor.{ ActorSystem, _ } +import akka.persistence._ +import akka.persistence.fsm.PersistentFSM._ +import akka.testkit._ @silent("deprecated") abstract class PersistentFSMSpec(config: Config) extends PersistenceSpec(config) with ImplicitSender { diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala b/akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala index 9320f24265..3f00e957ad 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/InmemEventAdaptersSpec.scala @@ -4,9 +4,10 @@ package akka.persistence.journal +import com.typesafe.config.ConfigFactory + import akka.actor.ExtendedActorSystem import akka.testkit.AkkaSpec -import com.typesafe.config.ConfigFactory class InmemEventAdaptersSpec extends AkkaSpec { diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala index 94b9597df1..55df93ab2f 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/ReplayFilterSpec.scala @@ -5,9 +5,9 @@ package akka.persistence.journal import akka.actor._ -import akka.testkit._ import akka.persistence.JournalProtocol import akka.persistence.PersistentRepr +import akka.testkit._ class ReplayFilterSpec extends AkkaSpec with ImplicitSender { import JournalProtocol._ diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala b/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala index 6052058a38..e9fb2b5359 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/SteppingInmemJournal.scala @@ -4,17 +4,19 @@ package akka.persistence.journal +import scala.collection.immutable.Seq +import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.duration._ +import scala.util.Try + +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor.{ ActorRef, ActorSystem } import akka.pattern.ask -import akka.persistence.journal.inmem.InmemJournal import akka.persistence.{ AtomicWrite, PersistentRepr } -import akka.util.Timeout +import akka.persistence.journal.inmem.InmemJournal import akka.testkit._ -import com.typesafe.config.{ Config, ConfigFactory } -import scala.collection.immutable.Seq -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future, Promise } -import scala.util.Try +import akka.util.Timeout object SteppingInmemJournal { diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala b/akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala index 62744b8209..1381222971 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/chaos/ChaosJournal.scala @@ -4,14 +4,16 @@ package akka.persistence.journal.chaos +import java.util.concurrent.ThreadLocalRandom + import scala.collection.immutable import scala.concurrent.Future -import java.util.concurrent.ThreadLocalRandom +import scala.util.Try +import scala.util.control.NonFatal + import akka.persistence._ import akka.persistence.journal.AsyncWriteJournal import akka.persistence.journal.inmem.InmemMessages -import scala.util.Try -import scala.util.control.NonFatal class WriteFailedException(ps: Seq[PersistentRepr]) extends TestException(s"write failed for payloads = [${ps.map(_.payload)}]") diff --git a/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala b/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala index 9112c95563..bfaa5ab890 100644 --- a/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/journal/leveldb/JournalCompactionSpec.scala @@ -6,15 +6,16 @@ package akka.persistence.journal.leveldb import java.io.File -import akka.actor.{ ActorLogging, ActorRef, ActorSystem, Props } -import akka.persistence.journal.leveldb.JournalCompactionSpec.EventLogger._ -import akka.persistence.journal.leveldb.JournalCompactionSpec.SpecComponentBuilder -import akka.persistence.{ DeleteMessagesSuccess, PersistenceSpec, PersistentActor } -import akka.testkit.TestProbe +import scala.util.Random + import com.typesafe.config.Config import org.apache.commons.io.FileUtils -import scala.util.Random +import akka.actor.{ ActorLogging, ActorRef, ActorSystem, Props } +import akka.persistence.{ DeleteMessagesSuccess, PersistenceSpec, PersistentActor } +import akka.persistence.journal.leveldb.JournalCompactionSpec.EventLogger._ +import akka.persistence.journal.leveldb.JournalCompactionSpec.SpecComponentBuilder +import akka.testkit.TestProbe class JournalNoCompactionSpec extends JournalCompactionSpecBase(SpecComponentBuilder("leveldb-JournalNoCompactionSpec")) { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala index e0a02f8819..3ec2c989b7 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/io/DnsSpec.scala @@ -8,9 +8,10 @@ import java.net.Inet4Address import java.net.Inet6Address import java.net.InetAddress +import com.github.ghik.silencer.silent + import akka.remote.RemotingMultiNodeSpec import akka.remote.testkit.MultiNodeConfig -import com.github.ghik.silencer.silent object DnsSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala index a70cd0fe78..3d6bba19c2 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/AttemptSysMsgRedeliverySpec.scala @@ -5,16 +5,18 @@ package akka.remote import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import testkit.MultiNodeConfig + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef import akka.actor.Identify +import akka.actor.PoisonPill import akka.actor.Props import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import testkit.MultiNodeConfig -import akka.actor.PoisonPill -import com.typesafe.config.ConfigFactory class AttemptSysMsgRedeliveryMultiJvmSpec(artery: Boolean) extends MultiNodeConfig { @@ -55,8 +57,8 @@ object AttemptSysMsgRedeliverySpec { abstract class AttemptSysMsgRedeliverySpec(multiNodeConfig: AttemptSysMsgRedeliveryMultiJvmSpec) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import AttemptSysMsgRedeliverySpec._ + import multiNodeConfig._ def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala index b09b86abd1..d7e07d85cc 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/LookupRemoteActorSpec.scala @@ -4,15 +4,16 @@ package akka.remote +import com.typesafe.config.ConfigFactory +import testkit.MultiNodeConfig + import akka.actor.Actor +import akka.actor.ActorIdentity import akka.actor.ActorRef +import akka.actor.Identify import akka.actor.Props import akka.pattern.ask -import testkit.MultiNodeConfig import akka.testkit._ -import akka.actor.Identify -import akka.actor.ActorIdentity -import com.typesafe.config.ConfigFactory class LookupRemoteActorMultiJvmSpec(artery: Boolean) extends MultiNodeConfig { @@ -43,8 +44,8 @@ object LookupRemoteActorSpec { abstract class LookupRemoteActorSpec(multiNodeConfig: LookupRemoteActorMultiJvmSpec) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import LookupRemoteActorSpec._ + import multiNodeConfig._ def initialParticipants = 2 diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala index b8b696fc24..0d0595820e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/NewRemoteActorSpec.scala @@ -4,17 +4,17 @@ package akka.remote -import akka.actor.Terminated +import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory import language.postfixOps +import testkit.MultiNodeConfig + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Props +import akka.actor.Terminated import akka.util.unused -import testkit.MultiNodeConfig -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ class NewRemoteActorMultiJvmSpec(artery: Boolean) extends MultiNodeConfig { @@ -58,8 +58,8 @@ object NewRemoteActorSpec { abstract class NewRemoteActorSpec(multiNodeConfig: NewRemoteActorMultiJvmSpec) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import NewRemoteActorSpec._ + import multiNodeConfig._ def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala index e22a50c4c3..3b1e80a505 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/PiercingShouldKeepQuarantineSpec.scala @@ -5,10 +5,12 @@ package akka.remote import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.actor._ -import akka.testkit._ import akka.remote.testkit.MultiNodeConfig +import akka.testkit._ class PiercingShouldKeepQuarantineConfig(artery: Boolean) extends MultiNodeConfig { val first = role("first") @@ -41,8 +43,8 @@ object PiercingShouldKeepQuarantineSpec { abstract class PiercingShouldKeepQuarantineSpec(multiNodeConfig: PiercingShouldKeepQuarantineConfig) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import PiercingShouldKeepQuarantineSpec._ + import multiNodeConfig._ override def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala index c6a4fa0027..5b94848963 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeliverySpec.scala @@ -4,17 +4,18 @@ package akka.remote -import scala.language.postfixOps import scala.concurrent.duration._ +import scala.language.postfixOps import com.typesafe.config.ConfigFactory + import akka.actor.Actor +import akka.actor.ActorIdentity import akka.actor.ActorRef +import akka.actor.Identify import akka.actor.Props import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig -import akka.actor.ActorIdentity -import akka.actor.Identify import akka.serialization.jackson.CborSerializable class RemoteDeliveryConfig(artery: Boolean) extends MultiNodeConfig { @@ -47,8 +48,8 @@ object RemoteDeliverySpec { abstract class RemoteDeliverySpec(multiNodeConfig: RemoteDeliveryConfig) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import RemoteDeliverySpec._ + import multiNodeConfig._ override def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala index 85cf027516..46f0ce0ab4 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteDeploymentDeathWatchSpec.scala @@ -4,11 +4,14 @@ package akka.remote -import language.postfixOps import java.util.concurrent.TimeoutException + import scala.concurrent.Await import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor import akka.actor.ActorSystemImpl import akka.actor.Props @@ -68,8 +71,8 @@ object RemoteDeploymentDeathWatchSpec { abstract class RemoteDeploymentDeathWatchSpec(multiNodeConfig: RemoteDeploymentDeathWatchMultiJvmSpec) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import RemoteDeploymentDeathWatchSpec._ + import multiNodeConfig._ def scenario: String // Possible to override to let them heartbeat for a while. diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala index b6f6adb0f7..77873f2dac 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala @@ -6,6 +6,8 @@ package akka.remote import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.ActorIdentity import akka.actor.ActorRef import akka.actor.ActorSystemImpl @@ -27,7 +29,6 @@ import akka.routing.RoundRobinGroup import akka.routing.RoundRobinPool import akka.routing.RoutedActorRef import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory class RemotingFeaturesConfig(val useUnsafe: Boolean, artery: Boolean) extends MultiNodeConfig { @@ -229,9 +230,10 @@ abstract class RemotingFeaturesSpec(val multiNodeConfig: RemotingFeaturesConfig) extends RemotingMultiNodeSpec(multiNodeConfig) { import RemoteWatcher._ - import akka.remote.routing.RemoteRoundRobinSpec._ import multiNodeConfig._ + import akka.remote.routing.RemoteRoundRobinSpec._ + override def initialParticipants: Int = roles.size muteDeadLetters(Heartbeat.getClass)() diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala index 2aede454a3..39174b4bd2 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeDeathWatchSpec.scala @@ -4,9 +4,11 @@ package akka.remote -import language.postfixOps import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory +import language.postfixOps + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef @@ -92,9 +94,9 @@ object RemoteNodeDeathWatchSpec { abstract class RemoteNodeDeathWatchSpec(multiNodeConfig: RemoteNodeDeathWatchConfig) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import RemoteNodeDeathWatchSpec._ import RemoteWatcher._ + import multiNodeConfig._ def scenario: String // Possible to override to let them heartbeat for a while. diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala index 11a1393a27..09399ce6c1 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala @@ -6,19 +6,21 @@ package akka.remote import scala.concurrent.Await import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef +import akka.actor.ActorSystem +import akka.actor.ExtendedActorSystem import akka.actor.Identify import akka.actor.Props -import akka.remote.testconductor.RoleName -import akka.remote.transport.ThrottlerTransportAdapter.Direction -import akka.remote.testkit.MultiNodeConfig -import akka.testkit._ -import akka.actor.ExtendedActorSystem -import akka.actor.ActorSystem import akka.actor.RootActorPath +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.remote.transport.ThrottlerTransportAdapter.Direction +import akka.testkit._ class RemoteNodeRestartDeathWatchConfig(artery: Boolean) extends MultiNodeConfig { val first = role("first") @@ -61,8 +63,8 @@ object RemoteNodeRestartDeathWatchSpec { abstract class RemoteNodeRestartDeathWatchSpec(multiNodeConfig: RemoteNodeRestartDeathWatchConfig) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import RemoteNodeRestartDeathWatchSpec._ + import multiNodeConfig._ override def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala index 7a11bb6cbe..f9306a49fa 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala @@ -4,14 +4,16 @@ package akka.remote +import scala.concurrent.Await import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.remote.testconductor.RoleName +import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.testkit._ -import akka.remote.testconductor.RoleName -import scala.concurrent.Await class RemoteQuarantinePiercingConfig(artery: Boolean) extends MultiNodeConfig { val first = role("first") @@ -49,8 +51,8 @@ object RemoteQuarantinePiercingSpec { abstract class RemoteQuarantinePiercingSpec(multiNodeConfig: RemoteQuarantinePiercingConfig) extends RemotingMultiNodeSpec(multiNodeConfig) { - import multiNodeConfig._ import RemoteQuarantinePiercingSpec._ + import multiNodeConfig._ override def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala index e3438e7865..2586a24f0c 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteReDeploymentSpec.scala @@ -4,19 +4,20 @@ package akka.remote -import akka.remote.testkit.MultiNodeConfig -import akka.actor.Actor -import akka.actor.ActorRef -import akka.actor.Props -import akka.remote.transport.ThrottlerTransportAdapter.Direction._ -import com.typesafe.config.ConfigFactory -import akka.actor.ActorSystem import scala.concurrent.Await import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + +import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorLogging +import akka.actor.ActorRef +import akka.actor.ActorSystem import akka.actor.Identify +import akka.actor.Props +import akka.remote.testkit.MultiNodeConfig +import akka.remote.transport.ThrottlerTransportAdapter.Direction._ import akka.testkit.TestProbe class RemoteReDeploymentConfig(artery: Boolean) extends MultiNodeConfig { @@ -118,8 +119,8 @@ abstract class RemoteReDeploymentMultiJvmSpec(multiNodeConfig: RemoteReDeploymen def initialParticipants = roles.size - import multiNodeConfig._ import RemoteReDeploymentMultiJvmSpec._ + import multiNodeConfig._ "A remote deployment target system" must { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala index 8ce347325a..50987aa872 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala @@ -4,11 +4,12 @@ package akka.remote +import com.typesafe.config.ConfigFactory +import org.scalatest.Suite + import akka.remote.artery.ArterySpecSupport import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.testkit.{ DefaultTimeout, ImplicitSender } -import com.typesafe.config.ConfigFactory -import org.scalatest.Suite object RemotingMultiNodeSpec { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala index f60dc5fb48..39c49fea3b 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/TransportFailSpec.scala @@ -8,6 +8,10 @@ import java.util.concurrent.atomic.AtomicBoolean import scala.concurrent.duration._ +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef @@ -19,9 +23,6 @@ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.testkit._ import akka.util.unused -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory object TransportFailConfig extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala index 4fe827f766..fc25ba800e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala @@ -11,10 +11,10 @@ import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter -import akka.actor.ActorSystem - import scala.util.Try +import akka.actor.ActorSystem + /** * Simple to file logger for benchmark results. Will log relevant settings first to make sure * results can be understood later. diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala index 62648ed8a2..352e248382 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/DirectMemorySpec.scala @@ -6,12 +6,13 @@ package akka.remote.artery import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorPath, ActorRef, Props } import akka.remote.RemotingMultiNodeSpec import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.testkit.ImplicitSender import akka.testkit.JavaSerializable -import com.typesafe.config.ConfigFactory object DirectMemorySpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala index aaae74cd68..e4e878d66b 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala @@ -6,15 +6,16 @@ package akka.remote.artery import java.util.concurrent.Executors +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ +import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec } import akka.remote.artery.MaxThroughputSpec._ import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport } -import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec } import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object FanInThroughputSpec extends MultiNodeConfig { val totalNumberOfNodes = diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala index 560478e59a..dbb2852c52 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala @@ -7,14 +7,16 @@ package akka.remote.artery import java.util.concurrent.Executors import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec } +import akka.remote.artery.MaxThroughputSpec._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.PerfFlamesSupport import akka.testkit._ -import com.typesafe.config.ConfigFactory -import akka.remote.artery.MaxThroughputSpec._ object FanOutThroughputSpec extends MultiNodeConfig { val totalNumberOfNodes = diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala index 6d2cbe75c1..d52f44d543 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/HandshakeRestartReceiverSpec.scala @@ -9,6 +9,8 @@ import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.remote.AddressUidExtension import akka.remote.RARP @@ -17,7 +19,6 @@ import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec import akka.testkit._ -import com.typesafe.config.ConfigFactory object HandshakeRestartReceiverSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala index 1e78264dc4..96c96dec1a 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala @@ -8,6 +8,11 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLongArray import java.util.concurrent.locks.LockSupport +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import org.HdrHistogram.Histogram + import akka.actor._ import akka.dispatch.Dispatchers import akka.remote.RemotingMultiNodeSpec @@ -17,10 +22,6 @@ import akka.serialization.jackson.CborSerializable import akka.stream.ThrottleMode import akka.stream.scaladsl.Source import akka.testkit._ -import com.typesafe.config.ConfigFactory -import org.HdrHistogram.Histogram - -import scala.concurrent.duration._ object LatencySpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala index 68336309da..ae5dfbeaeb 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala @@ -8,17 +8,18 @@ import java.nio.ByteBuffer import java.util.concurrent.Executors import java.util.concurrent.TimeUnit.NANOSECONDS +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor._ +import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec } import akka.remote.artery.compress.CompressionProtocol.Events.ReceivedActorRefCompressionTable import akka.remote.testconductor.RoleName import akka.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport } -import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec } -import akka.serialization.jackson.CborSerializable import akka.serialization.{ ByteBufferSerializer, SerializerWithStringManifest } +import akka.serialization.jackson.CborSerializable import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ object MaxThroughputSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala index d886d03455..b90db2830c 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/RemoteRestartedQuarantinedSpec.scala @@ -4,17 +4,18 @@ package akka.remote.artery -import akka.actor.{ ActorIdentity, Identify, _ } -import akka.remote.testconductor.RoleName -import akka.remote.testkit.MultiNodeConfig -import akka.remote.{ AddressUidExtension, RARP, RemotingMultiNodeSpec } -import akka.testkit._ -import com.typesafe.config.ConfigFactory - import scala.concurrent.Await import scala.concurrent.duration._ import scala.language.postfixOps +import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify, _ } +import akka.remote.{ AddressUidExtension, RARP, RemotingMultiNodeSpec } +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.testkit._ + object RemoteRestartedQuarantinedSpec extends MultiNodeConfig { val first = role("first") val second = role("second") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala index 054c427c34..ed32c60611 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveInboundStreamRestartWithCompressionInFlightSpec.scala @@ -4,16 +4,17 @@ package akka.remote.artery +import scala.util.control.NoStackTrace + +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.ScalaFutures + import akka.actor._ import akka.actor.ActorIdentity import akka.actor.Identify import akka.remote.{ RARP, RemotingMultiNodeSpec } import akka.remote.testkit.MultiNodeConfig import akka.testkit._ -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.ScalaFutures - -import scala.util.control.NoStackTrace object SurviveInboundStreamRestartWithCompressionInFlightSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala index 0aa0314f48..c61323423e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/SurviveNetworkPartitionSpec.scala @@ -6,6 +6,9 @@ package akka.remote.artery import scala.concurrent.duration._ +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.actor.ActorIdentity import akka.actor.Identify @@ -13,8 +16,6 @@ import akka.remote.{ RARP, RemotingMultiNodeSpec } import akka.remote.testkit.MultiNodeConfig import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.testkit._ -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory object SurviveNetworkPartitionSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala index 3bfc1c46fe..3535982f42 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/TestMessage.scala @@ -5,9 +5,9 @@ package akka.remote.artery import akka.actor.ExtendedActorSystem -import akka.serialization.SerializerWithStringManifest -import akka.remote.artery.protobuf.{ TestMessages => proto } import akka.protobufv3.internal.ByteString +import akka.remote.artery.protobuf.{ TestMessages => proto } +import akka.serialization.SerializerWithStringManifest object TestMessage { final case class Item(id: Long, name: String) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala index 389a7bbd4d..899b59652e 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamConcistencySpec.scala @@ -8,6 +8,14 @@ package aeron import java.io.File import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory +import io.aeron.Aeron +import io.aeron.driver.MediaDriver +import org.agrona.IoUtil + import akka.Done import akka.actor.ExtendedActorSystem import akka.actor.Props @@ -20,13 +28,6 @@ import akka.stream.ThrottleMode import akka.stream.scaladsl.Source import akka.testkit._ import akka.util.ByteString -import com.typesafe.config.ConfigFactory -import io.aeron.Aeron -import io.aeron.driver.MediaDriver -import org.agrona.IoUtil - -import scala.concurrent.Await -import scala.concurrent.duration._ object AeronStreamConsistencySpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala index a8659f3b3f..17046d1f9a 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamLatencySpec.scala @@ -16,6 +16,14 @@ import java.util.concurrent.locks.LockSupport import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import io.aeron.Aeron +import io.aeron.CncFileDescriptor +import io.aeron.driver.MediaDriver +import org.HdrHistogram.Histogram +import org.agrona.IoUtil +import org.agrona.concurrent.ManyToOneConcurrentArrayQueue + import akka.Done import akka.actor._ import akka.remote.testconductor.RoleName @@ -28,13 +36,6 @@ import akka.stream.scaladsl.Flow import akka.stream.scaladsl.Source import akka.testkit._ import akka.util.ByteString -import com.typesafe.config.ConfigFactory -import io.aeron.Aeron -import io.aeron.CncFileDescriptor -import io.aeron.driver.MediaDriver -import org.HdrHistogram.Histogram -import org.agrona.IoUtil -import org.agrona.concurrent.ManyToOneConcurrentArrayQueue object AeronStreamLatencySpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala index 9db0a66249..6d6cbd8f88 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/aeron/AeronStreamMaxThroughputSpec.scala @@ -5,28 +5,28 @@ package akka.remote.artery package aeron +import java.io.File import java.util.concurrent.Executors import scala.collection.AbstractIterator import scala.concurrent.Await import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory +import io.aeron.Aeron +import io.aeron.CncFileDescriptor +import io.aeron.driver.MediaDriver +import org.agrona.IoUtil + import akka.actor._ import akka.remote.testconductor.RoleName import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec import akka.remote.testkit.STMultiNodeSpec +import akka.stream.KillSwitches import akka.stream.scaladsl.Source import akka.testkit._ -import com.typesafe.config.ConfigFactory -import io.aeron.Aeron -import io.aeron.driver.MediaDriver -import akka.stream.KillSwitches -import java.io.File - import akka.util.ByteString -import io.aeron.CncFileDescriptor -import org.agrona.IoUtil object AeronStreamMaxThroughputSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala index b9c95dd004..fa304daac9 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteGatePiercingSpec.scala @@ -4,18 +4,19 @@ package akka.remote.classic -import akka.actor.{ ActorIdentity, Identify, _ } -import akka.remote.testconductor.RoleName -import akka.remote.testkit.MultiNodeConfig -import akka.remote.transport.AssociationHandle -import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly -import akka.remote.{ RARP, RemotingMultiNodeSpec } -import akka.testkit._ -import com.typesafe.config.ConfigFactory import scala.concurrent.Await import scala.concurrent.duration._ import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify, _ } +import akka.remote.{ RARP, RemotingMultiNodeSpec } +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.remote.transport.AssociationHandle +import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly +import akka.testkit._ object RemoteGatePiercingSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala index c112fdc57a..06d7262518 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeRestartGateSpec.scala @@ -4,18 +4,19 @@ package akka.remote.classic -import akka.actor.{ ActorIdentity, Identify, _ } -import akka.remote.testconductor.RoleName -import akka.remote.testkit.MultiNodeConfig -import akka.remote.transport.AssociationHandle -import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly -import akka.remote.{ RARP, RemotingMultiNodeSpec } -import akka.testkit._ -import com.typesafe.config.ConfigFactory import scala.concurrent.Await import scala.concurrent.duration._ import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify, _ } +import akka.remote.{ RARP, RemotingMultiNodeSpec } +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.remote.transport.AssociationHandle +import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly +import akka.testkit._ object RemoteNodeRestartGateSpec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala index f7bcc066fc..b608186581 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteNodeShutdownAndComesBackSpec.scala @@ -4,18 +4,19 @@ package akka.remote.classic -import akka.actor.{ ActorIdentity, Identify, _ } -import akka.remote.testconductor.RoleName -import akka.remote.testkit.MultiNodeConfig -import akka.remote.transport.ThrottlerTransportAdapter.{ Direction, ForceDisassociate } -import akka.remote.{ RARP, RemotingMultiNodeSpec } -import akka.testkit._ -import com.typesafe.config.ConfigFactory - import scala.concurrent.Await import scala.concurrent.duration._ import scala.language.postfixOps +import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify, _ } +import akka.remote.{ RARP, RemotingMultiNodeSpec } +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.remote.transport.ThrottlerTransportAdapter.{ Direction, ForceDisassociate } +import akka.testkit._ + object RemoteNodeShutdownAndComesBackSpec extends MultiNodeConfig { val first = role("first") val second = role("second") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteRestartedQuarantinedSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteRestartedQuarantinedSpec.scala index e7a33252c2..b3bf1cdf74 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteRestartedQuarantinedSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/RemoteRestartedQuarantinedSpec.scala @@ -4,17 +4,18 @@ package akka.remote.classic -import akka.actor.{ ActorIdentity, Identify, _ } -import akka.remote.testconductor.RoleName -import akka.remote.testkit.MultiNodeConfig -import akka.remote.{ AddressUidExtension, RARP, RemotingMultiNodeSpec, ThisActorSystemQuarantinedEvent } -import akka.testkit._ -import com.typesafe.config.ConfigFactory - import scala.concurrent.Await import scala.concurrent.duration._ import scala.language.postfixOps +import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify, _ } +import akka.remote.{ AddressUidExtension, RARP, RemotingMultiNodeSpec, ThisActorSystemQuarantinedEvent } +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.testkit._ + object RemoteRestartedQuarantinedSpec extends MultiNodeConfig { val first = role("first") val second = role("second") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala index d8aa88a684..16d7adabb6 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/classic/Ticket15109Spec.scala @@ -4,18 +4,19 @@ package akka.remote.classic -import akka.actor.{ ActorIdentity, Identify, _ } -import akka.remote.testconductor.RoleName -import akka.remote.testkit.MultiNodeConfig -import akka.remote.transport.AssociationHandle -import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly -import akka.remote.{ RARP, RemotingMultiNodeSpec } -import akka.testkit._ -import com.typesafe.config.ConfigFactory import scala.concurrent.Await import scala.concurrent.duration._ import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify, _ } +import akka.remote.{ RARP, RemotingMultiNodeSpec } +import akka.remote.testconductor.RoleName +import akka.remote.testkit.MultiNodeConfig +import akka.remote.transport.AssociationHandle +import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociateExplicitly +import akka.testkit._ object Ticket15109Spec extends MultiNodeConfig { val first = role("first") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala index 0b44988480..509cca48c3 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRandomSpec.scala @@ -5,6 +5,9 @@ package akka.remote.routing import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Address @@ -16,7 +19,6 @@ import akka.routing.Broadcast import akka.routing.RandomPool import akka.routing.RoutedActorRef import akka.testkit._ -import com.typesafe.config.ConfigFactory class RemoteRandomConfig(artery: Boolean) extends MultiNodeConfig { @@ -60,8 +62,8 @@ object RemoteRandomSpec { class RemoteRandomSpec(multiNodeConfig: RemoteRandomConfig) extends RemotingMultiNodeSpec(multiNodeConfig) with DefaultTimeout { - import multiNodeConfig._ import RemoteRandomSpec._ + import multiNodeConfig._ def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala index 1c38101291..a4dd754c30 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteRoundRobinSpec.scala @@ -4,18 +4,19 @@ package akka.remote.routing +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.typesafe.config.ConfigFactory + import akka.actor.{ Actor, ActorRef, Address, PoisonPill, Props } import akka.pattern.ask import akka.remote.RemotingMultiNodeSpec import akka.remote.testkit.MultiNodeConfig import akka.routing._ import akka.testkit._ -import com.typesafe.config.ConfigFactory - -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.language.postfixOps class RemoteRoundRobinConfig(artery: Boolean) extends MultiNodeConfig { diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala index 5f899a3b6d..bb1c755609 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/routing/RemoteScatterGatherSpec.scala @@ -5,6 +5,9 @@ package akka.remote.routing import scala.concurrent.duration._ + +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Address @@ -13,11 +16,10 @@ import akka.actor.Props import akka.remote.RemotingMultiNodeSpec import akka.remote.testkit.MultiNodeConfig import akka.routing.Broadcast -import akka.routing.ScatterGatherFirstCompletedPool import akka.routing.RoutedActorRef +import akka.routing.ScatterGatherFirstCompletedPool import akka.testkit._ import akka.testkit.TestEvent._ -import com.typesafe.config.ConfigFactory class RemoteScatterGatherConfig(artery: Boolean) extends MultiNodeConfig { @@ -65,8 +67,8 @@ object RemoteScatterGatherSpec { class RemoteScatterGatherSpec(multiNodeConfig: RemoteScatterGatherConfig) extends RemotingMultiNodeSpec(multiNodeConfig) with DefaultTimeout { - import multiNodeConfig._ import RemoteScatterGatherSpec._ + import multiNodeConfig._ def initialParticipants = roles.size diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala index 662011ae7b..bd3ae7abcc 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/testconductor/TestConductorSpec.scala @@ -4,15 +4,16 @@ package akka.remote.testconductor -import language.postfixOps -import akka.actor.{ Actor, ActorIdentity, Deploy, Identify, Props } - import scala.concurrent.duration._ -import akka.testkit.LongRunningTest + +import com.typesafe.config.ConfigFactory +import language.postfixOps + +import akka.actor.{ Actor, ActorIdentity, Deploy, Identify, Props } import akka.remote.RemotingMultiNodeSpec import akka.remote.testkit.MultiNodeConfig import akka.remote.transport.ThrottlerTransportAdapter.Direction -import com.typesafe.config.ConfigFactory +import akka.testkit.LongRunningTest object TestConductorMultiJvmSpec extends MultiNodeConfig { commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString(""" diff --git a/akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala index 9b1e9d08cb..43f3293eb1 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/artery/ArteryFailedToBindSpec.scala @@ -4,14 +4,15 @@ package akka.remote.artery +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.ActorSystem import akka.remote.RARP import akka.remote.RemoteTransportException import akka.testkit.SocketUtil import akka.testkit.TestKit -import com.typesafe.config.ConfigFactory -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec class ArteryFailedToBindSpec extends AnyWordSpec with Matchers { diff --git a/akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala index a1c4de0276..b9a499bab8 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/classic/RemotingFailedToBindSpec.scala @@ -4,13 +4,14 @@ package akka.remote.classic -import akka.actor.ActorSystem -import akka.testkit.SocketUtil import com.typesafe.config.ConfigFactory import org.jboss.netty.channel.ChannelException import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem +import akka.testkit.SocketUtil + class RemotingFailedToBindSpec extends AnyWordSpec with Matchers { "an ActorSystem" must { diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala index 1a1b9bc591..365a2023f8 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/BarrierSpec.scala @@ -4,12 +4,14 @@ package akka.remote.testconductor +import java.net.{ InetAddress, InetSocketAddress } + +import scala.concurrent.duration._ + import language.postfixOps import akka.actor._ import akka.testkit.{ AkkaSpec, EventFilter, ImplicitSender, TestProbe, TimingTest } -import scala.concurrent.duration._ -import java.net.{ InetAddress, InetSocketAddress } object BarrierSpec { final case class Failed(ref: ActorRef, thr: Throwable) @@ -23,9 +25,9 @@ object BarrierSpec { class BarrierSpec extends AkkaSpec(BarrierSpec.config) with ImplicitSender { + import BarrierCoordinator._ import BarrierSpec._ import Controller._ - import BarrierCoordinator._ val A = RoleName("a") val B = RoleName("b") diff --git a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala index 323daf012b..33815ca1df 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testconductor/ControllerSpec.scala @@ -4,12 +4,13 @@ package akka.remote.testconductor -import akka.testkit.AkkaSpec -import akka.actor.{ AddressFromURIString, PoisonPill, Props } -import akka.testkit.ImplicitSender -import akka.remote.testconductor.Controller.NodeInfo -import java.net.InetSocketAddress import java.net.InetAddress +import java.net.InetSocketAddress + +import akka.actor.{ AddressFromURIString, PoisonPill, Props } +import akka.remote.testconductor.Controller.NodeInfo +import akka.testkit.AkkaSpec +import akka.testkit.ImplicitSender object ControllerSpec { val config = """ diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala index 5c331bb2e9..e8697fca5e 100644 --- a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala +++ b/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala @@ -18,6 +18,7 @@ import java.io.OutputStreamWriter import java.io.PrintWriter import java.io.StringReader import java.io.StringWriter + import scala.annotation.tailrec /** diff --git a/akka-remote-tests/src/test/scala/org/scalatest/extra/QuietReporter.scala b/akka-remote-tests/src/test/scala/org/scalatest/extra/QuietReporter.scala index d44004d138..a1bcb5b67b 100644 --- a/akka-remote-tests/src/test/scala/org/scalatest/extra/QuietReporter.scala +++ b/akka-remote-tests/src/test/scala/org/scalatest/extra/QuietReporter.scala @@ -4,10 +4,11 @@ package org.scalatest.extra -import org.scalatest.tools.StandardOutReporter -import org.scalatest.events._ import java.lang.Boolean.getBoolean +import org.scalatest.events._ +import org.scalatest.tools.StandardOutReporter + class QuietReporter(inColor: Boolean, withDurations: Boolean = false) extends StandardOutReporter(withDurations, inColor, false, true, false, false, false, false, false, false, false) { diff --git a/akka-remote/src/main/scala-jdk-9/akka/remote/artery/jfr/Events.scala b/akka-remote/src/main/scala-jdk-9/akka/remote/artery/jfr/Events.scala index f71b15fcd8..cb9013da27 100644 --- a/akka-remote/src/main/scala-jdk-9/akka/remote/artery/jfr/Events.scala +++ b/akka-remote/src/main/scala-jdk-9/akka/remote/artery/jfr/Events.scala @@ -6,16 +6,17 @@ package akka.remote.artery.jfr import java.net.InetSocketAddress +import jdk.jfr.Category +import jdk.jfr.DataAmount +import jdk.jfr.Enabled +import jdk.jfr.Event +import jdk.jfr.Label +import jdk.jfr.StackTrace +import jdk.jfr.Timespan + import akka.actor.Address import akka.annotation.InternalApi import akka.remote.UniqueAddress -import jdk.jfr.StackTrace -import jdk.jfr.Category -import jdk.jfr.Label -import jdk.jfr.Event -import jdk.jfr.DataAmount -import jdk.jfr.Enabled -import jdk.jfr.Timespan // requires jdk9+ to compile // for editing these in IntelliJ, open module settings, change JDK dependency to 11 for only this module diff --git a/akka-remote/src/main/scala/akka/remote/AckedDelivery.scala b/akka-remote/src/main/scala/akka/remote/AckedDelivery.scala index 8f3519271c..15c507987e 100644 --- a/akka-remote/src/main/scala/akka/remote/AckedDelivery.scala +++ b/akka-remote/src/main/scala/akka/remote/AckedDelivery.scala @@ -5,6 +5,7 @@ package akka.remote import scala.collection.immutable._ + import akka.AkkaException @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") diff --git a/akka-remote/src/main/scala/akka/remote/DeadlineFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/DeadlineFailureDetector.scala index 09931d6215..ea67c146f1 100644 --- a/akka-remote/src/main/scala/akka/remote/DeadlineFailureDetector.scala +++ b/akka-remote/src/main/scala/akka/remote/DeadlineFailureDetector.scala @@ -7,7 +7,9 @@ package akka.remote import scala.concurrent.duration._ import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration + import com.typesafe.config.Config + import akka.event.EventStream import akka.remote.FailureDetector.Clock import akka.util.Helpers.ConfigOps diff --git a/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala b/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala index 1582480778..c474d3e407 100644 --- a/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala +++ b/akka-remote/src/main/scala/akka/remote/DefaultFailureDetectorRegistry.scala @@ -5,9 +5,10 @@ package akka.remote import java.util.concurrent.atomic.AtomicReference +import java.util.concurrent.locks.{ Lock, ReentrantLock } + import scala.annotation.tailrec import scala.collection.immutable.Map -import java.util.concurrent.locks.{ Lock, ReentrantLock } /** * A lock-less thread-safe implementation of [[akka.remote.FailureDetectorRegistry]]. diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala index 91cc088a67..5097035922 100644 --- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala +++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala @@ -4,16 +4,30 @@ package akka.remote +import java.io.NotSerializableException +import java.util.concurrent.{ ConcurrentHashMap, TimeoutException } +import java.util.concurrent.locks.LockSupport + +import scala.annotation.tailrec +import scala.concurrent.Future +import scala.concurrent.duration.Deadline +import scala.concurrent.duration.Duration +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + +import akka.{ AkkaException, OnlyCauseStackTrace } +import akka.actor._ import akka.actor.OneForOneStrategy import akka.actor.SupervisorStrategy._ import akka.actor.Terminated -import akka.actor._ import akka.dispatch.sysmsg.SystemMessage import akka.event.{ LogMarker, Logging, MarkerLoggingAdapter } import akka.pattern.pipe import akka.remote.EndpointManager.{ Link, ResendState, Send } import akka.remote.EndpointWriter.{ FlushAndStop, StoppedReading } import akka.remote.WireFormats.SerializedMessage +import akka.remote.transport._ import akka.remote.transport.AkkaPduCodec.Message import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, @@ -22,23 +36,9 @@ import akka.remote.transport.AssociationHandle.{ InboundPayload } import akka.remote.transport.Transport.InvalidAssociationException -import akka.remote.transport._ import akka.serialization.Serialization import akka.util.ByteString -import akka.{ AkkaException, OnlyCauseStackTrace } -import java.io.NotSerializableException -import java.util.concurrent.{ ConcurrentHashMap, TimeoutException } - -import scala.annotation.tailrec -import scala.concurrent.duration.Deadline -import scala.util.control.NonFatal -import java.util.concurrent.locks.LockSupport - -import scala.concurrent.Future -import scala.concurrent.duration.Duration - import akka.util.OptionVal -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala b/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala index 2e7ddf0d73..a5840e2c52 100644 --- a/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala +++ b/akka-remote/src/main/scala/akka/remote/FailureDetectorRegistry.scala @@ -4,10 +4,11 @@ package akka.remote -import akka.actor.{ ActorContext, ActorSystem, ExtendedActorSystem } import com.typesafe.config.Config -import akka.event.EventStream + import akka.ConfigurationException +import akka.actor.{ ActorContext, ActorSystem, ExtendedActorSystem } +import akka.event.EventStream /** * Interface for a registry of Akka failure detectors. New resources are implicitly registered when heartbeat is first diff --git a/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala b/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala index e85dde7226..c6a6f5cac2 100644 --- a/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala @@ -4,16 +4,16 @@ package akka.remote -import akka.remote.WireFormats._ -import akka.protobufv3.internal.ByteString +import scala.util.control.NonFatal + import akka.actor.ExtendedActorSystem import akka.annotation.InternalApi +import akka.protobufv3.internal.ByteString +import akka.remote.WireFormats._ import akka.remote.artery.{ EnvelopeBuffer, HeaderBuilder, OutboundEnvelope } import akka.serialization._ import akka.util.unused -import scala.util.control.NonFatal - /** * INTERNAL API * diff --git a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala index 7a71393771..8a74c11057 100644 --- a/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala +++ b/akka-remote/src/main/scala/akka/remote/PhiAccrualFailureDetector.scala @@ -4,18 +4,19 @@ package akka.remote -import akka.event.Logging.Warning -import akka.remote.FailureDetector.Clock import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec +import scala.collection.immutable import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration -import scala.collection.immutable import com.typesafe.config.Config + import akka.event.EventStream import akka.event.Logging +import akka.event.Logging.Warning +import akka.remote.FailureDetector.Clock import akka.util.Helpers.ConfigOps /** diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala index 0654d0d100..b83ab570d5 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala @@ -9,12 +9,14 @@ import scala.util.Failure import scala.util.control.Exception.Catcher import scala.util.control.NonFatal +import com.github.ghik.silencer.silent + import akka.ConfigurationException import akka.Done +import akka.actor._ import akka.actor.SystemGuardian.RegisterTerminationHook import akka.actor.SystemGuardian.TerminationHook import akka.actor.SystemGuardian.TerminationHookDone -import akka.actor._ import akka.annotation.InternalApi import akka.dispatch.RequiresMessageQueue import akka.dispatch.UnboundedMessageQueueSemantics @@ -36,7 +38,6 @@ import akka.serialization.Serialization import akka.util.ErrorMessages import akka.util.OptionVal import akka.util.unused -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala index baeaa0d86d..0ec0664ce9 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDaemon.scala @@ -4,8 +4,12 @@ package akka.remote +import java.util.concurrent.ConcurrentHashMap + import scala.annotation.tailrec +import scala.collection.immutable import scala.util.control.NonFatal + import akka.actor.{ Actor, ActorPath, @@ -19,22 +23,19 @@ import akka.actor.{ Props, VirtualPathContainer } -import akka.event.{ AddressTerminatedTopic, LogMarker, MarkerLoggingAdapter } -import akka.dispatch.sysmsg.{ DeathWatchNotification, SystemMessage, Watch } -import akka.actor.ActorRefWithCell +import akka.actor.ActorIdentity import akka.actor.ActorRefScope -import akka.util.Switch +import akka.actor.ActorRefWithCell import akka.actor.ActorSelectionMessage -import akka.actor.SelectParent +import akka.actor.EmptyLocalActorRef +import akka.actor.Identify import akka.actor.SelectChildName import akka.actor.SelectChildPattern -import akka.actor.Identify -import akka.actor.ActorIdentity -import akka.actor.EmptyLocalActorRef -import java.util.concurrent.ConcurrentHashMap - -import scala.collection.immutable +import akka.actor.SelectParent +import akka.dispatch.sysmsg.{ DeathWatchNotification, SystemMessage, Watch } import akka.dispatch.sysmsg.Unwatch +import akka.event.{ AddressTerminatedTopic, LogMarker, MarkerLoggingAdapter } +import akka.util.Switch /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala index b08bf8ae8e..0a5b4f9d30 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDeployer.scala @@ -4,14 +4,15 @@ package akka.remote -import akka.actor._ -import akka.routing._ -import akka.remote.routing._ -import akka.ConfigurationException -import akka.japi.Util.immutableSeq import com.typesafe.config._ -import akka.routing.Pool + +import akka.ConfigurationException +import akka.actor._ +import akka.japi.Util.immutableSeq +import akka.remote.routing._ import akka.remote.routing.RemoteRouterConfig +import akka.routing._ +import akka.routing.Pool @SerialVersionUID(1L) final case class RemoteScope(node: Address) extends Scope { diff --git a/akka-remote/src/main/scala/akka/remote/RemoteDeploymentWatcher.scala b/akka-remote/src/main/scala/akka/remote/RemoteDeploymentWatcher.scala index c764794264..2b8a70e77d 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteDeploymentWatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteDeploymentWatcher.scala @@ -4,12 +4,12 @@ package akka.remote -import akka.actor.InternalActorRef -import akka.actor.Terminated import akka.actor.Actor import akka.actor.ActorRef -import akka.dispatch.sysmsg.DeathWatchNotification +import akka.actor.InternalActorRef +import akka.actor.Terminated import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.dispatch.sysmsg.DeathWatchNotification /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala b/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala index e1d8802b92..07a7b45ede 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteMetricsExtension.scala @@ -7,6 +7,9 @@ package akka.remote import java.util.concurrent.ConcurrentHashMap import scala.annotation.tailrec + +import com.github.ghik.silencer.silent + import akka.actor.ActorSelectionMessage import akka.actor.ActorSystem import akka.actor.ClassicActorSystemProvider @@ -16,7 +19,6 @@ import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider import akka.event.Logging import akka.routing.RouterEnvelope -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala index 42ff37bf32..ebc1716190 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteSettings.scala @@ -4,23 +4,25 @@ package akka.remote -import com.typesafe.config.Config -import scala.concurrent.duration._ import scala.collection.immutable +import scala.concurrent.duration._ -import akka.util.Timeout -import akka.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring } -import akka.japi.Util._ +import com.github.ghik.silencer.silent +import com.typesafe.config.Config + +import akka.ConfigurationException import akka.actor.Props +import akka.annotation.InternalApi import akka.event.Logging import akka.event.Logging.LogLevel -import akka.ConfigurationException -import akka.annotation.InternalApi +import akka.japi.Util._ import akka.remote.artery.ArterySettings -import com.github.ghik.silencer.silent +import akka.util.Helpers.{ toRootLowerCase, ConfigOps, Requiring } +import akka.util.Timeout final class RemoteSettings(val config: Config) { import config._ + import akka.util.ccompat.JavaConverters._ val Artery = ArterySettings(getConfig("akka.remote.artery")) diff --git a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala index 117b9a322f..860f63cf57 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteTransport.scala @@ -4,15 +4,15 @@ package akka.remote +import scala.collection.immutable +import scala.concurrent.Future +import scala.util.control.NoStackTrace + import akka.AkkaException import akka.Done import akka.actor._ import akka.annotation.InternalStableApi import akka.event.LoggingAdapter - -import scala.collection.immutable -import scala.concurrent.Future -import scala.util.control.NoStackTrace import akka.util.{ unused, OptionVal } /** diff --git a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala index ede5aecf4c..a727ef21aa 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala @@ -7,16 +7,17 @@ package akka.remote import scala.collection.mutable import scala.concurrent.duration._ +import com.github.ghik.silencer.silent + import akka.actor._ import akka.annotation.InternalApi -import akka.dispatch.sysmsg.{ DeathWatchNotification, Watch } import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.dispatch.Dispatchers +import akka.dispatch.sysmsg.{ DeathWatchNotification, Watch } import akka.event.AddressTerminatedTopic import akka.remote.artery.ArteryMessage -import akka.dispatch.Dispatchers import akka.remote.artery.ArteryTransport import akka.util.unused -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala index fc73ffc941..41dff1bad7 100644 --- a/akka-remote/src/main/scala/akka/remote/Remoting.scala +++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala @@ -4,37 +4,37 @@ package akka.remote +import java.net.URLEncoder +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.TimeoutException + +import scala.collection.immutable +import scala.collection.immutable.{ HashMap, Seq } +import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.duration._ +import scala.util.{ Failure, Success } +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config + import akka.Done -import akka.actor.SupervisorStrategy._ import akka.actor._ +import akka.actor.ActorInitializationException +import akka.actor.SupervisorStrategy._ +import akka.annotation.InternalStableApi +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.dispatch.MessageDispatcher import akka.event.{ Logging, LoggingAdapter } import akka.pattern.{ ask, gracefulStop, pipe } import akka.remote.EndpointManager._ import akka.remote.Remoting.TransportSupervisor -import akka.remote.transport.Transport.{ ActorAssociationEventListener, AssociationEventListener, InboundAssociation } import akka.remote.transport._ -import com.typesafe.config.Config -import java.net.URLEncoder -import java.util.concurrent.TimeoutException - -import scala.collection.immutable.{ HashMap, Seq } -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future, Promise } -import scala.util.control.NonFatal -import scala.util.{ Failure, Success } import akka.remote.transport.AkkaPduCodec.Message -import java.util.concurrent.ConcurrentHashMap - -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.remote.transport.Transport.{ ActorAssociationEventListener, AssociationEventListener, InboundAssociation } import akka.util.ByteString.UTF_8 import akka.util.OptionVal - -import scala.collection.immutable -import akka.actor.ActorInitializationException -import akka.annotation.InternalStableApi import akka.util.ccompat._ -import com.github.ghik.silencer.silent -import akka.dispatch.MessageDispatcher /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala b/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala index 99c7df4e18..05595d6098 100644 --- a/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala +++ b/akka-remote/src/main/scala/akka/remote/RemotingLifecycleEvent.scala @@ -4,12 +4,13 @@ package akka.remote -import akka.event.Logging.LogLevel -import akka.event.{ Logging, LoggingAdapter } -import akka.actor.{ ActorSystem, Address } +import scala.runtime.AbstractFunction2 + import com.github.ghik.silencer.silent -import scala.runtime.AbstractFunction2 +import akka.actor.{ ActorSystem, Address } +import akka.event.{ Logging, LoggingAdapter } +import akka.event.Logging.LogLevel @silent("@SerialVersionUID has no effect") @SerialVersionUID(1L) diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArterySettings.scala b/akka-remote/src/main/scala/akka/remote/artery/ArterySettings.scala index d5fa667c81..25788a8331 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArterySettings.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArterySettings.scala @@ -6,9 +6,12 @@ package akka.remote.artery import java.net.InetAddress -import akka.util.ccompat.JavaConverters._ - import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.NotUsed import akka.japi.Util.immutableSeq import akka.stream.ActorMaterializerSettings @@ -16,9 +19,7 @@ import akka.util.Helpers.ConfigOps import akka.util.Helpers.Requiring import akka.util.Helpers.toRootLowerCase import akka.util.WildcardIndex -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory +import akka.util.ccompat.JavaConverters._ /** INTERNAL API */ private[akka] final class ArterySettings private (config: Config) { diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala index fcd8588068..78a608aec4 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala @@ -18,11 +18,13 @@ import scala.util.Try import scala.util.control.NoStackTrace import scala.util.control.NonFatal +import com.github.ghik.silencer.silent + import akka.Done import akka.NotUsed +import akka.actor._ import akka.actor.Actor import akka.actor.Props -import akka.actor._ import akka.annotation.InternalStableApi import akka.dispatch.Dispatchers import akka.event.Logging @@ -37,8 +39,8 @@ import akka.remote.artery.Encoder.OutboundCompressionAccess import akka.remote.artery.InboundControlJunction.ControlMessageObserver import akka.remote.artery.InboundControlJunction.ControlMessageSubject import akka.remote.artery.OutboundControlJunction.OutboundControlIngress -import akka.remote.artery.compress.CompressionProtocol.CompressionMessage import akka.remote.artery.compress._ +import akka.remote.artery.compress.CompressionProtocol.CompressionMessage import akka.remote.transport.ThrottlerTransportAdapter.Blackhole import akka.remote.transport.ThrottlerTransportAdapter.SetThrottle import akka.remote.transport.ThrottlerTransportAdapter.Unthrottled @@ -49,7 +51,6 @@ import akka.stream.scaladsl.Sink import akka.util.OptionVal import akka.util.WildcardIndex import akka.util.unused -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/Association.scala b/akka-remote/src/main/scala/akka/remote/artery/Association.scala index 2f3919842e..63d5e6a0bd 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Association.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Association.scala @@ -17,6 +17,9 @@ import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent +import org.agrona.concurrent.ManyToOneConcurrentArrayQueue + import akka.Done import akka.NotUsed import akka.actor.ActorRef @@ -53,8 +56,6 @@ import akka.util.PrettyDuration._ import akka.util.Unsafe import akka.util.WildcardIndex import akka.util.ccompat._ -import com.github.ghik.silencer.silent -import org.agrona.concurrent.ManyToOneConcurrentArrayQueue /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala b/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala index e33434f415..3a214ffeda 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala @@ -6,28 +6,29 @@ package akka.remote.artery import java.util.concurrent.TimeUnit -import scala.concurrent.duration._ import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration._ import scala.util.control.NonFatal + import akka.Done import akka.actor.{ EmptyLocalActorRef, _ } import akka.event.Logging import akka.pattern.PromiseActorRef +import akka.remote.{ MessageSerializer, OversizedPayloadException, RemoteActorRefProvider, UniqueAddress } import akka.remote.artery.Decoder.{ AdvertiseActorRefsCompressionTable, AdvertiseClassManifestsCompressionTable, InboundCompressionAccess, InboundCompressionAccessImpl } +import akka.remote.artery.OutboundHandshake.HandshakeReq import akka.remote.artery.SystemMessageDelivery.SystemMessageEnvelope -import akka.remote.artery.compress.CompressionProtocol._ import akka.remote.artery.compress._ -import akka.remote.{ MessageSerializer, OversizedPayloadException, RemoteActorRefProvider, UniqueAddress } +import akka.remote.artery.compress.CompressionProtocol._ import akka.serialization.{ Serialization, SerializationExtension, Serializers } import akka.stream._ import akka.stream.stage._ import akka.util.{ unused, OptionVal, Unsafe } -import akka.remote.artery.OutboundHandshake.HandshakeReq /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/Control.scala b/akka-remote/src/main/scala/akka/remote/artery/Control.scala index 771833b6b2..38b3b93e5e 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Control.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Control.scala @@ -11,14 +11,14 @@ import scala.concurrent.Promise import scala.util.Try import akka.Done +import akka.event.Logging +import akka.remote.UniqueAddress import akka.stream.Attributes import akka.stream.FlowShape import akka.stream.Inlet import akka.stream.Outlet import akka.stream.stage._ -import akka.remote.UniqueAddress import akka.util.OptionVal -import akka.event.Logging /** INTERNAL API: marker trait for protobuf-serializable artery messages */ private[remote] trait ArteryMessage extends Serializable diff --git a/akka-remote/src/main/scala/akka/remote/artery/EnvelopeBufferPool.scala b/akka-remote/src/main/scala/akka/remote/artery/EnvelopeBufferPool.scala index 676881d674..3dc46e4bdd 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/EnvelopeBufferPool.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/EnvelopeBufferPool.scala @@ -6,14 +6,14 @@ package akka.remote.artery import java.nio.{ ByteBuffer, ByteOrder } +import org.agrona.concurrent.{ ManyToManyConcurrentArrayQueue, UnsafeBuffer } + import akka.actor.ActorRef import akka.io.DirectByteBufferPool import akka.remote.artery.compress.{ CompressionTable, InboundCompressions, NoInboundCompressions } import akka.serialization.Serialization import akka.util.{ OptionVal, Unsafe } -import org.agrona.concurrent.{ ManyToManyConcurrentArrayQueue, UnsafeBuffer } - /** * INTERNAL API */ diff --git a/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala b/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala index 698791a948..4cfbaff7f6 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/FixedSizePartitionHub.scala @@ -4,9 +4,10 @@ package akka.remote.artery +import org.agrona.concurrent.OneToOneConcurrentArrayQueue + import akka.annotation.InternalApi import akka.stream.scaladsl.PartitionHub -import org.agrona.concurrent.OneToOneConcurrentArrayQueue /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala b/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala index 42fa03f950..92e1074a53 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/ImmutableLongMap.scala @@ -4,11 +4,13 @@ package akka.remote.artery -import scala.annotation.tailrec -import akka.util.OptionVal -import scala.reflect.ClassTag import java.util.Arrays + +import scala.annotation.tailrec +import scala.reflect.ClassTag + import akka.util.HashCode +import akka.util.OptionVal /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala b/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala index 192113e502..9cd704d300 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/InboundEnvelope.scala @@ -4,10 +4,10 @@ package akka.remote.artery -import akka.actor.InternalActorRef -import akka.util.OptionVal import akka.actor.ActorRef +import akka.actor.InternalActorRef import akka.actor.NoSerializationVerificationNeeded +import akka.util.OptionVal /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/InboundQuarantineCheck.scala b/akka-remote/src/main/scala/akka/remote/artery/InboundQuarantineCheck.scala index 438c5c13e3..0a8748e26c 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/InboundQuarantineCheck.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/InboundQuarantineCheck.scala @@ -4,16 +4,16 @@ package akka.remote.artery +import akka.actor.ActorSelectionMessage +import akka.event.Logging +import akka.remote.HeartbeatMessage +import akka.remote.UniqueAddress import akka.stream.Attributes import akka.stream.FlowShape import akka.stream.Inlet import akka.stream.Outlet import akka.stream.stage._ -import akka.remote.UniqueAddress import akka.util.OptionVal -import akka.event.Logging -import akka.remote.HeartbeatMessage -import akka.actor.ActorSelectionMessage /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala b/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala index fbb3e7b1a1..1bc647f144 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/MessageDispatcher.scala @@ -27,8 +27,8 @@ private[remote] class MessageDispatcher(system: ExtendedActorSystem, provider: R private val debugLogEnabled: Boolean = log.isDebugEnabled def dispatch(inboundEnvelope: InboundEnvelope): Unit = { - import provider.remoteSettings.Artery._ import Logging.messageClassName + import provider.remoteSettings.Artery._ val recipient = inboundEnvelope.recipient.get val message = inboundEnvelope.message diff --git a/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala b/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala index 0755b64d92..ed31509434 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/RemoteInstrument.scala @@ -9,6 +9,7 @@ import java.nio.ByteBuffer import scala.annotation.tailrec import scala.collection.immutable import scala.util.control.NonFatal + import akka.actor.{ ActorRef, ExtendedActorSystem } import akka.annotation.InternalStableApi import akka.event.{ Logging, LoggingAdapter } diff --git a/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala b/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala index d468dcf060..cb4a1c5ff0 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/RemotingFlightRecorder.scala @@ -6,6 +6,9 @@ package akka.remote.artery import java.net.InetSocketAddress +import scala.util.Failure +import scala.util.Success + import akka.actor.Address import akka.actor.ExtendedActorSystem import akka.actor.Extension @@ -15,9 +18,6 @@ import akka.annotation.InternalApi import akka.remote.UniqueAddress import akka.util.JavaVersion -import scala.util.Failure -import scala.util.Success - /** * INTERNAL API */ diff --git a/akka-remote/src/main/scala/akka/remote/artery/RestartCounter.scala b/akka-remote/src/main/scala/akka/remote/artery/RestartCounter.scala index b5c56c7a84..aa1f7879e1 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/RestartCounter.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/RestartCounter.scala @@ -4,10 +4,11 @@ package akka.remote.artery -import scala.concurrent.duration.Deadline import java.util.concurrent.atomic.AtomicReference -import scala.concurrent.duration.FiniteDuration + import scala.annotation.tailrec +import scala.concurrent.duration.Deadline +import scala.concurrent.duration.FiniteDuration /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala b/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala index d2ee9011ad..b4ad17cdfb 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/SendQueue.scala @@ -6,18 +6,18 @@ package akka.remote.artery import java.util.Queue -import akka.stream.stage.OutHandler +import scala.annotation.tailrec +import scala.concurrent.Promise +import scala.util.Failure +import scala.util.Success +import scala.util.Try + import akka.stream.Attributes import akka.stream.Outlet import akka.stream.SourceShape import akka.stream.stage.GraphStageLogic import akka.stream.stage.GraphStageWithMaterializedValue - -import scala.annotation.tailrec -import scala.concurrent.Promise -import scala.util.Try -import scala.util.Success -import scala.util.Failure +import akka.stream.stage.OutHandler /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala b/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala index 3c735ec2e8..9c365ff8ef 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/TestStage.scala @@ -7,7 +7,9 @@ package akka.remote.artery import java.util.concurrent.atomic.AtomicReference import scala.annotation.tailrec + import akka.actor.Address +import akka.event.Logging import akka.remote.transport.ThrottlerTransportAdapter.Direction import akka.stream.Attributes import akka.stream.FlowShape @@ -15,7 +17,6 @@ import akka.stream.Inlet import akka.stream.Outlet import akka.stream.stage._ import akka.util.OptionVal -import akka.event.Logging object TestManagementCommands { diff --git a/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala b/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala index cf796e3a01..8169c710fa 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSink.scala @@ -5,7 +5,6 @@ package akka.remote.artery package aeron -import akka.util.PrettyDuration.PrettyPrintableDuration import scala.annotation.tailrec import scala.concurrent.Future import scala.concurrent.Promise @@ -14,6 +13,12 @@ import scala.util.Failure import scala.util.Success import scala.util.Try import scala.util.control.NoStackTrace + +import io.aeron.Aeron +import io.aeron.Publication +import org.agrona.concurrent.UnsafeBuffer +import org.agrona.hints.ThreadHints + import akka.Done import akka.stream.Attributes import akka.stream.Inlet @@ -22,10 +27,7 @@ import akka.stream.stage.AsyncCallback import akka.stream.stage.GraphStageLogic import akka.stream.stage.GraphStageWithMaterializedValue import akka.stream.stage.InHandler -import io.aeron.Aeron -import io.aeron.Publication -import org.agrona.concurrent.UnsafeBuffer -import org.agrona.hints.ThreadHints +import akka.util.PrettyDuration.PrettyPrintableDuration /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSource.scala b/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSource.scala index 901e51386d..7a1d16244d 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSource.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/aeron/AeronSource.scala @@ -6,24 +6,24 @@ package akka.remote.artery package aeron import scala.annotation.tailrec +import scala.concurrent.{ Future, Promise } +import scala.util.control.NonFatal + +import io.aeron.{ Aeron, FragmentAssembler, Subscription } +import io.aeron.exceptions.DriverTimeoutException +import io.aeron.logbuffer.FragmentHandler +import io.aeron.logbuffer.Header +import org.agrona.DirectBuffer +import org.agrona.hints.ThreadHints + import akka.stream.Attributes import akka.stream.Outlet import akka.stream.SourceShape import akka.stream.stage.AsyncCallback import akka.stream.stage.GraphStageLogic -import akka.stream.stage.OutHandler -import io.aeron.{ Aeron, FragmentAssembler, Subscription } -import io.aeron.logbuffer.FragmentHandler -import io.aeron.logbuffer.Header -import org.agrona.DirectBuffer -import org.agrona.hints.ThreadHints import akka.stream.stage.GraphStageWithMaterializedValue - -import scala.util.control.NonFatal +import akka.stream.stage.OutHandler import akka.stream.stage.StageLogging -import io.aeron.exceptions.DriverTimeoutException - -import scala.concurrent.{ Future, Promise } /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala index e156553ea8..0062d15850 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/aeron/ArteryAeronUdpTransport.scala @@ -16,20 +16,7 @@ import scala.collection.immutable import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ import scala.util.control.NonFatal -import akka.Done -import akka.actor.Address -import akka.actor.Cancellable -import akka.actor.ExtendedActorSystem -import akka.event.Logging -import akka.remote.RemoteActorRefProvider -import akka.remote.RemoteTransportException -import akka.remote.artery.compress._ -import akka.stream.KillSwitches -import akka.stream.scaladsl.Flow -import akka.stream.scaladsl.Keep -import akka.stream.scaladsl.Sink -import akka.stream.scaladsl.Source -import akka.util.ccompat._ + import io.aeron.Aeron import io.aeron.AvailableImageHandler import io.aeron.CncFileDescriptor @@ -47,6 +34,21 @@ import org.agrona.IoUtil import org.agrona.concurrent.BackoffIdleStrategy import org.agrona.concurrent.status.CountersReader.MetaData +import akka.Done +import akka.actor.Address +import akka.actor.Cancellable +import akka.actor.ExtendedActorSystem +import akka.event.Logging +import akka.remote.RemoteActorRefProvider +import akka.remote.RemoteTransportException +import akka.remote.artery.compress._ +import akka.stream.KillSwitches +import akka.stream.scaladsl.Flow +import akka.stream.scaladsl.Keep +import akka.stream.scaladsl.Sink +import akka.stream.scaladsl.Source +import akka.util.ccompat._ + /** * INTERNAL API */ @@ -464,8 +466,8 @@ private[remote] class ArteryAeronUdpTransport(_system: ExtendedActorSystem, _pro } def autoSelectPort(hostname: String): Int = { - import java.nio.channels.DatagramChannel import java.net.InetSocketAddress + import java.nio.channels.DatagramChannel val socket = DatagramChannel.open().socket() socket.bind(new InetSocketAddress(hostname, 0)) diff --git a/akka-remote/src/main/scala/akka/remote/artery/aeron/TaskRunner.scala b/akka-remote/src/main/scala/akka/remote/artery/aeron/TaskRunner.scala index 99ec887347..475e0ce343 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/aeron/TaskRunner.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/aeron/TaskRunner.scala @@ -7,17 +7,18 @@ package aeron import java.util.concurrent.TimeUnit.{ MICROSECONDS, MILLISECONDS } -import akka.Done -import akka.actor.ExtendedActorSystem -import akka.dispatch.{ AbstractNodeQueue, MonitorableThreadFactory } -import akka.event.Logging -import org.agrona.concurrent.{ BackoffIdleStrategy, BusySpinIdleStrategy, IdleStrategy, SleepingIdleStrategy } - import scala.annotation.tailrec import scala.concurrent.{ Future, Promise } import scala.reflect.ClassTag import scala.util.control.NonFatal +import org.agrona.concurrent.{ BackoffIdleStrategy, BusySpinIdleStrategy, IdleStrategy, SleepingIdleStrategy } + +import akka.Done +import akka.actor.ExtendedActorSystem +import akka.dispatch.{ AbstractNodeQueue, MonitorableThreadFactory } +import akka.event.Logging + /** * INTERNAL API */ diff --git a/akka-remote/src/main/scala/akka/remote/artery/compress/CompressionTable.scala b/akka-remote/src/main/scala/akka/remote/artery/compress/CompressionTable.scala index 7f5695b77b..2908f5e719 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/compress/CompressionTable.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/compress/CompressionTable.scala @@ -7,10 +7,11 @@ package akka.remote.artery.compress import java.util import java.util.Comparator -import akka.util.HashCode import org.agrona.collections.Hashing import org.agrona.collections.Object2IntHashMap +import akka.util.HashCode + /** * INTERNAL API: Versioned compression table to be advertised between systems * diff --git a/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala b/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala index 73d5a4d3d6..7a57c9c3ac 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/compress/InboundCompressions.scala @@ -7,13 +7,15 @@ package akka.remote.artery.compress import java.util.function.LongFunction import scala.annotation.tailrec + +import org.agrona.collections.Long2ObjectHashMap + import akka.actor.{ ActorRef, ActorSystem, Address, InternalActorRef } import akka.event.Logging import akka.event.LoggingAdapter import akka.pattern.PromiseActorRef import akka.remote.artery._ import akka.util.{ unused, OptionVal } -import org.agrona.collections.Long2ObjectHashMap /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala index 487c262da3..4397b88458 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/tcp/ArteryTcpTransport.scala @@ -72,8 +72,8 @@ private[remote] class ArteryTcpTransport( _provider: RemoteActorRefProvider, tlsEnabled: Boolean) extends ArteryTransport(_system, _provider) { - import ArteryTransport._ import ArteryTcpTransport._ + import ArteryTransport._ override type LifeCycle = NotUsed diff --git a/akka-remote/src/main/scala/akka/remote/artery/tcp/SSLEngineProvider.scala b/akka-remote/src/main/scala/akka/remote/artery/tcp/SSLEngineProvider.scala index aa73eaba09..509e382117 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/tcp/SSLEngineProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/tcp/SSLEngineProvider.scala @@ -15,6 +15,15 @@ import java.security.SecureRandom import scala.util.Try +import com.typesafe.config.Config +import javax.net.ssl.KeyManager +import javax.net.ssl.KeyManagerFactory +import javax.net.ssl.SSLContext +import javax.net.ssl.SSLEngine +import javax.net.ssl.SSLSession +import javax.net.ssl.TrustManager +import javax.net.ssl.TrustManagerFactory + import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem import akka.actor.setup.Setup @@ -25,14 +34,6 @@ import akka.event.MarkerLoggingAdapter import akka.japi.Util.immutableSeq import akka.stream.TLSRole import akka.util.ccompat._ -import com.typesafe.config.Config -import javax.net.ssl.KeyManager -import javax.net.ssl.KeyManagerFactory -import javax.net.ssl.SSLContext -import javax.net.ssl.SSLEngine -import javax.net.ssl.SSLSession -import javax.net.ssl.TrustManager -import javax.net.ssl.TrustManagerFactory @ccompatUsedUntil213 trait SSLEngineProvider { diff --git a/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala b/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala index 1879a7a906..c7937878c3 100644 --- a/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala +++ b/akka-remote/src/main/scala/akka/remote/routing/RemoteRouterConfig.scala @@ -6,6 +6,9 @@ package akka.remote.routing import java.util.concurrent.atomic.AtomicInteger +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.ActorCell import akka.actor.ActorContext import akka.actor.ActorSystem @@ -22,8 +25,6 @@ import akka.routing.Routee import akka.routing.Router import akka.routing.RouterActor import akka.routing.RouterConfig -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory /** * [[akka.routing.RouterConfig]] implementation for remote deployment on defined diff --git a/akka-remote/src/main/scala/akka/remote/serialization/ArteryMessageSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/ArteryMessageSerializer.scala index 2560d0eaa1..f035f08272 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/ArteryMessageSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/ArteryMessageSerializer.scala @@ -8,12 +8,12 @@ import java.io.NotSerializableException import akka.actor.{ ActorRef, Address, ExtendedActorSystem } import akka.protobufv3.internal.MessageLite -import akka.remote.RemoteWatcher.ArteryHeartbeatRsp -import akka.remote.artery.OutboundHandshake.{ HandshakeReq, HandshakeRsp } -import akka.remote.artery.compress.CompressionProtocol._ -import akka.remote.artery.compress.{ CompressionProtocol, CompressionTable } -import akka.remote.artery.{ ActorSystemTerminating, ActorSystemTerminatingAck, Quarantined, SystemMessageDelivery } import akka.remote._ +import akka.remote.RemoteWatcher.ArteryHeartbeatRsp +import akka.remote.artery.{ ActorSystemTerminating, ActorSystemTerminatingAck, Quarantined, SystemMessageDelivery } +import akka.remote.artery.OutboundHandshake.{ HandshakeReq, HandshakeRsp } +import akka.remote.artery.compress.{ CompressionProtocol, CompressionTable } +import akka.remote.artery.compress.CompressionProtocol._ import akka.serialization.{ BaseSerializer, Serialization, SerializationExtension, SerializerWithStringManifest } /** INTERNAL API */ diff --git a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala index af1f682de0..0f393f796f 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala @@ -5,18 +5,18 @@ package akka.remote.serialization import scala.collection.immutable +import scala.reflect.ClassTag + +import com.typesafe.config.{ Config, ConfigFactory } +import util.{ Failure, Success } -import akka.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest } -import akka.protobufv3.internal.ByteString import akka.actor.{ Deploy, ExtendedActorSystem, NoScopeGiven, Props, Scope } +import akka.protobufv3.internal.ByteString import akka.remote.DaemonMsgCreate import akka.remote.WireFormats.{ DaemonMsgCreateData, DeployData, PropsData } import akka.routing.{ NoRouter, RouterConfig } -import com.typesafe.config.{ Config, ConfigFactory } +import akka.serialization.{ BaseSerializer, SerializationExtension, SerializerWithStringManifest } import akka.util.ccompat._ - -import scala.reflect.ClassTag -import util.{ Failure, Success } import akka.util.ccompat.JavaConverters._ /** @@ -29,9 +29,9 @@ import akka.util.ccompat.JavaConverters._ */ @ccompatUsedUntil213 private[akka] final class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) extends BaseSerializer { - import ProtobufSerializer.serializeActorRef - import ProtobufSerializer.deserializeActorRef import Deploy.NoDispatcherGiven + import ProtobufSerializer.deserializeActorRef + import ProtobufSerializer.serializeActorRef private lazy val serialization = SerializationExtension(system) diff --git a/akka-remote/src/main/scala/akka/remote/serialization/MessageContainerSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/MessageContainerSerializer.scala index f71279d2a1..7f0f7a1e8d 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/MessageContainerSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/MessageContainerSerializer.scala @@ -5,13 +5,14 @@ package akka.remote.serialization import scala.collection.immutable -import akka.protobufv3.internal.ByteString + import akka.actor.ActorSelectionMessage import akka.actor.ExtendedActorSystem import akka.actor.SelectChildName import akka.actor.SelectChildPattern import akka.actor.SelectParent import akka.actor.SelectionPathElement +import akka.protobufv3.internal.ByteString import akka.remote.ContainerFormats import akka.serialization.{ BaseSerializer, SerializationExtension, Serializers } import akka.util.ccompat._ diff --git a/akka-remote/src/main/scala/akka/remote/serialization/MiscMessageSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/MiscMessageSerializer.scala index 45458d2022..89ac982fd0 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/MiscMessageSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/MiscMessageSerializer.scala @@ -9,17 +9,19 @@ import java.nio.charset.StandardCharsets import java.util.Optional import java.util.concurrent.TimeUnit +import scala.concurrent.duration.{ FiniteDuration, TimeUnit } + +import com.typesafe.config.{ Config, ConfigFactory, ConfigRenderOptions } + import akka.{ Done, NotUsed } import akka.actor._ import akka.dispatch.Dispatchers +import akka.remote._ import akka.remote.WireFormats.AddressData import akka.remote.routing.RemoteRouterConfig -import akka.remote._ import akka.routing._ import akka.serialization.{ BaseSerializer, Serialization, SerializationExtension, SerializerWithStringManifest } -import com.typesafe.config.{ Config, ConfigFactory, ConfigRenderOptions } import akka.util.ccompat.JavaConverters._ -import scala.concurrent.duration.{ FiniteDuration, TimeUnit } class MiscMessageSerializer(val system: ExtendedActorSystem) extends SerializerWithStringManifest with BaseSerializer { diff --git a/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala b/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala index 6e8b5c1e95..1cfe7317ae 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/ProtobufSerializer.scala @@ -7,14 +7,14 @@ package akka.remote.serialization import java.lang.reflect.Method import java.util.concurrent.atomic.AtomicReference -import akka.actor.{ ActorRef, ExtendedActorSystem } -import akka.remote.WireFormats.ActorRefData -import akka.serialization.{ BaseSerializer, Serialization } import scala.annotation.tailrec import scala.util.control.NonFatal +import akka.actor.{ ActorRef, ExtendedActorSystem } import akka.event.LogMarker import akka.event.Logging +import akka.remote.WireFormats.ActorRefData +import akka.serialization.{ BaseSerializer, Serialization } import akka.serialization.SerializationExtension object ProtobufSerializer { diff --git a/akka-remote/src/main/scala/akka/remote/serialization/WrappedPayloadSupport.scala b/akka-remote/src/main/scala/akka/remote/serialization/WrappedPayloadSupport.scala index 5da837c9c6..d8f4135951 100644 --- a/akka-remote/src/main/scala/akka/remote/serialization/WrappedPayloadSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/serialization/WrappedPayloadSupport.scala @@ -6,9 +6,9 @@ package akka.remote.serialization import akka.actor.ExtendedActorSystem import akka.event.Logging +import akka.protobufv3.internal.ByteString import akka.remote.ContainerFormats import akka.serialization.{ SerializationExtension, Serializers } -import akka.protobufv3.internal.ByteString import akka.serialization.DisabledJavaSerializer /** diff --git a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala index 0e84dc03b7..6136b6dabc 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/AbstractTransportAdapter.scala @@ -4,18 +4,19 @@ package akka.remote.transport -import akka.actor._ -import akka.pattern.{ ask, gracefulStop, pipe } -import akka.remote.Remoting.RegisterTransportActor -import akka.remote.transport.Transport._ -import akka.remote.RARP -import akka.util.Timeout import scala.collection.immutable -import scala.concurrent.duration._ import scala.concurrent.{ ExecutionContext, Future, Promise } -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.remote.transport.AssociationHandle.DisassociateInfo +import scala.concurrent.duration._ + +import akka.actor._ import akka.actor.DeadLetterSuppression +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.pattern.{ ask, gracefulStop, pipe } +import akka.remote.RARP +import akka.remote.Remoting.RegisterTransportActor +import akka.remote.transport.AssociationHandle.DisassociateInfo +import akka.remote.transport.Transport._ +import akka.util.Timeout @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") trait TransportAdapterProvider { diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala index 269b4108e1..7afdb41b6a 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaPduCodec.scala @@ -4,15 +4,16 @@ package akka.remote.transport +import com.github.ghik.silencer.silent + import akka.AkkaException import akka.actor.{ ActorRef, Address, AddressFromURIString, InternalActorRef } -import akka.remote.WireFormats._ -import akka.remote._ -import akka.util.ByteString -import akka.protobufv3.internal.InvalidProtocolBufferException import akka.protobufv3.internal.{ ByteString => PByteString } +import akka.protobufv3.internal.InvalidProtocolBufferException +import akka.remote._ +import akka.remote.WireFormats._ +import akka.util.ByteString import akka.util.OptionVal -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala index a7ff6b7fa4..1f8cdedce7 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/AkkaProtocolTransport.scala @@ -6,8 +6,18 @@ package akka.remote.transport import java.util.concurrent.TimeoutException -import akka.actor.SupervisorStrategy.Stop +import scala.collection.immutable +import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration._ +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config + +import akka.{ AkkaException, OnlyCauseStackTrace } import akka.actor._ +import akka.actor.SupervisorStrategy.Stop +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } import akka.pattern.pipe import akka.remote._ import akka.remote.transport.ActorTransportAdapter._ @@ -18,15 +28,6 @@ import akka.remote.transport.ProtocolStateActor._ import akka.remote.transport.Transport._ import akka.util.ByteString import akka.util.Helpers.Requiring -import akka.{ AkkaException, OnlyCauseStackTrace } -import com.typesafe.config.Config - -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.concurrent.{ Future, Promise } -import scala.util.control.NonFatal -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import com.github.ghik.silencer.silent @SerialVersionUID(1L) class AkkaProtocolException(msg: String, cause: Throwable) extends AkkaException(msg, cause) with OnlyCauseStackTrace { @@ -35,9 +36,10 @@ class AkkaProtocolException(msg: String, cause: Throwable) extends AkkaException private[remote] class AkkaProtocolSettings(config: Config) { - import akka.util.Helpers.ConfigOps import config._ + import akka.util.Helpers.ConfigOps + val TransportFailureDetectorConfig: Config = getConfig("akka.remote.classic.transport-failure-detector") val TransportFailureDetectorImplementationClass: String = TransportFailureDetectorConfig.getString("implementation-class") diff --git a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala index c6f23bb504..af414ac25d 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/FailureInjectorTransportAdapter.scala @@ -4,20 +4,21 @@ package akka.remote.transport +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.ThreadLocalRandom + +import scala.concurrent.{ Future, Promise } +import scala.util.control.NoStackTrace + import FailureInjectorTransportAdapter._ +import com.github.ghik.silencer.silent + import akka.AkkaException import akka.actor.{ Address, ExtendedActorSystem } import akka.event.{ Logging, LoggingAdapter } import akka.remote.transport.AssociationHandle.{ HandleEvent, HandleEventListener } import akka.remote.transport.Transport._ import akka.util.ByteString -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.ThreadLocalRandom - -import com.github.ghik.silencer.silent - -import scala.concurrent.{ Future, Promise } -import scala.util.control.NoStackTrace @SerialVersionUID(1L) @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") diff --git a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala index 7c170e5138..3b3f8eb9e2 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/TestTransport.scala @@ -6,16 +6,17 @@ package akka.remote.transport import java.util.concurrent.{ ConcurrentHashMap, CopyOnWriteArrayList } +import scala.concurrent.{ Await, Future, Promise } +import scala.concurrent.ExecutionContext.Implicits.global +import scala.concurrent.duration._ + +import TestTransport._ +import com.typesafe.config.Config + import akka.actor._ import akka.remote.transport.AssociationHandle._ import akka.remote.transport.Transport._ import akka.util.ByteString -import com.typesafe.config.Config -import TestTransport._ - -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future, Promise } -import scala.concurrent.ExecutionContext.Implicits.global /** * Transport implementation to be used for testing. diff --git a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala index 05cdeb879a..8a41d7f264 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/ThrottlerTransportAdapter.scala @@ -4,8 +4,25 @@ package akka.remote.transport +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicReference + +import scala.annotation.tailrec +import scala.collection.immutable.Queue +import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration._ +import scala.math.min +import scala.util.{ Failure, Success } +import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + import akka.actor._ +import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } +import akka.dispatch.ExecutionContexts +import akka.dispatch.sysmsg.{ Unwatch, Watch } import akka.pattern.{ ask, pipe, PromiseActorRef } +import akka.remote.RARP import akka.remote.transport.ActorTransportAdapter.AssociateUnderlying import akka.remote.transport.AkkaPduCodec.Associate import akka.remote.transport.AssociationHandle.{ @@ -19,22 +36,6 @@ import akka.remote.transport.ThrottlerManager.{ Checkin, Handle, Listener, Liste import akka.remote.transport.ThrottlerTransportAdapter._ import akka.remote.transport.Transport._ import akka.util.{ ByteString, Timeout } -import java.util.concurrent.TimeUnit -import java.util.concurrent.atomic.AtomicReference - -import akka.dispatch.ExecutionContexts - -import scala.annotation.tailrec -import scala.collection.immutable.Queue -import scala.concurrent.{ Future, Promise } -import scala.concurrent.duration._ -import scala.math.min -import scala.util.{ Failure, Success } -import scala.util.control.NonFatal -import akka.dispatch.sysmsg.{ Unwatch, Watch } -import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics } -import akka.remote.RARP -import com.github.ghik.silencer.silent @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") class ThrottlerProvider extends TransportAdapterProvider { diff --git a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala index 13c48dcdbd..c1eb228f42 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/Transport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/Transport.scala @@ -6,13 +6,15 @@ package akka.remote.transport import scala.concurrent.{ Future, Promise } import scala.util.control.NoStackTrace -import akka.actor.{ ActorRef, Address, NoSerializationVerificationNeeded } -import akka.util.{ unused, ByteString } -import akka.remote.transport.AssociationHandle.HandleEventListener + +import com.github.ghik.silencer.silent + import akka.AkkaException +import akka.actor.{ ActorRef, Address, NoSerializationVerificationNeeded } import akka.actor.DeadLetterSuppression import akka.event.LoggingAdapter -import com.github.ghik.silencer.silent +import akka.remote.transport.AssociationHandle.HandleEventListener +import akka.util.{ unused, ByteString } @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") object Transport { diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala index 5a8d20967d..7b4a4d79c4 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyHelpers.scala @@ -4,13 +4,14 @@ package akka.remote.transport.netty -import akka.AkkaException import java.nio.channels.ClosedChannelException -import akka.util.unused +import scala.util.control.NonFatal + import org.jboss.netty.channel._ -import scala.util.control.NonFatal +import akka.AkkaException +import akka.util.unused /** * INTERNAL API 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 e3552016ee..cdffb91022 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,11 +4,12 @@ package akka.remote.transport.netty -import akka.japi.Util._ +import com.github.ghik.silencer.silent import com.typesafe.config.Config import org.jboss.netty.handler.ssl.SslHandler + +import akka.japi.Util._ import akka.util.ccompat._ -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala index 95fc7ceb12..90f2f918a3 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/NettyTransport.scala @@ -7,34 +7,20 @@ package akka.remote.transport.netty import java.net.InetAddress import java.net.InetSocketAddress import java.net.SocketAddress -import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.CancellationException import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicInteger -import scala.concurrent.duration.FiniteDuration import scala.concurrent.ExecutionContext import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.blocking +import scala.concurrent.duration.FiniteDuration import scala.util.Try import scala.util.control.NoStackTrace import scala.util.control.NonFatal -import akka.actor.ActorSystem -import akka.actor.Address -import akka.actor.ExtendedActorSystem -import akka.dispatch.ThreadPoolConfig -import akka.event.Logging -import akka.remote.RARP -import akka.remote.transport.AssociationHandle.HandleEventListener -import akka.remote.transport.Transport._ -import akka.remote.transport.AssociationHandle -import akka.remote.transport.Transport -import akka.util.Helpers -import akka.util.Helpers.Requiring -import akka.util.OptionVal -import akka.ConfigurationException -import akka.OnlyCauseStackTrace + import com.github.ghik.silencer.silent import com.typesafe.config.Config import org.jboss.netty.bootstrap.Bootstrap @@ -56,6 +42,22 @@ import org.jboss.netty.handler.codec.frame.LengthFieldPrepender import org.jboss.netty.handler.ssl.SslHandler import org.jboss.netty.util.HashedWheelTimer +import akka.ConfigurationException +import akka.OnlyCauseStackTrace +import akka.actor.ActorSystem +import akka.actor.Address +import akka.actor.ExtendedActorSystem +import akka.dispatch.ThreadPoolConfig +import akka.event.Logging +import akka.remote.RARP +import akka.remote.transport.AssociationHandle +import akka.remote.transport.AssociationHandle.HandleEventListener +import akka.remote.transport.Transport +import akka.remote.transport.Transport._ +import akka.util.Helpers +import akka.util.Helpers.Requiring +import akka.util.OptionVal + @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") object NettyFutureBridge { def apply(nettyFuture: ChannelFuture): Future[Channel] = { @@ -111,9 +113,10 @@ class NettyTransportExceptionNoStack(msg: String, cause: Throwable) @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") class NettyTransportSettings(config: Config) { - import akka.util.Helpers.ConfigOps import config._ + import akka.util.Helpers.ConfigOps + val EnableSsl: Boolean = getBoolean("enable-ssl") val SSLEngineProviderClassName: String = if (EnableSsl) getString("ssl-engine-provider") else "" diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/SSLEngineProvider.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/SSLEngineProvider.scala index 5a3af16a53..76fece3658 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/SSLEngineProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/SSLEngineProvider.scala @@ -14,12 +14,6 @@ import java.security.SecureRandom import scala.util.Try -import akka.actor.ActorSystem -import akka.event.Logging -import akka.event.MarkerLoggingAdapter -import akka.remote.RemoteTransportException -import akka.remote.artery.tcp.SecureRandomFactory -import akka.stream.TLSRole import javax.net.ssl.KeyManager import javax.net.ssl.KeyManagerFactory import javax.net.ssl.SSLContext @@ -27,6 +21,13 @@ import javax.net.ssl.SSLEngine import javax.net.ssl.TrustManager import javax.net.ssl.TrustManagerFactory +import akka.actor.ActorSystem +import akka.event.Logging +import akka.event.MarkerLoggingAdapter +import akka.remote.RemoteTransportException +import akka.remote.artery.tcp.SecureRandomFactory +import akka.stream.TLSRole + @deprecated("Classic remoting is deprecated, use Artery", "2.6.0") trait SSLEngineProvider { diff --git a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala index 87be2b21e9..a51fa80f24 100644 --- a/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/transport/netty/TcpSupport.scala @@ -4,19 +4,20 @@ package akka.remote.transport.netty +import java.net.InetSocketAddress + +import scala.concurrent.{ Future, Promise } + +import com.github.ghik.silencer.silent +import org.jboss.netty.buffer.{ ChannelBuffer, ChannelBuffers } +import org.jboss.netty.channel._ + import akka.actor.Address +import akka.event.LoggingAdapter import akka.remote.transport.AssociationHandle import akka.remote.transport.AssociationHandle.{ Disassociated, HandleEvent, HandleEventListener, InboundPayload } import akka.remote.transport.Transport.AssociationEventListener import akka.util.ByteString -import java.net.InetSocketAddress - -import akka.event.LoggingAdapter -import org.jboss.netty.buffer.{ ChannelBuffer, ChannelBuffers } -import org.jboss.netty.channel._ -import scala.concurrent.{ Future, Promise } - -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-remote/src/test/scala-jdk9-only/akka/remote/artery/jfr/JFRRemotingFlightRecorderSpec.scala b/akka-remote/src/test/scala-jdk9-only/akka/remote/artery/jfr/JFRRemotingFlightRecorderSpec.scala index 3ec93ee2c3..7cbb45a29f 100644 --- a/akka-remote/src/test/scala-jdk9-only/akka/remote/artery/jfr/JFRRemotingFlightRecorderSpec.scala +++ b/akka-remote/src/test/scala-jdk9-only/akka/remote/artery/jfr/JFRRemotingFlightRecorderSpec.scala @@ -4,12 +4,13 @@ package akka.remote.artery.jfr +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSystem import akka.remote.artery.NoOpRemotingFlightRecorder import akka.remote.artery.RemotingFlightRecorder import akka.testkit.AkkaSpec import akka.testkit.TestKit -import com.typesafe.config.ConfigFactory class JFRRemotingFlightRecorderSpec extends AkkaSpec { diff --git a/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala b/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala index 417ddb6740..cef462e3d6 100644 --- a/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/AccrualFailureDetectorSpec.scala @@ -4,13 +4,14 @@ package akka.remote -import akka.testkit.AkkaSpec - import scala.collection.immutable.TreeMap import scala.concurrent.duration._ -import akka.remote.FailureDetector.Clock + import com.github.ghik.silencer.silent +import akka.remote.FailureDetector.Clock +import akka.testkit.AkkaSpec + @silent class AccrualFailureDetectorSpec extends AkkaSpec("akka.loglevel = INFO") { diff --git a/akka-remote/src/test/scala/akka/remote/AckedDeliverySpec.scala b/akka-remote/src/test/scala/akka/remote/AckedDeliverySpec.scala index c972aa0760..bbe4b90531 100644 --- a/akka-remote/src/test/scala/akka/remote/AckedDeliverySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/AckedDeliverySpec.scala @@ -4,12 +4,14 @@ package akka.remote -import akka.testkit.AkkaSpec -import scala.annotation.tailrec import java.util.concurrent.ThreadLocalRandom +import scala.annotation.tailrec + import com.github.ghik.silencer.silent +import akka.testkit.AkkaSpec + @silent("deprecated") object AckedDeliverySpec { diff --git a/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala b/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala index 25df7f236b..fa5eb16679 100644 --- a/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/DaemonicSpec.scala @@ -4,13 +4,13 @@ package akka.remote -import akka.testkit._ - import scala.concurrent.duration._ -import akka.actor.{ ActorSystem, Address } -import akka.util.ccompat._ + import com.typesafe.config.ConfigFactory +import akka.actor.{ ActorSystem, Address } +import akka.testkit._ +import akka.util.ccompat._ import akka.util.ccompat.JavaConverters._ @ccompatUsedUntil213 diff --git a/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala b/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala index 4d3bedc6cc..f749c2f33c 100644 --- a/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/DeadlineFailureDetectorSpec.scala @@ -4,9 +4,10 @@ package akka.remote -import akka.testkit.AkkaSpec import scala.concurrent.duration._ + import akka.remote.FailureDetector.Clock +import akka.testkit.AkkaSpec class DeadlineFailureDetectorSpec extends AkkaSpec { diff --git a/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala b/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala index 48624b9049..3da7ac0345 100644 --- a/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/EndpointRegistrySpec.scala @@ -4,10 +4,11 @@ package akka.remote -import akka.testkit.AkkaSpec +import scala.concurrent.duration._ + import akka.actor.{ Address, Props } import akka.remote.EndpointManager._ -import scala.concurrent.duration._ +import akka.testkit.AkkaSpec class EndpointRegistrySpec extends AkkaSpec { diff --git a/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala b/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala index 0d3955edcb..4670637694 100644 --- a/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/FailureDetectorRegistrySpec.scala @@ -4,8 +4,9 @@ package akka.remote -import akka.remote.FailureDetector.Clock import scala.concurrent.duration._ + +import akka.remote.FailureDetector.Clock import akka.testkit.AkkaSpec class FailureDetectorRegistrySpec extends AkkaSpec("akka.loglevel = INFO") { diff --git a/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala b/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala index 889ebfd500..becd0bfabc 100644 --- a/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/LogSourceSpec.scala @@ -4,15 +4,15 @@ package akka.remote -import akka.testkit.AkkaSpec import akka.actor.Actor import akka.actor.ActorLogging +import akka.actor.Deploy +import akka.actor.ExtendedActorSystem import akka.actor.Props import akka.event.Logging -import akka.testkit.TestProbe -import akka.actor.Deploy import akka.event.Logging.Info -import akka.actor.ExtendedActorSystem +import akka.testkit.AkkaSpec +import akka.testkit.TestProbe object LogSourceSpec { class Reporter extends Actor with ActorLogging { diff --git a/akka-remote/src/test/scala/akka/remote/MessageLoggingSpec.scala b/akka-remote/src/test/scala/akka/remote/MessageLoggingSpec.scala index facb42b488..5b93726c89 100644 --- a/akka-remote/src/test/scala/akka/remote/MessageLoggingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/MessageLoggingSpec.scala @@ -4,11 +4,12 @@ package akka.remote -import akka.actor.{ Actor, ActorIdentity, ActorSystem, ExtendedActorSystem, Identify, Props, RootActorPath } -import akka.testkit.{ AkkaSpec, ImplicitSender, TestKit } -import com.typesafe.config.{ Config, ConfigFactory } import MessageLoggingSpec._ +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor.{ Actor, ActorIdentity, ActorSystem, ExtendedActorSystem, Identify, Props, RootActorPath } import akka.serialization.jackson.CborSerializable +import akka.testkit.{ AkkaSpec, ImplicitSender, TestKit } object MessageLoggingSpec { def config(artery: Boolean) = ConfigFactory.parseString(s""" diff --git a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala index ccf6913fa0..e3dce33b50 100644 --- a/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/NetworkFailureSpec.scala @@ -4,12 +4,13 @@ package akka.remote +import java.util.concurrent.atomic.AtomicBoolean + +import scala.concurrent.Future + import akka.testkit.AkkaSpec import akka.testkit.DefaultTimeout -import java.util.concurrent.atomic.AtomicBoolean -import scala.concurrent.{ Future } - trait NetworkFailureSpec extends DefaultTimeout { self: AkkaSpec => import scala.concurrent.duration.Duration diff --git a/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala index d006628b08..9efb03d389 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteActorMailboxSpec.scala @@ -4,9 +4,10 @@ package akka.remote -import akka.actor.ActorMailboxSpec import com.typesafe.config.ConfigFactory +import akka.actor.ActorMailboxSpec + class RemoteActorMailboxSpec extends ActorMailboxSpec( ConfigFactory.parseString("""akka.actor.provider = remote""").withFallback(ActorMailboxSpec.mailboxConf)) {} diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala index 6a87a4bb21..65fe6e2f23 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala @@ -4,16 +4,16 @@ package akka.remote -import language.postfixOps - -import akka.testkit.AkkaSpec import scala.concurrent.duration._ +import com.github.ghik.silencer.silent +import language.postfixOps + import akka.remote.transport.AkkaProtocolSettings +import akka.remote.transport.netty.{ NettyTransportSettings, SSLSettings } +import akka.testkit.AkkaSpec import akka.util.Helpers import akka.util.Helpers.ConfigOps -import akka.remote.transport.netty.{ NettyTransportSettings, SSLSettings } -import com.github.ghik.silencer.silent @silent // classic deprecated class RemoteConfigSpec extends AkkaSpec(""" diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala index 5731d5a833..fb44ce02db 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConsistentHashingRouterSpec.scala @@ -4,11 +4,11 @@ package akka.remote -import akka.testkit.AkkaSpec import akka.actor.Address import akka.routing.ActorSelectionRoutee -import akka.routing.ConsistentRoutee import akka.routing.ConsistentHash +import akka.routing.ConsistentRoutee +import akka.testkit.AkkaSpec class RemoteConsistentHashingRouterSpec extends AkkaSpec(""" diff --git a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala index 0beb52ec95..4bb46458a9 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteDeployerSpec.scala @@ -4,11 +4,12 @@ package akka.remote -import akka.testkit._ +import com.typesafe.config._ + +import akka.ConfigurationException import akka.actor._ import akka.routing._ -import com.typesafe.config._ -import akka.ConfigurationException +import akka.testkit._ object RemoteDeployerSpec { val deployerConf = ConfigFactory.parseString( diff --git a/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala index b9a21af23f..93e65370d5 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala @@ -6,6 +6,10 @@ package akka.remote import scala.concurrent.duration._ +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.AddressFromURIString @@ -22,9 +26,6 @@ import akka.remote.artery.RemoteDeploymentSpec import akka.testkit.EventFilter import akka.testkit.ImplicitSender import akka.testkit.TestProbe -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory object RemoteFeaturesSpec { diff --git a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala index ce2b39e1ad..830a58bbbc 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteRouterSpec.scala @@ -5,11 +5,13 @@ package akka.remote import scala.collection.immutable -import akka.testkit._ -import akka.routing._ + +import com.typesafe.config._ + import akka.actor._ import akka.remote.routing._ -import com.typesafe.config._ +import akka.routing._ +import akka.testkit._ import akka.testkit.TestActors.echoActorProps object RemoteRouterSpec { diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index b47020cd39..459be596ed 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -8,20 +8,21 @@ import java.io.ByteArrayOutputStream import java.security.NoSuchAlgorithmException import java.util.zip.GZIPOutputStream -import akka.actor._ -import akka.event.NoMarkerLogging -import akka.pattern.ask -import akka.remote.Configuration.{ getCipherConfig, CipherConfig } -import akka.remote.transport.netty.SSLSettings -import akka.testkit._ -import akka.util.Timeout -import com.typesafe.config._ import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ import scala.reflect.classTag -import akka.remote.transport.netty.ConfigSSLEngineProvider import com.github.ghik.silencer.silent +import com.typesafe.config._ + +import akka.actor._ +import akka.event.NoMarkerLogging +import akka.pattern.ask +import akka.remote.Configuration.{ getCipherConfig, CipherConfig } +import akka.remote.transport.netty.ConfigSSLEngineProvider +import akka.remote.transport.netty.SSLSettings +import akka.testkit._ +import akka.util.Timeout @silent("deprecated") object Configuration { diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala index c51fde105d..b9c3dde0f2 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978ConfigSpec.scala @@ -4,8 +4,8 @@ package akka.remote -import akka.testkit._ import akka.remote.transport.netty.SSLSettings +import akka.testkit._ class Ticket1978ConfigSpec extends AkkaSpec(""" akka.remote.classic.netty.ssl.security { diff --git a/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala index 825a3619fd..6d0c316cff 100644 --- a/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/TransientSerializationErrorSpec.scala @@ -6,11 +6,12 @@ package akka.remote import java.io.NotSerializableException +import com.typesafe.config.{ Config, ConfigFactory } + import akka.actor.{ ActorSystem, ExtendedActorSystem, RootActorPath } import akka.serialization.SerializerWithStringManifest import akka.testkit.{ AkkaSpec, TestActors, TestKit } import akka.util.unused -import com.typesafe.config.{ Config, ConfigFactory } object TransientSerializationErrorSpec { object ManifestNotSerializable diff --git a/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala b/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala index 707ea59d0f..5b1e806d83 100644 --- a/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/TypedActorRemoteDeploySpec.scala @@ -7,12 +7,12 @@ package akka.remote import scala.concurrent.{ Await, Future } import scala.concurrent.duration._ +import TypedActorRemoteDeploySpec._ +import com.github.ghik.silencer.silent +import com.typesafe.config._ + import akka.actor.{ ActorSystem, Deploy, TypedActor, TypedProps } import akka.testkit.AkkaSpec -import TypedActorRemoteDeploySpec._ - -import com.typesafe.config._ -import com.github.ghik.silencer.silent object TypedActorRemoteDeploySpec { val conf = ConfigFactory.parseString(""" diff --git a/akka-remote/src/test/scala/akka/remote/artery/ArteryMultiNodeSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/ArteryMultiNodeSpec.scala index c340579464..188f947599 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/ArteryMultiNodeSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/ArteryMultiNodeSpec.scala @@ -4,13 +4,14 @@ package akka.remote.artery -import akka.actor.setup.ActorSystemSetup -import akka.actor.{ ActorSystem, Address, BootstrapSetup, RootActorPath } -import akka.remote.RARP -import akka.testkit.{ AkkaSpec, SocketUtil } import com.typesafe.config.{ Config, ConfigFactory } import org.scalatest.{ Outcome, Pending } +import akka.actor.{ ActorSystem, Address, BootstrapSetup, RootActorPath } +import akka.actor.setup.ActorSystemSetup +import akka.remote.RARP +import akka.testkit.{ AkkaSpec, SocketUtil } + /** * Base class for remoting tests what needs to test interaction between a "local" actor system * which is always created (the usual AkkaSpec system), and multiple additional actor systems over artery diff --git a/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala index 3caadb05bf..4976d031a4 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/BindCanonicalAddressSpec.scala @@ -4,18 +4,19 @@ package akka.remote.artery -import com.typesafe.config.ConfigFactory -import akka.actor.{ ActorSystem, Address } -import akka.remote.classic.transport.netty.NettyTransportSpec._ +import java.net.InetAddress import scala.concurrent.Await - import scala.concurrent.duration.Duration -import akka.testkit.SocketUtil -import java.net.InetAddress + +import com.typesafe.config.ConfigFactory import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.{ ActorSystem, Address } +import akka.remote.classic.transport.netty.NettyTransportSpec._ +import akka.testkit.SocketUtil + trait BindCanonicalAddressBehaviors { this: AnyWordSpec with Matchers => def arteryConnectionTest(transport: String, isUDP: Boolean): Unit = { diff --git a/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala index 8b9cb59263..fd32ef4e51 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/FlushOnShutdownSpec.scala @@ -4,12 +4,12 @@ package akka.remote.artery -import akka.actor.{ Actor, ActorIdentity, Identify, Props } -import akka.testkit.TestProbe - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.actor.{ Actor, ActorIdentity, Identify, Props } +import akka.testkit.TestProbe + class FlushOnShutdownSpec extends ArteryMultiNodeSpec(ArterySpecSupport.defaultConfig) { val remoteSystem = newRemoteSystem() diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala index 9a9eb343ba..cc09045bb6 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala @@ -6,10 +6,11 @@ package akka.remote.artery import scala.concurrent.duration._ -import akka.actor.{ ActorIdentity, Identify } -import akka.testkit._ import com.typesafe.config.ConfigFactory + +import akka.actor.{ ActorIdentity, Identify } import akka.actor.RootActorPath +import akka.testkit._ object HandshakeDenySpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala index d4198b9df9..a64916833e 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala @@ -6,10 +6,11 @@ package akka.remote.artery import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.{ ActorIdentity, Identify } import akka.testkit.ImplicitSender import akka.testkit.TestActors -import com.typesafe.config.ConfigFactory import akka.testkit.TestProbe object HandshakeFailureSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala index 406effc5f0..585a450e1e 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala @@ -6,10 +6,11 @@ package akka.remote.artery import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.testkit.ImplicitSender import akka.testkit.TestActors -import com.typesafe.config.ConfigFactory object HandshakeRetrySpec { val commonConfig = ConfigFactory.parseString(s""" diff --git a/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala index 2bf65cffe2..33815a6d2f 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/ImmutableLongMapSpec.scala @@ -4,11 +4,13 @@ package akka.remote.artery -import akka.util.OptionVal import scala.util.Random + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.util.OptionVal + class ImmutableLongMapSpec extends AnyWordSpec with Matchers { "ImmutableLongMap" must { diff --git a/akka-remote/src/test/scala/akka/remote/artery/InboundControlJunctionSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/InboundControlJunctionSpec.scala index b0461c443f..794c2aea75 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/InboundControlJunctionSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/InboundControlJunctionSpec.scala @@ -4,6 +4,8 @@ package akka.remote.artery +import scala.util.Try + import akka.Done import akka.actor.Address import akka.remote.UniqueAddress @@ -16,8 +18,6 @@ import akka.testkit.ImplicitSender import akka.testkit.TestProbe import akka.util.OptionVal -import scala.util.Try - object InboundControlJunctionSpec { trait TestControlMessage extends ControlMessage diff --git a/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala index fb3009311f..81a7dbd4a2 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/LargeMessagesStreamSpec.scala @@ -4,14 +4,14 @@ package akka.remote.artery -import akka.actor.{ Actor, ActorRef, ActorSelection, Props, RootActorPath } -import akka.remote.{ RARP, RemoteActorRef } -import akka.testkit.TestProbe -import akka.util.ByteString - import scala.concurrent.Await import scala.concurrent.duration._ + +import akka.actor.{ Actor, ActorRef, ActorSelection, Props, RootActorPath } +import akka.remote.{ RARP, RemoteActorRef } import akka.testkit.JavaSerializable +import akka.testkit.TestProbe +import akka.util.ByteString object LargeMessagesStreamSpec { case class Ping(payload: ByteString = ByteString.empty) extends JavaSerializable diff --git a/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala index 694e21dc86..68f8b53c34 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala @@ -6,12 +6,13 @@ package akka.remote.artery import scala.concurrent.duration._ +import com.typesafe.config.ConfigFactory + import akka.actor.RootActorPath import akka.remote.RARP import akka.testkit.ImplicitSender import akka.testkit.TestActors import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory object LateConnectSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/LruBoundedCacheSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/LruBoundedCacheSpec.scala index b4b00be932..898dc1902d 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/LruBoundedCacheSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/LruBoundedCacheSpec.scala @@ -4,11 +4,12 @@ package akka.remote.artery -import akka.testkit.AkkaSpec -import akka.util.Unsafe +import scala.util.Random + import com.github.ghik.silencer.silent -import scala.util.Random +import akka.testkit.AkkaSpec +import akka.util.Unsafe @silent class LruBoundedCacheSpec extends AkkaSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/MetadataCarryingSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/MetadataCarryingSpec.scala index 0d5c1a09bc..6dd1617bf2 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/MetadataCarryingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/MetadataCarryingSpec.scala @@ -4,17 +4,16 @@ package akka.remote.artery +import java.nio.{ ByteBuffer, CharBuffer } +import java.nio.charset.Charset import java.util.concurrent.atomic.AtomicReference import akka.actor._ import akka.testkit.ImplicitSender +import akka.testkit.JavaSerializable import akka.testkit.TestActors import akka.testkit.TestProbe import akka.util.ByteString -import java.nio.{ ByteBuffer, CharBuffer } -import java.nio.charset.Charset - -import akka.testkit.JavaSerializable object MetadataCarryingSpy extends ExtensionId[MetadataCarryingSpy] with ExtensionIdProvider { override def get(system: ActorSystem): MetadataCarryingSpy = super.get(system) diff --git a/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala index cae9383e1b..9428523cf0 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/OutboundHandshakeSpec.scala @@ -4,6 +4,8 @@ package akka.remote.artery +import scala.concurrent.duration._ + import akka.actor.Address import akka.remote.UniqueAddress import akka.remote.artery.OutboundHandshake.HandshakeReq @@ -17,8 +19,6 @@ import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.util.OptionVal -import scala.concurrent.duration._ - class OutboundHandshakeSpec extends AkkaSpec(""" akka.stream.materializer.debug.fuzzing-mode = on """) with ImplicitSender { diff --git a/akka-remote/src/test/scala/akka/remote/artery/OutboundIdleShutdownSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/OutboundIdleShutdownSpec.scala index 44e4cec54c..31c3200ace 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/OutboundIdleShutdownSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/OutboundIdleShutdownSpec.scala @@ -8,6 +8,9 @@ import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ +import org.scalatest.concurrent.Eventually +import org.scalatest.time.Span + import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.Address @@ -17,8 +20,6 @@ import akka.remote.UniqueAddress import akka.testkit.ImplicitSender import akka.testkit.TestActors import akka.testkit.TestProbe -import org.scalatest.concurrent.Eventually -import org.scalatest.time.Span class OutboundIdleShutdownSpec extends ArteryMultiNodeSpec(s""" akka.loglevel=INFO diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala index 8f334850da..dd0cdbad46 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorRefProviderSpec.scala @@ -5,10 +5,10 @@ package akka.remote.artery import akka.actor.{ EmptyLocalActorRef, InternalActorRef } +import akka.actor.ActorRefScope +import akka.actor.ExtendedActorSystem import akka.remote.RemoteActorRef import akka.testkit.{ EventFilter, TestActors } -import akka.actor.ExtendedActorSystem -import akka.actor.ActorRefScope class RemoteActorRefProviderSpec extends ArteryMultiNodeSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala index fb78a17922..9a3a0e9c83 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteActorSelectionSpec.scala @@ -4,6 +4,8 @@ package akka.remote.artery +import scala.concurrent.duration._ + import akka.actor.{ Actor, ActorIdentity, @@ -17,8 +19,6 @@ import akka.actor.{ Terminated } import akka.testkit.{ ImplicitSender, TestActors } - -import scala.concurrent.duration._ import akka.testkit.JavaSerializable object RemoteActorSelectionSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala index b04aaedab0..9c21f9e580 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteConnectionSpec.scala @@ -4,11 +4,11 @@ package akka.remote.artery +import scala.concurrent.duration._ + import akka.actor.ActorSystem import akka.testkit.{ EventFilter, ImplicitSender, TestActors, TestEvent, TestProbe } -import scala.concurrent.duration._ - class RemoteConnectionSpec extends ArteryMultiNodeSpec("akka.remote.retry-gate-closed-for = 5s") with ImplicitSender { def muteSystem(system: ActorSystem): Unit = { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala index 2e3e517c29..7d552ddcbb 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeathWatchSpec.scala @@ -4,15 +4,16 @@ package akka.remote.artery -import akka.testkit._ -import akka.actor._ -import com.typesafe.config.ConfigFactory -import akka.actor.RootActorPath - import scala.concurrent.duration._ -import akka.testkit.SocketUtil -import akka.remote.RARP + import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.actor._ +import akka.actor.RootActorPath +import akka.remote.RARP +import akka.testkit._ +import akka.testkit.SocketUtil object RemoteDeathWatchSpec { val otherPort = ArteryMultiNodeSpec.freePort(ConfigFactory.load()) diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala index 095bc78c84..3013e8c7bd 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeployerSpec.scala @@ -4,12 +4,13 @@ package akka.remote.artery +import com.typesafe.config._ + import akka.ConfigurationException import akka.actor._ import akka.remote.RemoteScope import akka.routing._ import akka.testkit._ -import com.typesafe.config._ object RemoteDeployerSpec { val deployerConf = ConfigFactory.parseString(""" diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala index b238dfdfd7..f3734272ab 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteDeploymentSpec.scala @@ -4,10 +4,11 @@ package akka.remote.artery -import akka.testkit._ -import akka.actor._ import com.typesafe.config._ + +import akka.actor._ import akka.remote.RARP +import akka.testkit._ object RemoteDeploymentSpec { class Echo1 extends Actor { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteFailureSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteFailureSpec.scala index 7cf392bd27..3ae73bfd71 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteFailureSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteFailureSpec.scala @@ -4,11 +4,11 @@ package akka.remote.artery -import akka.remote.EndpointDisassociatedException -import akka.testkit.{ EventFilter, ImplicitSender, TestActors, TestEvent } import scala.concurrent.duration._ +import akka.remote.EndpointDisassociatedException import akka.serialization.jackson.CborSerializable +import akka.testkit.{ EventFilter, ImplicitSender, TestActors, TestEvent } import akka.testkit.DeadLettersFilter import akka.testkit.TestEvent.Mute diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala index 45e0178329..8be036db78 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSerializationSpec.scala @@ -4,16 +4,17 @@ package akka.remote.artery -import akka.actor.{ ActorRef, ActorSystem, ExtendedActorSystem, InternalActorRef } -import akka.event._ -import akka.testkit.TestEvent.Mute -import akka.testkit.{ AkkaSpec, EventFilter, TestProbe } -import akka.util.{ unused, OptionVal } import java.nio.{ ByteBuffer, CharBuffer } import java.nio.charset.Charset import scala.concurrent.duration._ +import akka.actor.{ ActorRef, ActorSystem, ExtendedActorSystem, InternalActorRef } +import akka.event._ +import akka.testkit.{ AkkaSpec, EventFilter, TestProbe } +import akka.testkit.TestEvent.Mute +import akka.util.{ unused, OptionVal } + class RemoteInstrumentsSerializationSpec extends AkkaSpec("akka.loglevel = DEBUG") { import RemoteInstrumentsSerializationSpec._ diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSpec.scala index f76145b9eb..3354608939 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteInstrumentsSpec.scala @@ -5,9 +5,9 @@ package akka.remote.artery import org.scalacheck.{ Arbitrary, Gen } -import org.scalatestplus.scalacheck.Checkers import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import org.scalatestplus.scalacheck.Checkers class RemoteInstrumentsSpec extends AnyWordSpec with Matchers with Checkers { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala index 610250b6ee..618ebcfe28 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteMessageSerializationSpec.scala @@ -7,13 +7,14 @@ package akka.remote.artery import java.io.NotSerializableException import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent + import akka.actor.{ Actor, ActorRef, PoisonPill, Props } import akka.remote.{ AssociationErrorEvent, DisassociatedEvent, OversizedPayloadException, RARP } import akka.testkit.{ EventFilter, ImplicitSender, TestActors } import akka.util.ByteString -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ object RemoteMessageSerializationSpec { class ProxyActor(val one: ActorRef, val another: ActorRef) extends Actor { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala index 1c89ffdcec..497051c6bb 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteRouterSpec.scala @@ -4,15 +4,16 @@ package akka.remote.artery -import akka.actor._ -import akka.remote.routing._ -import akka.remote.{ RARP, RemoteScope } -import akka.routing._ -import akka.testkit.TestActors.echoActorProps -import akka.testkit._ +import scala.collection.immutable + import com.typesafe.config._ -import scala.collection.immutable +import akka.actor._ +import akka.remote.{ RARP, RemoteScope } +import akka.remote.routing._ +import akka.routing._ +import akka.testkit._ +import akka.testkit.TestActors.echoActorProps object RemoteRouterSpec { class Parent extends Actor { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala index 93afbad1b5..350687af66 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteSendConsistencySpec.scala @@ -4,12 +4,13 @@ package akka.remote.artery -import akka.actor.{ Actor, ActorIdentity, ActorRef, Deploy, Identify, PoisonPill, Props, RootActorPath } -import akka.testkit.{ ImplicitSender, TestActors, TestProbe } +import scala.concurrent.duration._ + import com.typesafe.config.{ Config, ConfigFactory } -import scala.concurrent.duration._ +import akka.actor.{ Actor, ActorIdentity, ActorRef, Deploy, Identify, PoisonPill, Props, RootActorPath } import akka.actor.ActorSelection +import akka.testkit.{ ImplicitSender, TestActors, TestProbe } class ArteryUpdSendConsistencyWithOneLaneSpec extends AbstractRemoteSendConsistencySpec(ConfigFactory.parseString(""" diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala index 2b0db01e1e..364bd407e5 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemoteWatcherSpec.scala @@ -7,10 +7,11 @@ package akka.remote.artery import scala.concurrent.duration._ import scala.language.postfixOps +import com.typesafe.config.ConfigFactory + import akka.actor._ import akka.remote._ import akka.testkit._ -import com.typesafe.config.ConfigFactory object RemoteWatcherSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RemotingFlightRecorderSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RemotingFlightRecorderSpec.scala index 5a769db8d1..deef13db0c 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RemotingFlightRecorderSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RemotingFlightRecorderSpec.scala @@ -4,9 +4,10 @@ package akka.remote.artery +import org.scalatest.matchers.should.Matchers + import akka.testkit.AkkaSpec import akka.util.JavaVersion -import org.scalatest.matchers.should.Matchers class RemotingFlightRecorderSpec extends AkkaSpec with Matchers { diff --git a/akka-remote/src/test/scala/akka/remote/artery/RollingEventLogSimulationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/RollingEventLogSimulationSpec.scala index 1dac7d4e1b..c72db6ae4a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/RollingEventLogSimulationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/RollingEventLogSimulationSpec.scala @@ -4,12 +4,12 @@ package akka.remote.artery -import akka.testkit.AkkaSpec - import scala.annotation.tailrec import scala.util.Random import scala.util.control.NonFatal +import akka.testkit.AkkaSpec + /* * This test is a simulation of the actual concurrent rolling log implemented in SnapshottableRollingEventLog. It * is not possible to test the implementation to such extent than this simulation allows, however, the two implementations diff --git a/akka-remote/src/test/scala/akka/remote/artery/SendQueueSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SendQueueSpec.scala index 752d29e46e..0c6aa84926 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SendQueueSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SendQueueSpec.scala @@ -6,6 +6,10 @@ package akka.remote.artery import java.util.Queue +import scala.concurrent.duration._ + +import org.agrona.concurrent.ManyToOneConcurrentArrayQueue + import akka.actor.Actor import akka.actor.Props import akka.stream.scaladsl.Keep @@ -14,9 +18,6 @@ import akka.stream.testkit.TestSubscriber import akka.stream.testkit.scaladsl.TestSink import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender -import org.agrona.concurrent.ManyToOneConcurrentArrayQueue - -import scala.concurrent.duration._ object SendQueueSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala index 8193ac71cf..790dab8a6d 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SerializationErrorSpec.scala @@ -5,9 +5,9 @@ package akka.remote.artery import akka.actor.{ ActorIdentity, Identify, RootActorPath } +import akka.testkit.EventFilter import akka.testkit.ImplicitSender import akka.testkit.TestActors -import akka.testkit.EventFilter object SerializationErrorSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala b/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala index 085a5aa14a..60ceb4490e 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/SystemMessageDeliverySpec.scala @@ -6,6 +6,12 @@ package akka.remote.artery import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.NotUsed import akka.actor.ActorIdentity import akka.actor.ActorSystem @@ -26,11 +32,6 @@ import akka.testkit.TestActors import akka.testkit.TestEvent import akka.testkit.TestProbe import akka.util.OptionVal -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory - -import scala.concurrent.Await -import scala.concurrent.duration._ object SystemMessageDeliverySpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/TestContext.scala b/akka-remote/src/test/scala/akka/remote/artery/TestContext.scala index b180368cee..76bffceaaf 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/TestContext.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/TestContext.scala @@ -10,6 +10,8 @@ import java.util.concurrent.ThreadLocalRandom import scala.concurrent.Future +import com.typesafe.config.ConfigFactory + import akka.Done import akka.actor.ActorRef import akka.actor.Address @@ -18,7 +20,6 @@ import akka.remote.UniqueAddress import akka.remote.artery.InboundControlJunction.ControlMessageObserver import akka.remote.artery.InboundControlJunction.ControlMessageSubject import akka.util.OptionVal -import com.typesafe.config.ConfigFactory private[remote] class TestInboundContext( override val localAddress: UniqueAddress, diff --git a/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala index a3ac7e8004..fad12b330a 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/UntrustedSpec.scala @@ -7,23 +7,24 @@ package akka.remote.artery import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef +import akka.actor.ActorSelection import akka.actor.Deploy import akka.actor.Identify import akka.actor.PoisonPill import akka.actor.Props import akka.actor.RootActorPath import akka.actor.Terminated -import akka.testkit.ImplicitSender -import akka.testkit.TestProbe -import akka.actor.ActorSelection -import akka.testkit.TestEvent import akka.event.Logging import akka.remote.RARP import akka.serialization.jackson.CborSerializable import akka.testkit.EventFilter +import akka.testkit.ImplicitSender +import akka.testkit.TestEvent +import akka.testkit.TestProbe object UntrustedSpec { final case class IdentifyReq(path: String) extends CborSerializable diff --git a/akka-remote/src/test/scala/akka/remote/artery/aeron/AeronSinkSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/aeron/AeronSinkSpec.scala index 98f6c4909d..dc603334a8 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/aeron/AeronSinkSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/aeron/AeronSinkSpec.scala @@ -7,6 +7,14 @@ package aeron import java.io.File +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import io.aeron.Aeron +import io.aeron.driver.MediaDriver +import org.agrona.IoUtil + import akka.actor.ExtendedActorSystem import akka.remote.artery.aeron.AeronSink.GaveUpMessageException import akka.stream.scaladsl.Sink @@ -14,13 +22,6 @@ import akka.stream.scaladsl.Source import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.SocketUtil -import io.aeron.Aeron -import io.aeron.driver.MediaDriver -import org.agrona.IoUtil - -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace class AeronSinkSpec extends AkkaSpec(""" akka.stream.materializer.debug.fuzzing-mode = on diff --git a/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala index 28025a6b49..475609aec9 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/compress/CompressionIntegrationSpec.scala @@ -4,16 +4,17 @@ package akka.remote.artery.compress +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory -import akka.actor._ -import akka.remote.artery.compress.CompressionProtocol.Events -import akka.testkit._ import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ +import akka.actor._ import akka.actor.ExtendedActorSystem -import akka.serialization.SerializerWithStringManifest import akka.remote.artery.ArteryMultiNodeSpec +import akka.remote.artery.compress.CompressionProtocol.Events +import akka.serialization.SerializerWithStringManifest +import akka.testkit._ object CompressionIntegrationSpec { diff --git a/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala index 975103d1d3..f046cc1632 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala @@ -4,18 +4,19 @@ package akka.remote.artery.compress -import akka.actor.{ ActorIdentity, ActorSystem, Identify } -import akka.pattern.ask -import akka.remote.RARP -import akka.remote.artery.compress.CompressionProtocol.Events.{ Event, ReceivedActorRefCompressionTable } -import akka.remote.artery.{ ArteryMultiNodeSpec, ArterySpecSupport, ArteryTransport } -import akka.testkit._ -import akka.util.Timeout +import scala.concurrent.Await +import scala.concurrent.duration._ + import com.typesafe.config.ConfigFactory import org.scalatest.BeforeAndAfter -import scala.concurrent.Await -import scala.concurrent.duration._ +import akka.actor.{ ActorIdentity, ActorSystem, Identify } +import akka.pattern.ask +import akka.remote.RARP +import akka.remote.artery.{ ArteryMultiNodeSpec, ArterySpecSupport, ArteryTransport } +import akka.remote.artery.compress.CompressionProtocol.Events.{ Event, ReceivedActorRefCompressionTable } +import akka.testkit._ +import akka.util.Timeout object HandshakeShouldDropCompressionTableSpec { val commonConfig = ConfigFactory.parseString(s""" diff --git a/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala index 5c622e4e36..2d3f738e97 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/tcp/TcpFramingSpec.scala @@ -5,17 +5,17 @@ package akka.remote.artery package tcp +import scala.util.Random + import akka.stream.impl.io.ByteStringParser.ParsingException -import akka.stream.scaladsl.Framing.FramingException import akka.stream.scaladsl.Flow +import akka.stream.scaladsl.Framing.FramingException import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.util.ByteString -import scala.util.Random - class TcpFramingSpec extends AkkaSpec(""" akka.stream.materializer.debug.fuzzing-mode = on """) with ImplicitSender { diff --git a/akka-remote/src/test/scala/akka/remote/artery/tcp/TlsTcpSpec.scala b/akka-remote/src/test/scala/akka/remote/artery/tcp/TlsTcpSpec.scala index bcaed57aa1..b417deccef 100644 --- a/akka-remote/src/test/scala/akka/remote/artery/tcp/TlsTcpSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/artery/tcp/TlsTcpSpec.scala @@ -11,21 +11,21 @@ import java.util.zip.GZIPOutputStream import scala.concurrent.duration._ -import akka.actor.ActorRef -import akka.actor.ActorPath -import akka.actor.ActorIdentity -import akka.actor.ExtendedActorSystem -import akka.actor.Identify -import akka.actor.RootActorPath -import akka.actor.setup.ActorSystemSetup -import akka.testkit.ImplicitSender -import akka.testkit.TestActors -import akka.testkit.TestProbe import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import javax.net.ssl.SSLEngine +import akka.actor.ActorIdentity +import akka.actor.ActorPath +import akka.actor.ActorRef +import akka.actor.ExtendedActorSystem +import akka.actor.Identify +import akka.actor.RootActorPath +import akka.actor.setup.ActorSystemSetup import akka.testkit.EventFilter +import akka.testkit.ImplicitSender +import akka.testkit.TestActors +import akka.testkit.TestProbe class TlsTcpWithDefaultConfigSpec extends TlsTcpSpec(ConfigFactory.empty()) diff --git a/akka-remote/src/test/scala/akka/remote/classic/ActorsLeakSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/ActorsLeakSpec.scala index 4fc2c564bd..304d111f3b 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/ActorsLeakSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/ActorsLeakSpec.scala @@ -6,19 +6,20 @@ package akka.remote.classic import java.util.concurrent.TimeoutException -import akka.actor._ -import akka.actor.dungeon.ChildrenContainer -import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociate -import akka.remote.{ AddressUidExtension, RARP } -import akka.testkit.TestActors.EchoActor -import akka.testkit._ -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory - import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.actor._ +import akka.actor.dungeon.ChildrenContainer +import akka.remote.{ AddressUidExtension, RARP } +import akka.remote.transport.ThrottlerTransportAdapter.ForceDisassociate +import akka.testkit._ +import akka.testkit.TestActors.EchoActor + object ActorsLeakSpec { val config = ConfigFactory.parseString(""" diff --git a/akka-remote/src/test/scala/akka/remote/classic/RemoteDeathWatchSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/RemoteDeathWatchSpec.scala index e173b21852..8cc6326ce4 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/RemoteDeathWatchSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/RemoteDeathWatchSpec.scala @@ -4,14 +4,15 @@ package akka.remote.classic +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.{ RootActorPath, _ } import akka.event.Logging.Warning import akka.remote.{ QuarantinedEvent, RARP, RemoteActorRef } import akka.testkit.{ SocketUtil, _ } -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ @silent // classic deprecated class RemoteDeathWatchSpec diff --git a/akka-remote/src/test/scala/akka/remote/classic/RemoteDeploymentWhitelistSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/RemoteDeploymentWhitelistSpec.scala index a07f4f7aae..9fdfd384f2 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/RemoteDeploymentWhitelistSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/RemoteDeploymentWhitelistSpec.scala @@ -4,14 +4,15 @@ package akka.remote.classic +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config._ + import akka.actor._ import akka.remote.EndpointException import akka.remote.transport._ import akka.testkit._ -import com.typesafe.config._ -import scala.concurrent.duration._ - -import com.github.ghik.silencer.silent // relies on test transport object RemoteDeploymentWhitelistSpec { diff --git a/akka-remote/src/test/scala/akka/remote/classic/RemoteInitErrorSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/RemoteInitErrorSpec.scala index 0a778fcf7e..b2676596b5 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/RemoteInitErrorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/RemoteInitErrorSpec.scala @@ -4,18 +4,19 @@ package akka.remote.classic -import akka.actor.ActorSystem -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.Eventually._ - -import akka.util.ccompat.JavaConverters._ import scala.collection.mutable.Set import scala.concurrent.duration._ import scala.language.postfixOps import scala.util.control.NonFatal + +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.Eventually._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem +import akka.util.ccompat.JavaConverters._ + /** * The 192.0.2.1 is a Documentation IP-address and should not be used at all * by any network node. Therefore we assume here that the initialization of diff --git a/akka-remote/src/test/scala/akka/remote/classic/RemoteSettingsSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/RemoteSettingsSpec.scala index 1dd61e12eb..fc4be679f9 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/RemoteSettingsSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/RemoteSettingsSpec.scala @@ -4,12 +4,13 @@ package akka.remote.classic -import akka.remote.RemoteSettings import com.github.ghik.silencer.silent import com.typesafe.config.ConfigFactory import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.remote.RemoteSettings + @silent("deprecated") class RemoteSettingsSpec extends AnyWordSpec with Matchers { diff --git a/akka-remote/src/test/scala/akka/remote/classic/RemoteWatcherSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/RemoteWatcherSpec.scala index 709e9f0870..7aa04ff9ba 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/RemoteWatcherSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/RemoteWatcherSpec.scala @@ -4,13 +4,14 @@ package akka.remote.classic +import scala.concurrent.duration._ +import scala.language.postfixOps + +import com.github.ghik.silencer.silent + import akka.actor._ import akka.remote._ import akka.testkit._ -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ -import scala.language.postfixOps object RemoteWatcherSpec { diff --git a/akka-remote/src/test/scala/akka/remote/classic/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/RemotingSpec.scala index a65b34a76f..c61a93e5a1 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/RemotingSpec.scala @@ -7,23 +7,23 @@ package akka.remote.classic import java.io.NotSerializableException import java.util.concurrent.ThreadLocalRandom -import akka.actor._ -import akka.event.AddressTerminatedTopic -import akka.pattern.ask -import akka.remote.transport.AssociationHandle.{ HandleEvent, HandleEventListener } -import akka.remote.transport.Transport.InvalidAssociationException -import akka.remote.transport._ -import akka.remote._ -import akka.testkit.SocketUtil.temporaryServerAddress -import akka.testkit._ -import akka.util.ByteString +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ +import scala.util.control.NonFatal + import com.github.ghik.silencer.silent import com.typesafe.config._ -import scala.concurrent.{ Await, Future } -import scala.concurrent.duration._ - -import scala.util.control.NonFatal +import akka.actor._ +import akka.event.AddressTerminatedTopic +import akka.pattern.ask +import akka.remote._ +import akka.remote.transport._ +import akka.remote.transport.AssociationHandle.{ HandleEvent, HandleEventListener } +import akka.remote.transport.Transport.InvalidAssociationException +import akka.testkit._ +import akka.testkit.SocketUtil.temporaryServerAddress +import akka.util.ByteString object RemotingSpec { diff --git a/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala index 3a9322c8f8..9bb86dfd56 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/UntrustedSpec.scala @@ -7,9 +7,11 @@ package akka.remote.classic import scala.concurrent.duration._ import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorIdentity import akka.actor.ActorRef +import akka.actor.ActorSelection import akka.actor.ActorSystem import akka.actor.Deploy import akka.actor.ExtendedActorSystem @@ -18,14 +20,13 @@ import akka.actor.PoisonPill import akka.actor.Props import akka.actor.RootActorPath import akka.actor.Terminated -import akka.testkit.AkkaSpec -import akka.testkit.ImplicitSender -import akka.testkit.TestProbe -import akka.actor.ActorSelection -import akka.testkit.TestEvent import akka.event.Logging +import akka.testkit.AkkaSpec import akka.testkit.EventFilter +import akka.testkit.ImplicitSender import akka.testkit.JavaSerializable +import akka.testkit.TestEvent +import akka.testkit.TestProbe object UntrustedSpec { final case class IdentifyReq(path: String) extends JavaSerializable diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala index c8ef455702..d229291759 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolSpec.scala @@ -6,9 +6,17 @@ package akka.remote.classic.transport import java.util.concurrent.TimeoutException +import scala.concurrent.{ Await, Promise } +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + import akka.actor.Address import akka.protobufv3.internal.{ ByteString => PByteString } +import akka.remote.{ FailureDetector, WireFormats } import akka.remote.classic.transport.AkkaProtocolSpec.TestFailureDetector +import akka.remote.transport.{ AssociationRegistry => _, _ } import akka.remote.transport.AkkaPduCodec.{ Associate, Disassociate, Heartbeat } import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, @@ -19,15 +27,8 @@ import akka.remote.transport.AssociationHandle.{ import akka.remote.transport.ProtocolStateActor import akka.remote.transport.TestTransport._ import akka.remote.transport.Transport._ -import akka.remote.transport.{ AssociationRegistry => _, _ } -import akka.remote.{ FailureDetector, WireFormats } import akka.testkit.{ AkkaSpec, ImplicitSender } import akka.util.{ ByteString, OptionVal } -import com.typesafe.config.ConfigFactory -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Promise } - -import com.github.ghik.silencer.silent object AkkaProtocolSpec { diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolStressTest.scala index bfd6ba8b50..4a68f478b3 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/AkkaProtocolStressTest.scala @@ -4,16 +4,17 @@ package akka.remote.classic.transport -import akka.actor._ -import akka.remote.classic.transport.AkkaProtocolStressTest._ -import akka.remote.transport.FailureInjectorTransportAdapter.{ Drop, One } -import akka.remote.{ EndpointException, RARP } -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TimingTest, _ } -import com.typesafe.config.{ Config, ConfigFactory } - import scala.concurrent.Await import scala.concurrent.duration._ +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor._ +import akka.remote.{ EndpointException, RARP } +import akka.remote.classic.transport.AkkaProtocolStressTest._ +import akka.remote.transport.FailureInjectorTransportAdapter.{ Drop, One } +import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender, TimingTest, _ } + object AkkaProtocolStressTest { val configA: Config = ConfigFactory.parseString(""" diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/GenericTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/GenericTransportSpec.scala index 8b4811fbdf..99342a486b 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/GenericTransportSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/GenericTransportSpec.scala @@ -4,18 +4,19 @@ package akka.remote.classic.transport -import akka.actor.{ Address, ExtendedActorSystem } -import akka.remote.RemoteActorRefProvider -import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, Disassociated, InboundPayload } -import akka.remote.transport.TestTransport.{ AssociateAttempt, DisassociateAttempt, ListenAttempt, WriteAttempt, _ } -import akka.remote.transport.Transport._ -import akka.remote.transport.{ AssociationRegistry => _, _ } -import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender } -import akka.util.ByteString import scala.concurrent.{ Await, Future } import com.github.ghik.silencer.silent +import akka.actor.{ Address, ExtendedActorSystem } +import akka.remote.RemoteActorRefProvider +import akka.remote.transport.{ AssociationRegistry => _, _ } +import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, Disassociated, InboundPayload } +import akka.remote.transport.TestTransport.{ AssociateAttempt, DisassociateAttempt, ListenAttempt, WriteAttempt, _ } +import akka.remote.transport.Transport._ +import akka.testkit.{ AkkaSpec, DefaultTimeout, ImplicitSender } +import akka.util.ByteString + @silent("deprecated") abstract class GenericTransportSpec(withAkkaProtocol: Boolean = false) extends AkkaSpec(""" diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/SwitchableLoggedBehaviorSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/SwitchableLoggedBehaviorSpec.scala index d51c9325ba..6a96d0afb8 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/SwitchableLoggedBehaviorSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/SwitchableLoggedBehaviorSpec.scala @@ -4,14 +4,14 @@ package akka.remote.classic.transport -import akka.AkkaException -import akka.remote.transport.TestTransport.SwitchableLoggedBehavior -import akka.testkit.{ AkkaSpec, DefaultTimeout } - import scala.concurrent.{ Await, Future, Promise } import scala.util.Failure import scala.util.control.NoStackTrace +import akka.AkkaException +import akka.remote.transport.TestTransport.SwitchableLoggedBehavior +import akka.testkit.{ AkkaSpec, DefaultTimeout } + object SwitchableLoggedBehaviorSpec { object TestException extends AkkaException("Test exception") with NoStackTrace } diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/SystemMessageDeliveryStressTest.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/SystemMessageDeliveryStressTest.scala index 46eea7eb30..0f3d581287 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/SystemMessageDeliveryStressTest.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/SystemMessageDeliveryStressTest.scala @@ -4,18 +4,19 @@ package akka.remote.classic.transport -import akka.actor.{ Actor, ActorRef, ActorSystem, ExtendedActorSystem, Props, RootActorPath, _ } -import akka.dispatch.sysmsg.{ Failed, SystemMessage } -import akka.remote.transport.AssociationHandle -import akka.remote.transport.FailureInjectorTransportAdapter.{ Drop, One } -import akka.remote.transport.ThrottlerTransportAdapter._ -import akka.remote.{ EndpointException, QuarantinedEvent, RARP } -import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender, TestEvent, TimingTest, _ } -import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.Await import scala.concurrent.duration._ import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor.{ Actor, ActorRef, ActorSystem, ExtendedActorSystem, Props, RootActorPath, _ } +import akka.dispatch.sysmsg.{ Failed, SystemMessage } +import akka.remote.{ EndpointException, QuarantinedEvent, RARP } +import akka.remote.transport.AssociationHandle +import akka.remote.transport.FailureInjectorTransportAdapter.{ Drop, One } +import akka.remote.transport.ThrottlerTransportAdapter._ +import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender, TestEvent, TimingTest, _ } object SystemMessageDeliveryStressTest { val msgCount = 5000 diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/TestTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/TestTransportSpec.scala index 172ecee96d..027fdf61d4 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/TestTransportSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/TestTransportSpec.scala @@ -4,17 +4,18 @@ package akka.remote.classic.transport -import akka.actor.Address -import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, Disassociated, InboundPayload } -import akka.remote.transport.TestTransport._ -import akka.remote.transport.Transport._ -import akka.remote.transport.{ AssociationHandle, TestTransport } -import akka.testkit._ -import akka.util.ByteString import scala.concurrent._ import com.github.ghik.silencer.silent +import akka.actor.Address +import akka.remote.transport.{ AssociationHandle, TestTransport } +import akka.remote.transport.AssociationHandle.{ ActorHandleEventListener, Disassociated, InboundPayload } +import akka.remote.transport.TestTransport._ +import akka.remote.transport.Transport._ +import akka.testkit._ +import akka.util.ByteString + @silent("deprecated") class TestTransportSpec extends AkkaSpec with DefaultTimeout with ImplicitSender { diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/ThrottlerTransportAdapterSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/ThrottlerTransportAdapterSpec.scala index ca439774d6..1472f4e603 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/ThrottlerTransportAdapterSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/ThrottlerTransportAdapterSpec.scala @@ -4,17 +4,18 @@ package akka.remote.classic.transport -import akka.actor._ -import akka.remote.classic.transport.ThrottlerTransportAdapterSpec._ -import akka.remote.transport.ThrottlerTransportAdapter._ -import akka.remote.transport.{ TestTransport, ThrottlerTransportAdapter } -import akka.remote.{ EndpointException, RemoteActorRefProvider } -import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender, TestEvent, TimingTest } -import com.typesafe.config.{ Config, ConfigFactory } import scala.concurrent.Await import scala.concurrent.duration._ import com.github.ghik.silencer.silent +import com.typesafe.config.{ Config, ConfigFactory } + +import akka.actor._ +import akka.remote.{ EndpointException, RemoteActorRefProvider } +import akka.remote.classic.transport.ThrottlerTransportAdapterSpec._ +import akka.remote.transport.{ TestTransport, ThrottlerTransportAdapter } +import akka.remote.transport.ThrottlerTransportAdapter._ +import akka.testkit.{ AkkaSpec, DefaultTimeout, EventFilter, ImplicitSender, TestEvent, TimingTest } object ThrottlerTransportAdapterSpec { val configA: Config = diff --git a/akka-remote/src/test/scala/akka/remote/classic/transport/netty/NettyTransportSpec.scala b/akka-remote/src/test/scala/akka/remote/classic/transport/netty/NettyTransportSpec.scala index 08b103c586..645fffb877 100644 --- a/akka-remote/src/test/scala/akka/remote/classic/transport/netty/NettyTransportSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/classic/transport/netty/NettyTransportSpec.scala @@ -7,15 +7,16 @@ package akka.remote.classic.transport.netty import java.net.{ InetAddress, InetSocketAddress } import java.nio.channels.ServerSocketChannel +import scala.concurrent.Await +import scala.concurrent.duration.Duration + +import com.typesafe.config.ConfigFactory +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec + import akka.actor.{ ActorSystem, Address, ExtendedActorSystem } import akka.remote.BoundAddressesExtension import akka.testkit.SocketUtil -import com.typesafe.config.ConfigFactory - -import scala.concurrent.Await -import scala.concurrent.duration.Duration -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpec object NettyTransportSpec { val commonConfig = ConfigFactory.parseString(""" diff --git a/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala index dbd0a7dcaf..2b49e499e9 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/AllowJavaSerializationOffSpec.scala @@ -7,14 +7,15 @@ package akka.remote.serialization import java.util.{ BitSet => ProgrammaticJavaDummy } import java.util.{ Date => SerializableDummy } -import akka.actor.setup.ActorSystemSetup +import com.typesafe.config.ConfigFactory + import akka.actor.ActorSystem import akka.actor.BootstrapSetup import akka.actor.ExtendedActorSystem +import akka.actor.setup.ActorSystemSetup import akka.serialization._ import akka.testkit.AkkaSpec import akka.testkit.TestKit -import com.typesafe.config.ConfigFactory class ConfigurationDummy class ProgrammaticDummy diff --git a/akka-remote/src/test/scala/akka/remote/serialization/ArteryMessageSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/ArteryMessageSerializerSpec.scala index 9b63cd7859..a423abbda6 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/ArteryMessageSerializerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/ArteryMessageSerializerSpec.scala @@ -8,6 +8,7 @@ import java.io.NotSerializableException import akka.actor._ import akka.remote.{ RemoteWatcher, UniqueAddress } +import akka.remote.artery.{ ActorSystemTerminating, ActorSystemTerminatingAck, Quarantined, SystemMessageDelivery } import akka.remote.artery.OutboundHandshake.{ HandshakeReq, HandshakeRsp } import akka.remote.artery.compress.CompressionProtocol.{ ActorRefCompressionAdvertisement, @@ -16,7 +17,6 @@ import akka.remote.artery.compress.CompressionProtocol.{ ClassManifestCompressionAdvertisementAck } import akka.remote.artery.compress.CompressionTable -import akka.remote.artery.{ ActorSystemTerminating, ActorSystemTerminatingAck, Quarantined, SystemMessageDelivery } import akka.serialization.SerializationExtension import akka.testkit.AkkaSpec diff --git a/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerAllowJavaSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerAllowJavaSerializationSpec.scala index 3244890ba1..fe13670d7e 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerAllowJavaSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/DaemonMsgCreateSerializerAllowJavaSerializationSpec.scala @@ -4,6 +4,8 @@ package akka.remote.serialization +import com.typesafe.config.ConfigFactory + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Address @@ -21,7 +23,6 @@ import akka.serialization.SerializationExtension import akka.testkit.AkkaSpec import akka.testkit.JavaSerializable import akka.util.unused -import com.typesafe.config.ConfigFactory object DaemonMsgCreateSerializerAllowJavaSerializationSpec { diff --git a/akka-remote/src/test/scala/akka/remote/serialization/MiscMessageSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/MiscMessageSerializerSpec.scala index 5aa973d543..cab843cce8 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/MiscMessageSerializerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/MiscMessageSerializerSpec.scala @@ -4,21 +4,23 @@ package akka.remote.serialization -import akka.actor._ -import akka.remote.{ RemoteScope, RemoteWatcher } -import akka.serialization.SerializationExtension -import akka.testkit.AkkaSpec -import com.typesafe.config.ConfigFactory -import scala.util.control.NoStackTrace -import scala.concurrent.duration._ -import java.util.Optional import java.io.NotSerializableException +import java.util.Optional import java.util.concurrent.TimeoutException -import akka.pattern.AskTimeoutException +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import com.typesafe.config.ConfigFactory + import akka.{ Done, NotUsed } +import akka.actor._ +import akka.pattern.AskTimeoutException +import akka.remote.{ RemoteScope, RemoteWatcher } import akka.remote.routing.RemoteRouterConfig import akka.routing._ +import akka.serialization.SerializationExtension +import akka.testkit.AkkaSpec import akka.testkit.JavaSerializable object MiscMessageSerializerSpec { diff --git a/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala index 56b790c02d..7b710cb1f6 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/PrimitivesSerializationSpec.scala @@ -9,6 +9,8 @@ import java.nio.ByteOrder import scala.util.Random +import com.typesafe.config.ConfigFactory + import akka.actor.ExtendedActorSystem import akka.serialization.BaseSerializer import akka.serialization.ByteBufferSerializer @@ -16,7 +18,6 @@ import akka.serialization.SerializationExtension import akka.serialization.Serializer import akka.testkit.AkkaSpec import akka.util.ByteString -import com.typesafe.config.ConfigFactory object PrimitivesSerializationSpec { val serializationTestOverrides = "" diff --git a/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala index a87c2e04f5..af85760222 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/ProtobufSerializerSpec.scala @@ -4,13 +4,13 @@ package akka.remote.serialization +import akka.actor.ExtendedActorSystem +import akka.remote.MessageSerializer +import akka.remote.ProtobufProtocol.MyMessage +import akka.remote.WireFormats.SerializedMessage +import akka.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 import akka.serialization.SerializationExtension import akka.testkit.AkkaSpec -import akka.remote.WireFormats.SerializedMessage -import akka.remote.ProtobufProtocol.MyMessage -import akka.remote.MessageSerializer -import akka.actor.ExtendedActorSystem -import akka.remote.protobuf.v3.ProtobufProtocolV3.MyMessageV3 import akka.util.unused // those must be defined as top level classes, to have static parseFrom diff --git a/akka-remote/src/test/scala/akka/remote/serialization/SerializationTransportInformationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/SerializationTransportInformationSpec.scala index aaef0246b3..88367ce0f4 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/SerializationTransportInformationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/SerializationTransportInformationSpec.scala @@ -6,21 +6,22 @@ package akka.remote.serialization import java.nio.charset.StandardCharsets +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.ActorIdentity -import akka.serialization.Serialization import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.ExtendedActorSystem import akka.actor.Identify import akka.actor.RootActorPath import akka.remote.RARP +import akka.serialization.Serialization import akka.serialization.SerializerWithStringManifest import akka.testkit.AkkaSpec import akka.testkit.ImplicitSender import akka.testkit.JavaSerializable import akka.testkit.TestActors -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory object SerializationTransportInformationSpec { diff --git a/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala b/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala index af4cadeb4d..24b652c07c 100644 --- a/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/serialization/SystemMessageSerializationSpec.scala @@ -4,12 +4,13 @@ package akka.remote.serialization +import com.typesafe.config.ConfigFactory + import akka.actor.{ ActorInitializationException, ExtendedActorSystem, InternalActorRef } import akka.dispatch.sysmsg._ import akka.serialization.SerializationExtension -import akka.testkit.JavaSerializable import akka.testkit.{ AkkaSpec, TestProbe } -import com.typesafe.config.ConfigFactory +import akka.testkit.JavaSerializable object SystemMessageSerializationSpec { val serializationTestOverrides = diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/ActorRefModule.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/ActorRefModule.scala index 5f14d1a80e..e3d2557802 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/ActorRefModule.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/ActorRefModule.scala @@ -6,8 +6,6 @@ package akka.serialization.jackson // FIXME maybe move many things to `akka.serialization.jackson.internal` package? -import akka.actor.ActorRef -import akka.annotation.InternalApi import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonTokenId @@ -16,6 +14,9 @@ import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer +import akka.actor.ActorRef +import akka.annotation.InternalApi + /** * INTERNAL API: Adds support for serializing and deserializing [[ActorRef]]. */ diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/AddressModule.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/AddressModule.scala index 19b4aea32a..f61771b52a 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/AddressModule.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/AddressModule.scala @@ -4,9 +4,6 @@ package akka.serialization.jackson -import akka.actor.Address -import akka.actor.AddressFromURIString -import akka.annotation.InternalApi import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonTokenId @@ -15,6 +12,10 @@ import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer +import akka.actor.Address +import akka.actor.AddressFromURIString +import akka.annotation.InternalApi + /** * INTERNAL API: Adds support for serializing and deserializing [[Address]]. */ diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/FiniteDurationModule.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/FiniteDurationModule.scala index c5f3cb35f1..a99061615a 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/FiniteDurationModule.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/FiniteDurationModule.scala @@ -6,8 +6,6 @@ package akka.serialization.jackson import scala.concurrent.duration.FiniteDuration -import akka.annotation.InternalApi -import akka.util.JavaDurationConverters._ import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.databind.DeserializationContext @@ -17,6 +15,9 @@ import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer import com.fasterxml.jackson.datatype.jsr310.deser.DurationDeserializer import com.fasterxml.jackson.datatype.jsr310.ser.DurationSerializer +import akka.annotation.InternalApi +import akka.util.JavaDurationConverters._ + /** * INTERNAL API: Adds support for serializing and deserializing [[FiniteDuration]]. */ diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonMigration.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonMigration.scala index b6c903f2ed..c39b2a17e0 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonMigration.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonMigration.scala @@ -5,6 +5,7 @@ package akka.serialization.jackson import com.fasterxml.jackson.databind.JsonNode + import akka.util.unused /** diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonModule.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonModule.scala index c3067dfc3c..f9a35d62da 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonModule.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonModule.scala @@ -4,7 +4,6 @@ package akka.serialization.jackson -import akka.annotation.InternalApi import com.fasterxml.jackson.core.Version import com.fasterxml.jackson.core.util.VersionUtil import com.fasterxml.jackson.databind.BeanDescription @@ -20,6 +19,8 @@ import com.fasterxml.jackson.databind.deser.Deserializers import com.fasterxml.jackson.databind.ser.BeanSerializerModifier import com.fasterxml.jackson.databind.ser.Serializers +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonObjectMapperProvider.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonObjectMapperProvider.scala index b101ae7738..c011db3367 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonObjectMapperProvider.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonObjectMapperProvider.scala @@ -12,6 +12,26 @@ import scala.compat.java8.OptionConverters._ import scala.util.Failure import scala.util.Success +import com.fasterxml.jackson.annotation.JsonAutoDetect +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.PropertyAccessor +import com.fasterxml.jackson.core.JsonFactory +import com.fasterxml.jackson.core.JsonFactoryBuilder +import com.fasterxml.jackson.core.JsonGenerator +import com.fasterxml.jackson.core.JsonParser +import com.fasterxml.jackson.core.StreamReadFeature +import com.fasterxml.jackson.core.StreamWriteFeature +import com.fasterxml.jackson.core.json.JsonReadFeature +import com.fasterxml.jackson.core.json.JsonWriteFeature +import com.fasterxml.jackson.databind.DeserializationFeature +import com.fasterxml.jackson.databind.MapperFeature +import com.fasterxml.jackson.databind.Module +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.SerializationFeature +import com.fasterxml.jackson.databind.json.JsonMapper +import com.fasterxml.jackson.module.paramnames.ParameterNamesModule +import com.typesafe.config.Config + import akka.actor.ActorSystem import akka.actor.ClassicActorSystemProvider import akka.actor.DynamicAccess @@ -24,25 +44,6 @@ import akka.annotation.InternalStableApi import akka.event.Logging import akka.event.LoggingAdapter import akka.util.unused -import com.fasterxml.jackson.annotation.JsonAutoDetect -import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.PropertyAccessor -import com.fasterxml.jackson.core.JsonFactory -import com.fasterxml.jackson.core.JsonFactoryBuilder -import com.fasterxml.jackson.databind.DeserializationFeature -import com.fasterxml.jackson.databind.MapperFeature -import com.fasterxml.jackson.databind.Module -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.databind.SerializationFeature -import com.fasterxml.jackson.module.paramnames.ParameterNamesModule -import com.typesafe.config.Config -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.core.StreamReadFeature -import com.fasterxml.jackson.core.StreamWriteFeature -import com.fasterxml.jackson.core.json.JsonReadFeature -import com.fasterxml.jackson.core.json.JsonWriteFeature -import com.fasterxml.jackson.databind.json.JsonMapper object JacksonObjectMapperProvider extends ExtensionId[JacksonObjectMapperProvider] with ExtensionIdProvider { override def get(system: ActorSystem): JacksonObjectMapperProvider = super.get(system) diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonSerializer.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonSerializer.scala index 72d4b76011..c83e3d74fa 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonSerializer.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/JacksonSerializer.scala @@ -14,6 +14,11 @@ import scala.annotation.tailrec import scala.util.Failure import scala.util.Success import scala.util.control.NonFatal + +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.jsontype.impl.SubTypeValidator +import com.fasterxml.jackson.dataformat.cbor.CBORFactory + import akka.actor.ExtendedActorSystem import akka.annotation.InternalApi import akka.event.LogMarker @@ -22,9 +27,6 @@ import akka.serialization.BaseSerializer import akka.serialization.SerializationExtension import akka.serialization.SerializerWithStringManifest import akka.util.Helpers.toRootLowerCase -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.databind.jsontype.impl.SubTypeValidator -import com.fasterxml.jackson.dataformat.cbor.CBORFactory /** * INTERNAL API diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/StreamRefModule.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/StreamRefModule.scala index a2c896a2f6..41d776571c 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/StreamRefModule.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/StreamRefModule.scala @@ -6,10 +6,6 @@ package akka.serialization.jackson // FIXME maybe move many things to `akka.serialization.jackson.internal` package? -import akka.annotation.InternalApi -import akka.stream.SinkRef -import akka.stream.SourceRef -import akka.stream.StreamRefResolver import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonTokenId @@ -18,6 +14,11 @@ import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer +import akka.annotation.InternalApi +import akka.stream.SinkRef +import akka.stream.SourceRef +import akka.stream.StreamRefResolver + /** * INTERNAL API: Adds support for serializing and deserializing [[akka.stream.SourceRef]] and [[akka.stream.SinkRef]]. */ diff --git a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/TypedActorRefModule.scala b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/TypedActorRefModule.scala index 71a4a91779..ab3d1aad82 100644 --- a/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/TypedActorRefModule.scala +++ b/akka-serialization-jackson/src/main/scala/akka/serialization/jackson/TypedActorRefModule.scala @@ -4,10 +4,6 @@ package akka.serialization.jackson -import akka.actor.typed.ActorRef -import akka.actor.typed.ActorRefResolver -import akka.actor.typed.scaladsl.adapter._ -import akka.annotation.InternalApi import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.JsonTokenId @@ -16,6 +12,11 @@ import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer +import akka.actor.typed.ActorRef +import akka.actor.typed.ActorRefResolver +import akka.actor.typed.scaladsl.adapter._ +import akka.annotation.InternalApi + /** * INTERNAL API: Adds support for serializing and deserializing [[akka.actor.typed.ActorRef]]. */ diff --git a/akka-serialization-jackson/src/test/scala/akka/serialization/jackson/JacksonSerializerSpec.scala b/akka-serialization-jackson/src/test/scala/akka/serialization/jackson/JacksonSerializerSpec.scala index 31f6acc375..1b45c25c8a 100644 --- a/akka-serialization-jackson/src/test/scala/akka/serialization/jackson/JacksonSerializerSpec.scala +++ b/akka-serialization-jackson/src/test/scala/akka/serialization/jackson/JacksonSerializerSpec.scala @@ -16,8 +16,34 @@ import java.util.UUID import java.util.logging.FileHandler import scala.collection.immutable -import scala.concurrent.duration.FiniteDuration import scala.concurrent.duration._ +import scala.concurrent.duration.FiniteDuration + +import com.fasterxml.jackson.annotation.JsonSubTypes +import com.fasterxml.jackson.annotation.JsonTypeInfo +import com.fasterxml.jackson.core.JsonFactory +import com.fasterxml.jackson.core.JsonGenerator +import com.fasterxml.jackson.core.JsonParser +import com.fasterxml.jackson.core.StreamReadFeature +import com.fasterxml.jackson.core.StreamWriteFeature +import com.fasterxml.jackson.core.`type`.TypeReference +import com.fasterxml.jackson.databind.DeserializationFeature +import com.fasterxml.jackson.databind.JsonNode +import com.fasterxml.jackson.databind.MapperFeature +import com.fasterxml.jackson.databind.Module +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.SerializationFeature +import com.fasterxml.jackson.databind.exc.InvalidTypeIdException +import com.fasterxml.jackson.databind.json.JsonMapper +import com.fasterxml.jackson.databind.node.IntNode +import com.fasterxml.jackson.databind.node.ObjectNode +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule +import com.fasterxml.jackson.module.scala.JsonScalaEnumeration +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import org.scalatest.BeforeAndAfterAll +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike import akka.actor.ActorRef import akka.actor.ActorSystem @@ -31,31 +57,6 @@ import akka.serialization.Serialization import akka.serialization.SerializationExtension import akka.testkit.TestActors import akka.testkit.TestKit -import com.fasterxml.jackson.annotation.JsonSubTypes -import com.fasterxml.jackson.annotation.JsonTypeInfo -import com.fasterxml.jackson.core.JsonFactory -import com.fasterxml.jackson.databind.MapperFeature -import com.fasterxml.jackson.databind.DeserializationFeature -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.Module -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.databind.SerializationFeature -import com.fasterxml.jackson.databind.exc.InvalidTypeIdException -import com.fasterxml.jackson.databind.node.IntNode -import com.fasterxml.jackson.databind.node.ObjectNode -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule -import com.typesafe.config.ConfigFactory -import org.scalatest.BeforeAndAfterAll -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.core.StreamReadFeature -import com.fasterxml.jackson.core.StreamWriteFeature -import com.fasterxml.jackson.core.`type`.TypeReference -import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.scala.JsonScalaEnumeration -import com.github.ghik.silencer.silent object ScalaTestMessages { trait TestMessage diff --git a/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala b/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala index d475239f48..2337e76726 100644 --- a/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala +++ b/akka-slf4j/src/main/scala/akka/event/slf4j/Slf4jLogger.scala @@ -5,11 +5,12 @@ package akka.event.slf4j import org.slf4j.{ MDC, Marker, MarkerFactory, Logger => SLFLogger, LoggerFactory => SLFLoggerFactory } -import akka.event.Logging._ + import akka.actor._ -import akka.event.{ LogMarker, _ } -import akka.util.{ unused, Helpers } import akka.dispatch.RequiresMessageQueue +import akka.event.{ LogMarker, _ } +import akka.event.Logging._ +import akka.util.{ unused, Helpers } /** * Base trait for all classes that wants to be able use the SLF4J logging infrastructure. diff --git a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala index 3f6229dcd9..7169076a27 100644 --- a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala +++ b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggerSpec.scala @@ -4,18 +4,19 @@ package akka.event.slf4j -import language.postfixOps -import akka.testkit.AkkaSpec -import akka.actor.{ Actor, DiagnosticActorLogging, Props } - -import scala.concurrent.duration._ -import akka.event.{ LogMarker, Logging } -import ch.qos.logback.core.OutputStreamAppender import java.io.ByteArrayOutputStream +import scala.concurrent.duration._ + +import ch.qos.logback.core.OutputStreamAppender +import language.postfixOps import org.scalatest.BeforeAndAfterEach import org.slf4j.{ Marker, MarkerFactory } +import akka.actor.{ Actor, DiagnosticActorLogging, Props } +import akka.event.{ LogMarker, Logging } +import akka.testkit.AkkaSpec + object Slf4jLoggerSpec { // This test depends on logback configuration in src/test/resources/logback-test.xml diff --git a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala index 98079ed491..bd9e014cf3 100644 --- a/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala +++ b/akka-slf4j/src/test/scala/akka/event/slf4j/Slf4jLoggingFilterSpec.scala @@ -4,19 +4,21 @@ package akka.event.slf4j -import akka.testkit.AkkaSpec -import akka.actor.{ Actor, ActorLogging, Props } import scala.concurrent.duration._ -import akka.event.Logging + import org.scalatest.BeforeAndAfterEach + +import akka.actor.{ Actor, ActorLogging, Props } import akka.actor.ActorRef -import akka.event.Logging.InitializeLogger -import akka.event.Logging.LoggerInitialized -import akka.event.Logging.LogEvent -import akka.testkit.TestProbe -import akka.event.Logging.Warning -import akka.event.Logging.Info +import akka.event.Logging import akka.event.Logging.Debug +import akka.event.Logging.Info +import akka.event.Logging.InitializeLogger +import akka.event.Logging.LogEvent +import akka.event.Logging.LoggerInitialized +import akka.event.Logging.Warning +import akka.testkit.AkkaSpec +import akka.testkit.TestProbe object Slf4jLoggingFilterSpec { diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala index f11f71e3e7..b1f72bed65 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/StreamTestKit.scala @@ -4,25 +4,25 @@ package akka.stream.testkit -import akka.actor.{ ActorRef, ActorSystem, DeadLetterSuppression, NoSerializationVerificationNeeded } -import akka.stream._ -import akka.stream.impl._ -import akka.testkit.{ TestActor, TestProbe } -import org.reactivestreams.{ Publisher, Subscriber, Subscription } +import java.io.PrintWriter +import java.io.StringWriter +import java.util.concurrent.CountDownLatch import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration._ -import java.io.StringWriter -import java.io.PrintWriter -import java.util.concurrent.CountDownLatch +import scala.reflect.ClassTag +import org.reactivestreams.{ Publisher, Subscriber, Subscription } + +import akka.actor.{ ActorRef, ActorSystem, DeadLetterSuppression, NoSerializationVerificationNeeded } +import akka.stream._ +import akka.stream.impl._ +import akka.testkit.{ TestActor, TestProbe } import akka.testkit.TestActor.AutoPilot import akka.util.JavaDurationConverters import akka.util.ccompat._ -import scala.reflect.ClassTag - /** * Provides factory methods for various Publishers. */ diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/TestGraphStage.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/TestGraphStage.scala index fecc22a125..84167a33aa 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/TestGraphStage.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/TestGraphStage.scala @@ -4,14 +4,14 @@ package akka.stream.testkit +import scala.util.control.NonFatal + import akka.actor.NoSerializationVerificationNeeded +import akka.stream._ import akka.stream.scaladsl.{ Sink, Source } import akka.stream.stage.{ GraphStageWithMaterializedValue, InHandler, OutHandler } -import akka.stream._ import akka.testkit.TestProbe -import scala.util.control.NonFatal - /** * Messages emitted after the corresponding `stageUnderTest` methods has been invoked. */ diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala index 8be7ed1da5..b010c1b36c 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/StreamTestKit.scala @@ -6,6 +6,9 @@ package akka.stream.testkit.scaladsl import java.util.concurrent.TimeUnit.MILLISECONDS +import scala.concurrent.{ Await, ExecutionContext } +import scala.concurrent.duration._ + import akka.actor.{ ActorRef, ActorSystem } import akka.annotation.InternalApi import akka.stream._ @@ -13,9 +16,6 @@ import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } import akka.stream.snapshot._ import akka.testkit.TestProbe -import scala.concurrent.duration._ -import scala.concurrent.{ Await, ExecutionContext } - object StreamTestKit { /** diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSink.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSink.scala index be9b8bd9a3..d212414a94 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSink.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSink.scala @@ -5,12 +5,12 @@ package akka.stream.testkit.scaladsl import akka.actor.ActorSystem -import akka.stream.Attributes.none import akka.stream._ +import akka.stream.Attributes.none import akka.stream.scaladsl._ -import akka.stream.testkit.TestSubscriber.Probe import akka.stream.testkit._ import akka.stream.testkit.StreamTestKit.ProbeSink +import akka.stream.testkit.TestSubscriber.Probe /** * Factory methods for test sinks. diff --git a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala index 08b80501e7..6f8cb7d932 100644 --- a/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala +++ b/akka-stream-testkit/src/main/scala/akka/stream/testkit/scaladsl/TestSource.scala @@ -4,14 +4,13 @@ package akka.stream.testkit.scaladsl +import akka.actor.ActorSystem import akka.stream._ import akka.stream.Attributes.none import akka.stream.scaladsl._ import akka.stream.testkit._ import akka.stream.testkit.StreamTestKit.ProbeSource -import akka.actor.ActorSystem - /** * Factory methods for test sources. */ diff --git a/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala b/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala index a6d4840240..892aba5753 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/impl/fusing/GraphInterpreterSpecKit.scala @@ -4,13 +4,19 @@ package akka.stream.impl.fusing +import scala.collection.{ Map => SMap } +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent + import akka.actor.ActorSystem import akka.actor.Cancellable import akka.actor.Props import akka.annotation.InternalApi import akka.event.Logging -import akka.stream.Supervision.Decider import akka.stream._ +import akka.stream.Supervision.Decider import akka.stream.impl.fusing.GraphInterpreter.{ Connection, DownstreamBoundaryStageLogic, @@ -20,11 +26,6 @@ import akka.stream.impl.fusing.GraphInterpreter.{ import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler, _ } import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils.TE -import com.github.ghik.silencer.silent - -import scala.collection.{ Map => SMap } -import scala.concurrent.ExecutionContextExecutor -import scala.concurrent.duration.FiniteDuration /** * INTERNAL API diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala index 64f65a9ef3..d2f43ab286 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/BaseTwoStreamsSetup.scala @@ -4,13 +4,14 @@ package akka.stream.testkit +import scala.collection.immutable +import scala.util.control.NoStackTrace + +import org.reactivestreams.Publisher + import akka.stream.scaladsl._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.AkkaSpec -import org.reactivestreams.Publisher - -import scala.collection.immutable -import scala.util.control.NoStackTrace abstract class BaseTwoStreamsSetup extends AkkaSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/ChainSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/ChainSetup.scala index 15cf1cb959..f9111af66a 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/ChainSetup.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/ChainSetup.scala @@ -4,6 +4,9 @@ package akka.stream.testkit +import com.github.ghik.silencer.silent +import org.reactivestreams.Publisher + import akka.NotUsed import akka.actor.ActorRefFactory import akka.actor.ActorSystem @@ -11,8 +14,6 @@ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.Materializer import akka.stream.scaladsl._ -import com.github.ghik.silencer.silent -import org.reactivestreams.Publisher class ChainSetup[In, Out, M]( stream: Flow[In, In, NotUsed] => Flow[In, Out, M], diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/ScriptedTest.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/ScriptedTest.scala index b241daacb7..06fe748099 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/ScriptedTest.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/ScriptedTest.scala @@ -5,26 +5,26 @@ package akka.stream.testkit import java.util.concurrent.ThreadLocalRandom +import java.util.concurrent.ThreadLocalRandom + +import scala.annotation.tailrec +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import org.reactivestreams.Publisher +import org.scalatest.matchers.should.Matchers import akka.NotUsed import akka.actor.ActorSystem import akka.stream.ActorMaterializerSettings import akka.stream.Materializer import akka.stream.SystemMaterializer +import akka.stream.SystemMaterializer import akka.stream.scaladsl.Flow import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.stream.testkit.TestPublisher._ import akka.stream.testkit.TestSubscriber._ -import org.reactivestreams.Publisher - -import scala.annotation.tailrec -import scala.concurrent.duration._ -import java.util.concurrent.ThreadLocalRandom - -import akka.stream.SystemMaterializer -import com.github.ghik.silencer.silent -import org.scalatest.matchers.should.Matchers trait ScriptedTest extends Matchers { diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamSpec.scala index 5a1c4932d7..728c2eb27a 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamSpec.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamSpec.scala @@ -4,15 +4,16 @@ package akka.stream.testkit +import scala.concurrent.Future +import scala.concurrent.duration._ + +import com.typesafe.config.{ Config, ConfigFactory } +import org.scalatest.Failed + import akka.actor.{ ActorRef, ActorSystem } import akka.stream.impl.StreamSupervisor import akka.stream.snapshot.{ MaterializerState, StreamSnapshotImpl } import akka.testkit.{ AkkaSpec, TestProbe } -import com.typesafe.config.{ Config, ConfigFactory } -import org.scalatest.Failed -import scala.concurrent.Future -import scala.concurrent.duration._ - import akka.testkit.TestKitUtils abstract class StreamSpec(_system: ActorSystem) extends AkkaSpec(_system) { diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala index 68c6666016..9405c6f9fd 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala @@ -4,15 +4,16 @@ package akka.stream.testkit -import akka.dispatch.ProducesMessageQueue -import akka.dispatch.UnboundedMailbox -import akka.dispatch.MessageQueue import com.typesafe.config.Config -import akka.actor.ActorSystem -import akka.dispatch.MailboxType + +import akka.actor.Actor import akka.actor.ActorRef import akka.actor.ActorRefWithCell -import akka.actor.Actor +import akka.actor.ActorSystem +import akka.dispatch.MailboxType +import akka.dispatch.MessageQueue +import akka.dispatch.ProducesMessageQueue +import akka.dispatch.UnboundedMailbox import akka.stream.impl.MaterializerGuardian /** diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala index e46fc20837..c2b0cf6328 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKitSpec.scala @@ -4,6 +4,8 @@ package akka.stream.testkit +import scala.concurrent.duration._ + import akka.stream.scaladsl.Source import akka.stream.testkit.scaladsl.TestSink import akka.testkit.AkkaSpec @@ -11,8 +13,6 @@ import akka.testkit.EventFilter import akka.testkit.TestEvent.Mute import akka.testkit.TestEvent.UnMute -import scala.concurrent.duration._ - class StreamTestKitSpec extends AkkaSpec { val ex = new Exception("Boom!") diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala index 59ee9b741b..77568fbd0d 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TestPublisherSubscriberSpec.scala @@ -4,13 +4,14 @@ package akka.stream.testkit +import org.reactivestreams.Subscription + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.stream.testkit.TestPublisher._ import akka.stream.testkit.TestSubscriber._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.AkkaSpec -import org.reactivestreams.Subscription class TestPublisherSubscriberSpec extends AkkaSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala index f82dd87626..b44f525f63 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/TwoStreamsSetup.scala @@ -4,9 +4,10 @@ package akka.stream.testkit +import org.reactivestreams.Publisher + import akka.stream._ import akka.stream.scaladsl._ -import org.reactivestreams.Publisher abstract class TwoStreamsSetup extends BaseTwoStreamsSetup { diff --git a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala index 44f885e8c5..f68444e8f8 100644 --- a/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala +++ b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Utils.scala @@ -4,10 +4,12 @@ package akka.stream.testkit +import scala.util.control.NoStackTrace + +import com.typesafe.config.ConfigFactory + import akka.actor.ActorRef import akka.actor.ActorRefWithCell -import com.typesafe.config.ConfigFactory -import scala.util.control.NoStackTrace object Utils { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala index 9252c0e273..bba6fdf605 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ActorSystemLifecycle.scala @@ -6,19 +6,20 @@ package akka.stream.tck import java.util.concurrent.TimeoutException +import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.ActorSystem -import akka.actor.ActorSystemImpl -import org.testng.annotations.AfterClass -import akka.testkit.AkkaSpec -import akka.event.Logging -import akka.testkit.TestEvent -import akka.testkit.EventFilter + import com.typesafe.config.Config import com.typesafe.config.ConfigFactory +import org.testng.annotations.AfterClass import org.testng.annotations.BeforeClass -import scala.concurrent.Await +import akka.actor.ActorSystem +import akka.actor.ActorSystemImpl +import akka.event.Logging +import akka.testkit.AkkaSpec +import akka.testkit.EventFilter +import akka.testkit.TestEvent trait ActorSystemLifecycle { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala index bfb1a33169..1c1258e753 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala @@ -4,16 +4,18 @@ package akka.stream.tck -import java.util.concurrent.Executors import java.util.concurrent.ExecutorService +import java.util.concurrent.Executors import java.util.concurrent.TimeUnit -import akka.stream.testkit.TestPublisher + import org.reactivestreams.{ Processor, Publisher, Subscriber, Subscription } import org.reactivestreams.tck.IdentityProcessorVerification import org.reactivestreams.tck.TestEnvironment import org.scalatestplus.testng.TestNGSuiteLike import org.testng.annotations.AfterClass +import akka.stream.testkit.TestPublisher + abstract class AkkaIdentityProcessorVerification[T](env: TestEnvironment, publisherShutdownTimeout: Long) extends IdentityProcessorVerification[T](env, publisherShutdownTimeout) with TestNGSuiteLike diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala index d787f878da..01e994450e 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala @@ -4,7 +4,8 @@ package akka.stream.tck -import akka.stream.testkit.TestPublisher +import scala.collection.immutable + import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.reactivestreams.Publisher @@ -12,7 +13,7 @@ import org.reactivestreams.tck.PublisherVerification import org.reactivestreams.tck.TestEnvironment import org.scalatestplus.testng.TestNGSuiteLike -import scala.collection.immutable +import akka.stream.testkit.TestPublisher abstract class AkkaPublisherVerification[T](val env: TestEnvironment, publisherShutdownTimeout: Long) extends PublisherVerification[T](env, publisherShutdownTimeout) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala index 31dadfa401..422ad457dc 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala @@ -4,12 +4,13 @@ package akka.stream.tck -import akka.actor.ActorSystem import org.reactivestreams.tck.SubscriberBlackboxVerification import org.reactivestreams.tck.SubscriberWhiteboxVerification import org.reactivestreams.tck.TestEnvironment import org.scalatestplus.testng.TestNGSuiteLike +import akka.actor.ActorSystem + abstract class AkkaSubscriberBlackboxVerification[T](env: TestEnvironment) extends SubscriberBlackboxVerification[T](env) with TestNGSuiteLike diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/CancelledSinkSubscriberTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/CancelledSinkSubscriberTest.scala index c850c79526..77b2817d5e 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/CancelledSinkSubscriberTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/CancelledSinkSubscriberTest.scala @@ -4,10 +4,11 @@ package akka.stream.tck -import akka.stream.scaladsl._ import org.reactivestreams.Subscriber import org.testng.SkipException +import akka.stream.scaladsl._ + class CancelledSinkSubscriberTest extends AkkaSubscriberBlackboxVerification[Int] { override def createSubscriber(): Subscriber[Int] = diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ConcatTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ConcatTest.scala index 75084ccdd2..fa954df087 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ConcatTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ConcatTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck +import org.reactivestreams.Publisher + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams.Publisher class ConcatTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala index 9c98f50ad2..1b13d95df1 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/EmptyPublisherTest.scala @@ -5,6 +5,7 @@ package akka.stream.tck import org.reactivestreams.Publisher + import akka.stream.impl.EmptyPublisher class EmptyPublisherTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FanoutPublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FanoutPublisherTest.scala index 2b1d613a1c..80d33582d3 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FanoutPublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FanoutPublisherTest.scala @@ -5,9 +5,11 @@ package akka.stream.tck import scala.collection.immutable + +import org.reactivestreams.Publisher + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams.Publisher class FanoutPublisherTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala index b635d749f1..7d1c8b16b7 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FilePublisherTest.scala @@ -5,15 +5,17 @@ package akka.stream.tck import java.nio.file.Files + +import org.reactivestreams.Publisher +import org.testng.annotations.{ AfterClass, BeforeClass } + import akka.actor.ActorSystem import akka.event.Logging import akka.stream.scaladsl.{ FileIO, Sink } import akka.stream.testkit.Utils._ import akka.testkit.{ EventFilter, TestEvent } -import akka.util.ByteString -import org.reactivestreams.Publisher -import org.testng.annotations.{ AfterClass, BeforeClass } import akka.testkit.AkkaSpec +import akka.util.ByteString class FilePublisherTest extends AkkaPublisherVerification[ByteString] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapConcatDoubleSubscriberTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapConcatDoubleSubscriberTest.scala index cfd1f99f27..846f8aaedb 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapConcatDoubleSubscriberTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapConcatDoubleSubscriberTest.scala @@ -4,11 +4,12 @@ package akka.stream.tck -import akka.stream.scaladsl.{ Sink, Source } +import scala.concurrent.{ Await, Promise } +import scala.concurrent.duration._ + import org.reactivestreams.{ Publisher, Subscriber } -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Promise } +import akka.stream.scaladsl.{ Sink, Source } class FlatMapConcatDoubleSubscriberTest extends AkkaSubscriberBlackboxVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapPrefixTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapPrefixTest.scala index a3d7caa0bd..ec005c050e 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapPrefixTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlatMapPrefixTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck -import akka.stream.scaladsl.{ Flow, Keep, Sink, Source } import org.reactivestreams.Publisher +import akka.stream.scaladsl.{ Flow, Keep, Sink, Source } + class FlatMapPrefixTest extends AkkaPublisherVerification[Int] { override def createPublisher(elements: Long): Publisher[Int] = { val publisher = Source(iterable(elements)) diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlattenTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlattenTest.scala index 45cad9e209..71e80b331a 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlattenTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FlattenTest.scala @@ -4,10 +4,11 @@ package akka.stream.tck +import org.reactivestreams.Publisher + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.util.ConstantFun -import org.reactivestreams.Publisher class FlattenTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FoldSinkSubscriberTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FoldSinkSubscriberTest.scala index e0befa8ffb..ff65ba1798 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FoldSinkSubscriberTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FoldSinkSubscriberTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck -import akka.stream.scaladsl._ import org.reactivestreams.Subscriber +import akka.stream.scaladsl._ + class FoldSinkSubscriberTest extends AkkaSubscriberBlackboxVerification[Int] { override def createSubscriber(): Subscriber[Int] = diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ForeachSinkSubscriberTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ForeachSinkSubscriberTest.scala index 1f33e051cb..a4ec583f48 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ForeachSinkSubscriberTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/ForeachSinkSubscriberTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck -import akka.stream.scaladsl._ import org.reactivestreams.Subscriber +import akka.stream.scaladsl._ + class ForeachSinkSubscriberTest extends AkkaSubscriberBlackboxVerification[Int] { override def createSubscriber(): Subscriber[Int] = diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala index 34948b4f6d..5653a95ff2 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FusableProcessorTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck +import org.reactivestreams.Processor + import akka.stream._ import akka.stream.scaladsl.Flow -import org.reactivestreams.Processor class FusableProcessorTest extends AkkaIdentityProcessorVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FuturePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FuturePublisherTest.scala index b3948d36a5..b49963ac93 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FuturePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/FuturePublisherTest.scala @@ -4,11 +4,12 @@ package akka.stream.tck -import akka.stream.scaladsl.Sink -import akka.stream.scaladsl.Source +import scala.concurrent.Promise + import org.reactivestreams._ -import scala.concurrent.Promise +import akka.stream.scaladsl.Sink +import akka.stream.scaladsl.Source class FuturePublisherTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/GroupByTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/GroupByTest.scala index 8e920424d8..e077292577 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/GroupByTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/GroupByTest.scala @@ -7,10 +7,11 @@ package akka.stream.tck import scala.concurrent.Await import scala.concurrent.duration._ +import org.reactivestreams.Publisher + import akka.stream.impl.EmptyPublisher import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams.Publisher class GroupByTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/InputStreamSourceTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/InputStreamSourceTest.scala index 50a00b19a3..928d04ec0f 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/InputStreamSourceTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/InputStreamSourceTest.scala @@ -6,10 +6,11 @@ package akka.stream.tck import java.io.InputStream +import org.reactivestreams.Publisher + import akka.stream.ActorAttributes import akka.stream.scaladsl.{ Sink, StreamConverters } import akka.util.ByteString -import org.reactivestreams.Publisher class InputStreamSourceTest extends AkkaPublisherVerification[ByteString] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala index b85839f810..79915ce912 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck +import org.reactivestreams._ + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams._ class IterablePublisherTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala index c81b50cf78..60c4aa6dfb 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MapTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck -import akka.stream.scaladsl.Flow import org.reactivestreams.Processor +import akka.stream.scaladsl.Flow + class MapTest extends AkkaIdentityProcessorVerification[Int] { override def createIdentityProcessor(maxBufferSize: Int): Processor[Int, Int] = { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala index 8c3cd6f270..7b466592c5 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/MaybeSourceTest.scala @@ -5,6 +5,7 @@ package akka.stream.tck import org.reactivestreams.Publisher + import akka.stream.scaladsl.{ Keep, Sink, Source } class MaybeSourceTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala index c9639595a0..0bf31269e7 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/PrefixAndTailTest.scala @@ -6,9 +6,11 @@ package akka.stream.tck import scala.concurrent.Await import scala.concurrent.duration._ + +import org.reactivestreams.Publisher + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams.Publisher class PrefixAndTailTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SingleElementSourceTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SingleElementSourceTest.scala index 509a21c08d..a9527ac4ec 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SingleElementSourceTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SingleElementSourceTest.scala @@ -4,11 +4,11 @@ package akka.stream.tck +import org.reactivestreams.Publisher + import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams.Publisher - class SingleElementSourceTest extends AkkaPublisherVerification[Int] { def createPublisher(elements: Long): Publisher[Int] = diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala index ebf90b0530..a049fbd5fc 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SinkholeSubscriberTest.scala @@ -4,14 +4,17 @@ package akka.stream.tck -import akka.Done -import akka.stream.impl.SinkholeSubscriber +import java.lang.{ Integer => JInt } + +import scala.concurrent.Promise + +import org.reactivestreams.{ Subscriber, Subscription } import org.reactivestreams.tck.{ SubscriberWhiteboxVerification, TestEnvironment } import org.reactivestreams.tck.SubscriberWhiteboxVerification.{ SubscriberPuppet, WhiteboxSubscriberProbe } -import org.scalatestplus.testng.{ TestNGSuiteLike } -import java.lang.{ Integer => JInt } -import scala.concurrent.Promise -import org.reactivestreams.{ Subscriber, Subscription } +import org.scalatestplus.testng.TestNGSuiteLike + +import akka.Done +import akka.stream.impl.SinkholeSubscriber class SinkholeSubscriberTest extends SubscriberWhiteboxVerification[JInt](new TestEnvironment()) with TestNGSuiteLike { override def createSubscriber(probe: WhiteboxSubscriberProbe[JInt]): Subscriber[JInt] = { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SplitWhenTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SplitWhenTest.scala index fdf35cb116..2337de9788 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SplitWhenTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/SplitWhenTest.scala @@ -7,10 +7,11 @@ package akka.stream.tck import scala.concurrent.Await import scala.concurrent.duration._ +import org.reactivestreams.Publisher + import akka.stream.impl.EmptyPublisher import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import org.reactivestreams.Publisher class SplitWhenTest extends AkkaPublisherVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala index afc4aca53b..66756a6612 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala @@ -4,13 +4,14 @@ package akka.stream.tck +import org.reactivestreams.Processor + import akka.stream.Attributes import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.scaladsl.Flow import akka.stream.stage.GraphStageLogic import akka.stream.stage.InHandler import akka.stream.stage.OutHandler -import org.reactivestreams.Processor class TransformProcessorTest extends AkkaIdentityProcessorVerification[Int] { diff --git a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/VirtualPublisherTest.scala b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/VirtualPublisherTest.scala index 1377ec7320..abad1e1789 100644 --- a/akka-stream-tests-tck/src/test/scala/akka/stream/tck/VirtualPublisherTest.scala +++ b/akka-stream-tests-tck/src/test/scala/akka/stream/tck/VirtualPublisherTest.scala @@ -4,9 +4,10 @@ package akka.stream.tck +import org.reactivestreams.Processor + import akka.stream.impl.VirtualProcessor import akka.stream.scaladsl.Flow -import org.reactivestreams.Processor class VirtualProcessorTest extends AkkaIdentityProcessorVerification[Int] { diff --git a/akka-stream-tests/src/test/scala-jdk9-only/akka/stream/scaladsl/FlowPublisherSinkSpec.scala b/akka-stream-tests/src/test/scala-jdk9-only/akka/stream/scaladsl/FlowPublisherSinkSpec.scala index 725e008c19..12728bb9cd 100644 --- a/akka-stream-tests/src/test/scala-jdk9-only/akka/stream/scaladsl/FlowPublisherSinkSpec.scala +++ b/akka-stream-tests/src/test/scala-jdk9-only/akka/stream/scaladsl/FlowPublisherSinkSpec.scala @@ -4,14 +4,13 @@ package akka.stream.scaladsl -import akka.stream.testkit.StreamSpec -import akka.stream.ClosedShape - -import akka.stream.testkit.Utils._ -import akka.stream.testkit.scaladsl.StreamTestKit._ +import scala.concurrent.Await import scala.concurrent.duration._ -import scala.concurrent.Await +import akka.stream.ClosedShape +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowPublisherSinkSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala index 37fe7a67c8..aa377df3b0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/ActorMaterializerSpec.scala @@ -4,26 +4,27 @@ package akka.stream -import akka.Done -import akka.actor.ExtendedActorSystem -import akka.actor.Extension -import akka.actor.ExtensionId -import akka.actor.ExtensionIdProvider -import akka.actor.{ Actor, ActorSystem, PoisonPill, Props } -import akka.stream.ActorMaterializerSpec.ActorWithMaterializer -import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } -import akka.stream.scaladsl.{ Sink, Source } -import akka.stream.testkit.{ StreamSpec, TestPublisher } -import akka.testkit.TestKit -import akka.testkit.{ ImplicitSender, TestProbe } -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory - import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.{ Failure, Try } +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.Done +import akka.actor.{ Actor, ActorSystem, PoisonPill, Props } +import akka.actor.ExtendedActorSystem +import akka.actor.Extension +import akka.actor.ExtensionId +import akka.actor.ExtensionIdProvider +import akka.stream.ActorMaterializerSpec.ActorWithMaterializer +import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } +import akka.stream.scaladsl.{ Sink, Source } +import akka.stream.testkit.{ StreamSpec, TestPublisher } +import akka.testkit.{ ImplicitSender, TestProbe } +import akka.testkit.TestKit + object IndirectMaterializerCreation extends ExtensionId[IndirectMaterializerCreation] with ExtensionIdProvider { def createExtension(system: ExtendedActorSystem): IndirectMaterializerCreation = new IndirectMaterializerCreation(system) diff --git a/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala index 2a86584d1a..69584caad2 100755 --- a/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala @@ -6,6 +6,7 @@ package akka.stream import java.lang.reflect.Method import java.lang.reflect.Modifier + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-stream-tests/src/test/scala/akka/stream/StreamAttributeDocSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/StreamAttributeDocSpec.scala index 964711bb53..30bd902445 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/StreamAttributeDocSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/StreamAttributeDocSpec.scala @@ -4,6 +4,8 @@ package akka.stream +import scala.concurrent.Future + import akka.Done import akka.stream.scaladsl.Keep import akka.stream.scaladsl.RunnableGraph @@ -12,8 +14,6 @@ import akka.stream.scaladsl.Source import akka.stream.scaladsl.TcpAttributes import akka.stream.testkit.StreamSpec -import scala.concurrent.Future - class StreamAttributeDocSpec extends StreamSpec("my-stream-dispatcher = \"akka.test.stream-dispatcher\"") { "Setting attributes on the runnable stream" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/SystemMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/SystemMaterializerSpec.scala index 8be2ba12b0..ef5e9aa02b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/SystemMaterializerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/SystemMaterializerSpec.scala @@ -4,13 +4,14 @@ package akka.stream +import scala.concurrent.Future + +import org.scalatest.concurrent.ScalaFutures + import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.stream.testkit.StreamSpec -import org.scalatest.concurrent.ScalaFutures - -import scala.concurrent.Future class SystemMaterializerSpec extends StreamSpec with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala index a8d4c9df6f..0c2350ae39 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala @@ -4,11 +4,12 @@ package akka.stream.impl +import com.github.ghik.silencer.silent + import akka.stream.ActorAttributes import akka.stream.ActorAttributes.MaxFixedBufferSize import akka.stream.ActorMaterializerSettings import akka.stream.testkit.StreamSpec -import com.github.ghik.silencer.silent @silent("deprecated") class FixedBufferSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala index a1c12a46bf..228325a023 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala @@ -4,18 +4,19 @@ package akka.stream.impl -import akka.NotUsed -import akka.stream.stage.GraphStageLogic.{ EagerTerminateInput, EagerTerminateOutput } -import akka.stream.testkit.StreamSpec -import akka.stream._ -import akka.stream.scaladsl._ -import akka.stream.stage._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.impl.fusing._ +import scala.concurrent.duration.Duration + import org.scalatest.concurrent.ScalaFutures -import scala.concurrent.duration.Duration +import akka.NotUsed +import akka.stream._ +import akka.stream.impl.fusing._ +import akka.stream.scaladsl._ +import akka.stream.stage._ +import akka.stream.stage.GraphStageLogic.{ EagerTerminateInput, EagerTerminateOutput } +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink class GraphStageLogicSpec extends StreamSpec with GraphInterpreterSpecKit with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala index 4780ec6c21..fc448ff22f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala @@ -5,10 +5,12 @@ package akka.stream.impl import scala.util.Random -import akka.stream.impl.ResizableMultiReaderRingBuffer._ + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.stream.impl.ResizableMultiReaderRingBuffer._ + class ResizableMultiReaderRingBufferSpec extends AnyWordSpec with Matchers { "A ResizableMultiReaderRingBuffer" should { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala index 1c55664039..87ddd384a9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/TimeoutsSpec.scala @@ -6,6 +6,13 @@ package akka.stream.impl import java.util.concurrent.TimeoutException +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.stream._ import akka.stream.scaladsl._ @@ -15,12 +22,6 @@ import akka.stream.testkit.TestSubscriber import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ -import org.scalatest.matchers.should.Matchers -import org.scalatest.wordspec.AnyWordSpecLike - class TimeoutsSpec extends StreamSpec { "InitialTimeout" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/TraversalTestUtils.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/TraversalTestUtils.scala index 1ef57980eb..dfa26241fa 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/TraversalTestUtils.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/TraversalTestUtils.scala @@ -5,8 +5,8 @@ package akka.stream.impl import akka.NotUsed -import akka.stream.impl.StreamLayout.AtomicModule import akka.stream._ +import akka.stream.impl.StreamLayout.AtomicModule object TraversalTestUtils { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala index 0521b534db..446eb41ba5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ActorGraphInterpreterSpec.scala @@ -6,6 +6,14 @@ package akka.stream.impl.fusing import java.util.concurrent.CountDownLatch +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 akka.Done import akka.stream._ import akka.stream.impl.ReactiveStreamsCompliance.SpecViolation @@ -22,13 +30,6 @@ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.EventFilter import akka.testkit.TestLatch -import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber -import org.reactivestreams.Subscription - -import scala.concurrent.Await -import scala.concurrent.Promise -import scala.concurrent.duration._ class ActorGraphInterpreterSpec extends StreamSpec { "ActorGraphInterpreter" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/AsyncCallbackSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/AsyncCallbackSpec.scala index 2ef97b28cf..be230f9f08 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/AsyncCallbackSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/AsyncCallbackSpec.scala @@ -4,6 +4,11 @@ package akka.stream.impl.fusing +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.language.reflectiveCalls + import akka.Done import akka.actor.ActorRef import akka.stream._ @@ -11,17 +16,12 @@ import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source import akka.stream.stage._ -import akka.stream.testkit.Utils.TE import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.Utils.TE import akka.testkit.AkkaSpec import akka.testkit.TestProbe -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.Promise -import scala.language.reflectiveCalls - class AsyncCallbackSpec extends AkkaSpec(""" akka.stream.materializer.debug.fuzzing-mode = off """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ChasingEventsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ChasingEventsSpec.scala index 7880cdcb61..540753f697 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ChasingEventsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/ChasingEventsSpec.scala @@ -11,9 +11,9 @@ import akka.stream.stage.GraphStage import akka.stream.stage.GraphStageLogic import akka.stream.stage.InHandler import akka.stream.stage.OutHandler -import akka.stream.testkit.Utils.TE import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.Utils.TE import akka.testkit.AkkaSpec class ChasingEventsSpec extends AkkaSpec(""" diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala index 581d0e5d60..f3f0b6191f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSpec.scala @@ -4,13 +4,14 @@ package akka.stream.impl.fusing +import com.github.ghik.silencer.silent + +import akka.stream._ +import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage._ import akka.stream.testkit.StreamSpec import akka.testkit.EventFilter -import akka.stream._ -import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.util.ConstantFun -import com.github.ghik.silencer.silent class InterpreterSpec extends StreamSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala index 91fc061208..c5ba892fc1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/InterpreterSupervisionSpec.scala @@ -4,10 +4,10 @@ package akka.stream.impl.fusing -import akka.stream.testkit.StreamSpec - import scala.util.control.NoStackTrace + import akka.stream.Supervision +import akka.stream.testkit.StreamSpec class InterpreterSupervisionSpec extends StreamSpec with GraphInterpreterSpecKit { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala index 239cab0e06..012cae8c34 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/KeepGoingStageSpec.scala @@ -4,8 +4,16 @@ package akka.stream.impl.fusing +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.concurrent.duration._ + import akka.actor.ActorRef import akka.actor.NoSerializationVerificationNeeded +import akka.stream.Attributes +import akka.stream.Inlet +import akka.stream.SinkShape import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Source import akka.stream.stage.AsyncCallback @@ -15,14 +23,6 @@ import akka.stream.stage.InHandler import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.Attributes -import akka.stream.Inlet -import akka.stream.SinkShape - -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.Promise class KeepGoingStageSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala index 59787868d9..4683b7ea68 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/impl/fusing/LifecycleInterpreterSpec.scala @@ -4,14 +4,14 @@ package akka.stream.impl.fusing +import scala.concurrent.duration._ + import akka.stream.Attributes import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage._ import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils.TE -import scala.concurrent.duration._ - class LifecycleInterpreterSpec extends StreamSpec with GraphInterpreterSpecKit { val boom = TE("Boom!") diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/ByteStringParserSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/ByteStringParserSpec.scala index 8c18ba8d9b..ea75420e40 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/ByteStringParserSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/ByteStringParserSpec.scala @@ -4,6 +4,11 @@ package akka.stream.io +import scala.concurrent.Await +import scala.concurrent.duration._ + +import akka.stream.Attributes +import akka.stream.ThrottleMode import akka.stream.impl.io.ByteStringParser import akka.stream.impl.io.ByteStringParser.ByteReader import akka.stream.impl.io.ByteStringParser.ParseResult @@ -14,13 +19,8 @@ import akka.stream.stage.GraphStageLogic import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber -import akka.stream.Attributes -import akka.stream.ThrottleMode import akka.util.ByteString -import scala.concurrent.Await -import scala.concurrent.duration._ - class ByteStringParserSpec extends StreamSpec { "ByteStringParser" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/DeprecatedTlsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/DeprecatedTlsSpec.scala index d5c6fc13c4..4cc4629313 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/DeprecatedTlsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/DeprecatedTlsSpec.scala @@ -15,22 +15,23 @@ import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Random +import com.github.ghik.silencer.silent +import com.typesafe.sslconfig.akka.AkkaSSLConfig +import javax.net.ssl._ + import akka.NotUsed import akka.pattern.{ after => later } -import akka.stream.TLSProtocol._ import akka.stream._ +import akka.stream.TLSProtocol._ import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.scaladsl._ import akka.stream.stage._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.testkit.WithLogCapturing import akka.testkit.TestDuration +import akka.testkit.WithLogCapturing import akka.util.ByteString import akka.util.JavaVersion -import com.github.ghik.silencer.silent -import com.typesafe.sslconfig.akka.AkkaSSLConfig -import javax.net.ssl._ object DeprecatedTlsSpec { @@ -98,8 +99,8 @@ object DeprecatedTlsSpec { @silent("deprecated") class DeprecatedTlsSpec extends StreamSpec(DeprecatedTlsSpec.configOverrides) with WithLogCapturing { - import GraphDSL.Implicits._ import DeprecatedTlsSpec._ + import GraphDSL.Implicits._ import system.dispatcher val sslConfig: Option[AkkaSSLConfig] = None // no special settings to be applied here diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala index 528d2f274b..721d4ecd50 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSinkSpec.scala @@ -4,26 +4,27 @@ package akka.stream.io -import java.nio.file.StandardOpenOption.{ CREATE, WRITE } import java.nio.file._ +import java.nio.file.StandardOpenOption.{ CREATE, WRITE } + +import scala.collection.mutable.ListBuffer +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ +import scala.util.Success + +import com.github.ghik.silencer.silent +import com.google.common.jimfs.{ Configuration, Jimfs } +import org.scalatest.concurrent.ScalaFutures import akka.dispatch.ExecutionContexts import akka.stream._ import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } import akka.stream.impl.StreamSupervisor.Children import akka.stream.scaladsl.{ FileIO, Keep, Sink, Source } -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.util.ByteString -import com.github.ghik.silencer.silent -import com.google.common.jimfs.{ Configuration, Jimfs } -import org.scalatest.concurrent.ScalaFutures - -import scala.collection.mutable.ListBuffer -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Future } -import scala.util.Success @silent class FileSinkSpec extends StreamSpec(UnboundedMailboxConfig) with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala index 238fda129b..773e33d31f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/FileSourceSpec.scala @@ -8,24 +8,24 @@ import java.nio.charset.StandardCharsets.UTF_8 import java.nio.file.{ Files, NoSuchFileException } import java.util.Random +import scala.concurrent.Future +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.google.common.jimfs.{ Configuration, Jimfs } + import akka.actor.ActorSystem -import akka.stream.IOResult._ import akka.stream._ +import akka.stream.IOResult._ import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } import akka.stream.impl.StreamSupervisor.Children import akka.stream.io.FileSourceSpec.Settings import akka.stream.scaladsl.{ FileIO, Keep, Sink } +import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.util.ByteString -import com.google.common.jimfs.{ Configuration, Jimfs } - -import scala.concurrent.duration._ -import com.github.ghik.silencer.silent - -import scala.concurrent.Future object FileSourceSpec { final case class Settings(chunkSize: Int, readAhead: Int) diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala index 652c018565..fe40010579 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSinkSpec.scala @@ -9,8 +9,13 @@ import java.io.InputStream import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.TimeoutException -import akka.stream.Attributes.inputBuffer +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.stream._ +import akka.stream.Attributes.inputBuffer import akka.stream.impl.PhasedFusingActorMaterializer import akka.stream.impl.StreamSupervisor import akka.stream.impl.StreamSupervisor.Children @@ -18,18 +23,13 @@ import akka.stream.impl.io.InputStreamSinkStage import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Source import akka.stream.scaladsl.StreamConverters -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSource import akka.testkit.TestProbe import akka.util.ByteString -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace - class InputStreamSinkSpec extends StreamSpec(UnboundedMailboxConfig) { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala index a6521e6bc2..ccb27bec6c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/InputStreamSourceSpec.scala @@ -7,18 +7,19 @@ package akka.stream.io import java.io.{ ByteArrayInputStream, InputStream } import java.util.concurrent.CountDownLatch +import scala.util.Success + +import com.github.ghik.silencer.silent + import akka.Done +import akka.stream.{ AbruptStageTerminationException, ActorMaterializer, ActorMaterializerSettings, IOResult } import akka.stream.scaladsl.{ Keep, Sink, StreamConverters } import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import akka.stream.{ AbruptStageTerminationException, ActorMaterializer, ActorMaterializerSettings, IOResult } import akka.util.ByteString -import scala.util.Success -import com.github.ghik.silencer.silent - @silent class InputStreamSourceSpec extends StreamSpec(UnboundedMailboxConfig) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala index 832265823e..683285c0b1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSinkSpec.scala @@ -6,18 +6,19 @@ package akka.stream.io import java.io.OutputStream +import scala.util.Success + +import com.github.ghik.silencer.silent +import org.scalatest.concurrent.ScalaFutures + import akka.Done +import akka.stream.{ ActorMaterializer, ActorMaterializerSettings, IOOperationIncompleteException } import akka.stream.scaladsl.{ Source, StreamConverters } import akka.stream.testkit._ import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.{ ActorMaterializer, ActorMaterializerSettings, IOOperationIncompleteException } import akka.testkit.TestProbe import akka.util.ByteString -import org.scalatest.concurrent.ScalaFutures -import com.github.ghik.silencer.silent - -import scala.util.Success @silent class OutputStreamSinkSpec extends StreamSpec(UnboundedMailboxConfig) with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala index afebdb7fd3..06fe3ab2e0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/OutputStreamSourceSpec.scala @@ -8,24 +8,24 @@ import java.io.IOException import java.lang.management.ManagementFactory import java.util.concurrent.TimeoutException -import akka.stream.Attributes.inputBuffer +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.concurrent.duration.Duration.Zero +import scala.util.Random + import akka.stream._ +import akka.stream.Attributes.inputBuffer import akka.stream.impl.io.OutputStreamSourceStage import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.StreamConverters -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.util.ByteString -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration.Duration.Zero -import scala.concurrent.duration._ -import scala.util.Random - class OutputStreamSourceSpec extends StreamSpec(UnboundedMailboxConfig) { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala index c1f9bec7e4..010aa52efc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala @@ -6,19 +6,19 @@ package akka.stream.io import java.net.InetSocketAddress +import scala.collection.immutable.Queue +import scala.concurrent.duration._ + import akka.actor._ -import akka.io.Tcp.ConnectionClosed -import akka.io.Tcp.ResumeReading import akka.io.IO import akka.io.Tcp +import akka.io.Tcp.ConnectionClosed +import akka.io.Tcp.ResumeReading import akka.stream.testkit._ import akka.testkit.SocketUtil.temporaryServerAddress import akka.testkit.TestProbe import akka.util.ByteString -import scala.collection.immutable.Queue -import scala.concurrent.duration._ - object TcpHelper { case class ClientWrite(bytes: ByteString) extends NoSerializationVerificationNeeded case class ClientRead(count: Int, readTo: ActorRef) extends NoSerializationVerificationNeeded diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala index 3288c8523f..85d7eebcbc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala @@ -8,6 +8,20 @@ import java.net._ import java.security.SecureRandom import java.util.concurrent.atomic.AtomicInteger +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.ExecutionContext +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory +import org.scalatest.concurrent.PatienceConfiguration +import org.scalatest.concurrent.PatienceConfiguration.Timeout + import akka.Done import akka.NotUsed import akka.actor.Actor @@ -23,10 +37,10 @@ import akka.io.SimpleDnsCache import akka.io.Tcp._ import akka.io.dns.DnsProtocol import akka.stream._ +import akka.stream.scaladsl._ import akka.stream.scaladsl.Flow import akka.stream.scaladsl.Tcp.IncomingConnection import akka.stream.scaladsl.Tcp.ServerBinding -import akka.stream.scaladsl._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.EventFilter @@ -36,19 +50,6 @@ import akka.testkit.TestLatch import akka.testkit.TestProbe import akka.testkit.WithLogCapturing import akka.util.ByteString -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory -import org.scalatest.concurrent.PatienceConfiguration -import org.scalatest.concurrent.PatienceConfiguration.Timeout - -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.ExecutionContext -import scala.concurrent.Future -import scala.concurrent.Promise -import scala.concurrent.duration._ -import com.github.ghik.silencer.silent @silent("never used") class NonResolvingDnsActor(cache: SimpleDnsCache, config: Config) extends Actor { @@ -920,10 +921,12 @@ class TcpSpec extends StreamSpec(""" // #setting-up-ssl-engine import java.security.KeyStore - import javax.net.ssl.SSLEngine - import javax.net.ssl.TrustManagerFactory + import javax.net.ssl.KeyManagerFactory import javax.net.ssl.SSLContext + import javax.net.ssl.SSLEngine + import javax.net.ssl.TrustManagerFactory + import akka.stream.TLSRole // initialize SSLContext once @@ -1008,11 +1011,12 @@ class TcpSpec extends StreamSpec(""" // #setting-up-ssl-context import java.security.KeyStore - import akka.stream.TLSClientAuth - import akka.stream.TLSProtocol import com.typesafe.sslconfig.akka.AkkaSSLConfig import javax.net.ssl._ + import akka.stream.TLSClientAuth + import akka.stream.TLSProtocol + val sslConfig = AkkaSSLConfig() // Don't hardcode your password in actual code diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala index 2902eff337..b8f3f014eb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/TlsSpec.scala @@ -9,25 +9,26 @@ import java.security.SecureRandom import java.security.cert.CertificateException import java.util.concurrent.TimeoutException -import akka.NotUsed import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ import scala.util.Random +import javax.net.ssl._ + +import akka.NotUsed import akka.pattern.{ after => later } import akka.stream._ import akka.stream.TLSProtocol._ +import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.scaladsl._ import akka.stream.stage._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestDuration -import akka.util.{ ByteString, JavaVersion } -import javax.net.ssl._ -import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.testkit.WithLogCapturing +import akka.util.{ ByteString, JavaVersion } object TlsSpec { @@ -97,11 +98,9 @@ object TlsSpec { } class TlsSpec extends StreamSpec(TlsSpec.configOverrides) with WithLogCapturing { - import TlsSpec._ - - import system.dispatcher - import GraphDSL.Implicits._ + import TlsSpec._ + import system.dispatcher "SslTls" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/compression/CodecSpecSupport.scala b/akka-stream-tests/src/test/scala/akka/stream/io/compression/CodecSpecSupport.scala index d11e8030e3..2b4b3f5994 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/compression/CodecSpecSupport.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/compression/CodecSpecSupport.scala @@ -4,13 +4,14 @@ package akka.stream.io.compression -import akka.actor.ActorSystem -import akka.testkit.TestKit -import akka.util.ByteString import org.scalatest.BeforeAndAfterAll import org.scalatest.Suite import org.scalatest.matchers.should.Matchers +import akka.actor.ActorSystem +import akka.testkit.TestKit +import akka.util.ByteString + trait CodecSpecSupport extends Matchers with BeforeAndAfterAll { self: Suite => def readAs(string: String, charset: String = "UTF8") = diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/compression/CoderSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/compression/CoderSpec.scala index 6c54b6ff05..dae319a6b5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/compression/CoderSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/compression/CoderSpec.scala @@ -8,18 +8,19 @@ import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, Outpu import java.util.concurrent.ThreadLocalRandom import java.util.zip.DataFormatException -import akka.NotUsed -import akka.stream.impl.io.compression.Compressor -import akka.stream.scaladsl.{ Compression, Flow, Sink, Source } -import akka.util.ByteString -import org.scalatest.Inspectors -import org.scalatest.wordspec.AnyWordSpec - import scala.annotation.tailrec import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import org.scalatest.Inspectors +import org.scalatest.wordspec.AnyWordSpec + +import akka.NotUsed +import akka.stream.impl.io.compression.Compressor +import akka.stream.scaladsl.{ Compression, Flow, Sink, Source } +import akka.util.ByteString + abstract class CoderSpec(codecName: String) extends AnyWordSpec with CodecSpecSupport with Inspectors { import CompressionTestingTools._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/compression/CompressionTestingTools.scala b/akka-stream-tests/src/test/scala/akka/stream/io/compression/CompressionTestingTools.scala index 7d35e18c6b..5876b79ca9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/io/compression/CompressionTestingTools.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/io/compression/CompressionTestingTools.scala @@ -4,16 +4,16 @@ package akka.stream.io.compression -import akka.stream.Materializer -import akka.stream.scaladsl.Source -import akka.util.ByteString -import akka.util.ccompat._ - import scala.annotation.tailrec import scala.concurrent.{ Await, ExecutionContext, Future } import scala.concurrent.duration.Duration import scala.util.{ Failure, Success } +import akka.stream.Materializer +import akka.stream.scaladsl.Source +import akka.util.ByteString +import akka.util.ccompat._ + // a few useful helpers copied over from akka-http @ccompatUsedUntil213 object CompressionTestingTools { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala index 31c64f483a..bf69d4349f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSinkSpec.scala @@ -4,17 +4,17 @@ package akka.stream.scaladsl +import scala.concurrent.Promise +import scala.concurrent.duration._ + import akka.actor.{ Actor, ActorRef, Props } import akka.stream.Attributes.inputBuffer import akka.stream.Materializer import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl._ +import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestProbe -import scala.concurrent.Promise -import scala.concurrent.duration._ - object ActorRefBackpressureSinkSpec { val initMessage = "start" val completeMessage = "done" diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSourceSpec.scala index aa42160e2a..738b7ab88b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefBackpressureSourceSpec.scala @@ -4,16 +4,16 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.actor.Status +import akka.stream.CompletionStrategy +import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils.TE import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped import akka.stream.testkit.scaladsl.TestSink -import akka.stream.CompletionStrategy -import akka.stream.testkit.StreamSpec import akka.testkit.TestProbe -import scala.concurrent.duration._ - private object ActorRefBackpressureSourceSpec { case object AckMsg } diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala index 363313e89e..5e08a69d13 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSinkSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.actor.{ Actor, ActorRef, Props } import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl._ +import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestProbe -import scala.util.control.NoStackTrace - object ActorRefSinkSpec { case class Fw(ref: ActorRef) extends Actor { def receive = { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala index 8b4eb9b5d4..4fad4641c1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ActorRefSourceSpec.scala @@ -4,16 +4,17 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + +import org.reactivestreams.Publisher + import akka.Done import akka.actor.{ ActorRef, PoisonPill, Status } import akka.stream.{ OverflowStrategy, _ } -import akka.stream.testkit.Utils._ import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl._ -import org.reactivestreams.Publisher - -import scala.concurrent.duration._ +import akka.stream.testkit.scaladsl.StreamTestKit._ class ActorRefSourceSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala index c3460d3a26..65d4107889 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/AttributesSpec.scala @@ -6,17 +6,18 @@ package akka.stream.scaladsl import java.util.concurrent.{ CompletionStage, TimeUnit } +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory + +import akka.{ Done, NotUsed } import akka.actor.ActorSystem import akka.dispatch.Dispatchers -import akka.{ Done, NotUsed } -import akka.stream.Attributes._ import akka.stream._ +import akka.stream.Attributes._ import akka.stream.javadsl import akka.stream.stage._ import akka.stream.testkit._ import akka.testkit.TestKit -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory object AttributesSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala index 774486a7fd..8725572339 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/BidiFlowSpec.scala @@ -4,16 +4,17 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent + import akka.NotUsed +import akka.stream._ import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.util.ByteString -import akka.stream._ -import com.github.ghik.silencer.silent - -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.collection.immutable @silent // tests deprecated APIs class BidiFlowSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CancellationStrategySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CancellationStrategySpec.scala index d652853c29..2903cd6bcb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CancellationStrategySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CancellationStrategySpec.scala @@ -4,6 +4,8 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.NotUsed import akka.stream.Attributes import akka.stream.Attributes.CancellationStrategy @@ -26,10 +28,8 @@ import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber import akka.stream.testkit.Utils.TE -import akka.testkit.WithLogCapturing import akka.testkit._ - -import scala.concurrent.duration._ +import akka.testkit.WithLogCapturing class CancellationStrategySpec extends StreamSpec("""akka.loglevel = DEBUG akka.loggers = ["akka.testkit.SilenceAllTestEventListener"]""") with WithLogCapturing { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CollectionSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CollectionSinkSpec.scala index b8c23c1dde..03a248c09b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CollectionSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CollectionSinkSpec.scala @@ -4,15 +4,15 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.Future + import akka.stream.AbruptTerminationException import akka.stream.Materializer import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.Future - class CollectionSinkSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CoupledTerminationFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CoupledTerminationFlowSpec.scala index e17380659c..4e65343b27 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CoupledTerminationFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/CoupledTerminationFlowSpec.scala @@ -4,23 +4,24 @@ package akka.stream.scaladsl -import akka.stream._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.TestSource -import akka.testkit.TestProbe -import akka.Done -import akka.NotUsed -import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber -import org.reactivestreams.Subscription -import org.scalatest.Assertion - import scala.concurrent.Future import scala.util.Failure 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 akka.Done +import akka.NotUsed +import akka.stream._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.TestSource +import akka.testkit.TestProbe + class CoupledTerminationFlowSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FailedSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FailedSourceSpec.scala index 4200114dcb..ed598e2fcf 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FailedSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FailedSourceSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestSubscriber import akka.testkit.DefaultTimeout -import scala.util.control.NoStackTrace - class FailedSourceSpec extends StreamSpec with DefaultTimeout { "The Failed Source" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala index d21e5f4db4..125a9db2ca 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAppendSpec.scala @@ -4,11 +4,12 @@ package akka.stream.scaladsl +import org.reactivestreams.Subscriber +import org.scalatest.matchers.should.Matchers + import akka.actor.ActorSystem import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestSubscriber -import org.reactivestreams.Subscriber -import org.scalatest.matchers.should.Matchers class FlowAppendSpec extends StreamSpec with River { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala index 468b0877bb..f4cd330de2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowAskSpec.scala @@ -6,24 +6,24 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.reflect.ClassTag + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.PoisonPill import akka.actor.Props +import akka.stream.ActorAttributes import akka.stream.ActorAttributes.supervisionStrategy +import akka.stream.Supervision import akka.stream.Supervision.resumingDecider import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.ActorAttributes -import akka.stream.Supervision import akka.testkit.TestActors import akka.testkit.TestProbe -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.reflect.ClassTag - object FlowAskSpec { case class Reply(payload: Int) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala index 27269a305b..d1b1f05cc1 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchSpec.scala @@ -6,12 +6,12 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom -import akka.stream.OverflowStrategy -import akka.stream.testkit._ - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream.OverflowStrategy +import akka.stream.testkit._ + class FlowBatchSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala index f701826d6d..a03aea17cc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBatchWeightedSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl -import akka.stream.testkit._ - import scala.concurrent.duration._ +import akka.stream.testkit._ + class FlowBatchWeightedSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala index b6558e2494..bfaa9653ca 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowBufferSpec.scala @@ -4,16 +4,16 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl._ -import akka.stream.BufferOverflowException -import akka.stream.OverflowStrategy - import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ +import akka.stream.BufferOverflowException +import akka.stream.OverflowStrategy +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowBufferSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 1 akka.stream.materializer.max-input-buffer-size = 1 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala index 728726a1e7..a41a7a509a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowCompileSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl -import akka.NotUsed -import akka.stream.testkit.StreamSpec +import scala.collection.immutable.Seq +import scala.concurrent.Future + import com.github.ghik.silencer.silent import org.reactivestreams.Publisher -import scala.collection.immutable.Seq -import scala.concurrent.Future +import akka.NotUsed +import akka.stream.testkit.StreamSpec @silent // unused vars are used in shouldNot compile tests class FlowCompileSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala index 3eae7ce879..5cedcc73fb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatAllSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.NotUsed import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.util.ConstantFun -import scala.util.control.NoStackTrace - class FlowConcatAllSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala index cade0be9e0..2e7134f8c8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConcatSpec.scala @@ -4,14 +4,15 @@ package akka.stream.scaladsl -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.{ BaseTwoStreamsSetup, TestPublisher, TestSubscriber } +import scala.concurrent.{ Await, Promise } +import scala.concurrent.duration._ + import org.reactivestreams.Publisher -import scala.concurrent.duration._ -import scala.concurrent.{ Await, Promise } import akka.NotUsed +import akka.stream.testkit.{ BaseTwoStreamsSetup, TestPublisher, TestSubscriber } +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink class FlowConcatSpec extends BaseTwoStreamsSetup { @@ -195,8 +196,8 @@ class FlowConcatSpec extends BaseTwoStreamsSetup { "work in example" in { //#concat - import akka.stream.scaladsl.Source import akka.stream.scaladsl.Sink + import akka.stream.scaladsl.Source val sourceA = Source(List(1, 2, 3, 4)) val sourceB = Source(List(10, 20, 30, 40)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala index 9c052310bd..266812e48e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowConflateSpec.scala @@ -6,18 +6,18 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.Await +import scala.concurrent.duration._ + +import akka.stream._ import akka.stream.ActorAttributes.supervisionStrategy import akka.stream.Attributes.inputBuffer import akka.stream.Supervision.restartingDecider import akka.stream.Supervision.resumingDecider -import akka.stream._ -import akka.stream.testkit.Utils.TE import akka.stream.testkit._ +import akka.stream.testkit.Utils.TE import akka.testkit.TestLatch -import scala.concurrent.Await -import scala.concurrent.duration._ - class FlowConflateSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala index f6c9bb8db0..a3f72b7612 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDelaySpec.scala @@ -4,24 +4,25 @@ package akka.stream.scaladsl -import akka.Done -import akka.stream.Attributes._ -import akka.stream.OverflowStrategies.EmitEarly -import akka.stream._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber -import akka.testkit.TimingTest -import akka.testkit.TestDuration +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import org.scalatest.concurrent.PatienceConfiguration import org.scalatest.time.Milliseconds import org.scalatest.time.Span -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace +import akka.Done +import akka.stream._ +import akka.stream.Attributes._ +import akka.stream.OverflowStrategies.EmitEarly +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink +import akka.testkit.TestDuration +import akka.testkit.TimingTest class FlowDelaySpec extends StreamSpec { @@ -172,9 +173,10 @@ class FlowDelaySpec extends StreamSpec { } "properly delay according to buffer size" taggedAs TimingTest in { - import akka.pattern.pipe import system.dispatcher + import akka.pattern.pipe + // With a buffer size of 1, delays add up Source(1 to 5) .delay(500.millis, DelayOverflowStrategy.backpressure) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala index c1dc0c417b..48023e1458 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDetacherSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import scala.concurrent.Await -import scala.concurrent.duration._ - class FlowDetacherSpec extends StreamSpec { "A Detacher" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala index 5a36b8263f..b4c5b8266d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDispatcherSpec.scala @@ -4,11 +4,12 @@ package akka.stream.scaladsl +import com.github.ghik.silencer.silent + import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit.StreamSpec import akka.testkit.TestProbe -import com.github.ghik.silencer.silent @silent("deprecated") class FlowDispatcherSpec extends StreamSpec(s"my-dispatcher = $${akka.test.stream-dispatcher}") { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala index 2bf76cf82e..5fa8e2149a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWhileSpec.scala @@ -6,8 +6,8 @@ package akka.stream.scaladsl import akka.stream.ActorAttributes._ import akka.stream.Supervision._ -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala index 57d3e54222..cffd47b7f7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowDropWithinSpec.scala @@ -4,10 +4,10 @@ package akka.stream.scaladsl -import akka.stream.testkit._ - import scala.concurrent.duration._ +import akka.stream.testkit._ + class FlowDropWithinSpec extends StreamSpec { "A DropWithin" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala index ea1ec95052..e9e1523bb2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExpandSpec.scala @@ -6,14 +6,14 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.stream.ActorAttributes import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.Await -import scala.concurrent.duration._ - class FlowExpandSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExtrapolateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExtrapolateSpec.scala index 63ecd8448e..69580739d9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExtrapolateSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowExtrapolateSpec.scala @@ -6,13 +6,13 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.Await -import scala.concurrent.duration._ - class FlowExtrapolateSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala index a5d4408499..bc1db98812 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFilterSpec.scala @@ -6,6 +6,9 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom.{ current => random } +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.stream.ActorAttributes._ import akka.stream.Attributes import akka.stream.Supervision._ @@ -14,9 +17,6 @@ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace - class FlowFilterSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlatMapPrefixSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlatMapPrefixSpec.scala index 9c24f96afa..0fc84c31ae 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlatMapPrefixSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlatMapPrefixSpec.scala @@ -4,9 +4,7 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils.TE -import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped -import akka.stream.testkit.{ StreamSpec, TestPublisher, TestSubscriber } +import akka.{ Done, NotUsed } import akka.stream.{ AbruptStageTerminationException, AbruptTerminationException, @@ -14,7 +12,9 @@ import akka.stream.{ NeverMaterializedException, SubscriptionWithCancelException } -import akka.{ Done, NotUsed } +import akka.stream.testkit.{ StreamSpec, TestPublisher, TestSubscriber } +import akka.stream.testkit.Utils.TE +import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped class FlowFlatMapPrefixSpec extends StreamSpec { def src10(i: Int = 0) = Source(i until (i + 10)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala index 12646bef5e..5c6c9dbcdf 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFlattenMergeSpec.scala @@ -4,6 +4,11 @@ package akka.stream.scaladsl +import scala.concurrent._ +import scala.concurrent.duration._ + +import org.scalatest.exceptions.TestFailedException + import akka.NotUsed import akka.stream._ import akka.stream.impl.TraversalBuilder @@ -18,10 +23,6 @@ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.TestLatch import akka.util.OptionVal -import org.scalatest.exceptions.TestFailedException - -import scala.concurrent._ -import scala.concurrent.duration._ class FlowFlattenMergeSpec extends StreamSpec { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldAsyncSpec.scala index efe8f981c8..54048bfc53 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldAsyncSpec.scala @@ -4,22 +4,23 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import org.scalatest.concurrent.PatienceConfiguration.Timeout + import akka.NotUsed import akka.stream.ActorAttributes.supervisionStrategy import akka.stream.Supervision.restartingDecider import akka.stream.Supervision.resumingDecider import akka.stream.impl.ReactiveStreamsCompliance -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.LongRunningTest -import org.scalatest.concurrent.PatienceConfiguration.Timeout - -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.util.control.NoStackTrace -import scala.concurrent.ExecutionContextExecutor class FlowFoldAsyncSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala index 9d0f233e41..dcb91a2652 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFoldSpec.scala @@ -4,15 +4,15 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.NotUsed +import akka.stream.ActorAttributes +import akka.stream.Supervision import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.ActorAttributes -import akka.stream.Supervision - -import scala.concurrent.Await -import scala.concurrent.duration._ class FlowFoldSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala index 053f4f7995..d9b1af9eca 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowForeachSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import akka.stream.testkit._ +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowForeachSpec extends StreamSpec { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala index 5dc712eafb..6c4c0154e8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowFromFutureSpec.scala @@ -4,15 +4,16 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ import scala.concurrent.Future import scala.concurrent.Promise +import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent + +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + @silent("deprecated") // testing deprecated API class FlowFromFutureSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala index 8778dc3181..de5621a710 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupBySpec.scala @@ -7,29 +7,30 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom import java.util.concurrent.atomic.AtomicInteger +import scala.annotation.tailrec +import scala.collection.mutable +import scala.concurrent.Await +import scala.concurrent.Promise +import scala.concurrent.duration._ + +import org.reactivestreams.Publisher +import org.scalatest.concurrent.PatienceConfiguration.Timeout + +import akka.Done +import akka.NotUsed import akka.actor.ActorSystem +import akka.stream._ import akka.stream.Attributes._ import akka.stream.Supervision.resumingDecider -import akka.stream._ import akka.stream.impl.SinkModule import akka.stream.impl.fusing.GroupBy -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource import akka.testkit.TestLatch import akka.util.ByteString -import akka.Done -import akka.NotUsed -import org.reactivestreams.Publisher -import org.scalatest.concurrent.PatienceConfiguration.Timeout - -import scala.annotation.tailrec -import scala.collection.mutable -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Promise object FlowGroupBySpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala index 7ee01fbfb1..77246c3c41 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedSpec.scala @@ -6,11 +6,11 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom.{ current => random } +import scala.collection.immutable + import akka.stream.testkit.ScriptedTest import akka.stream.testkit.StreamSpec -import scala.collection.immutable - class FlowGroupedSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala index 52934d81b2..77fc9db39f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowGroupedWithinSpec.scala @@ -6,15 +6,15 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom.{ current => random } +import scala.collection.immutable +import scala.concurrent.duration._ + import akka.stream.ThrottleMode import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TimingTest import akka.util.ConstantFun -import scala.collection.immutable -import scala.concurrent.duration._ - class FlowGroupedWithinSpec extends StreamSpec with ScriptedTest { "A GroupedWithin" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala index 7036dbc4c0..663c6f835d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIdleInjectSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl -import akka.stream.testkit.scaladsl.StreamTestKit._ +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber - -import scala.concurrent.Await -import scala.concurrent.duration._ +import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowIdleInjectSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala index 3118a8565b..b310d758f9 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInitialDelaySpec.scala @@ -6,13 +6,13 @@ package akka.stream.scaladsl import java.util.concurrent.TimeoutException -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestSubscriber - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowInitialDelaySpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala index c89ea4b578..c602efad5c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowInterleaveSpec.scala @@ -4,10 +4,11 @@ package akka.stream.scaladsl -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit._ import org.reactivestreams.Publisher +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowInterleaveSpec extends BaseTwoStreamsSetup { override type Outputs = Int @@ -240,8 +241,8 @@ class FlowInterleaveSpec extends BaseTwoStreamsSetup { "work in example" in { //#interleave - import akka.stream.scaladsl.Source import akka.stream.scaladsl.Sink + import akka.stream.scaladsl.Source val sourceA = Source(List(1, 2, 3, 4)) val sourceB = Source(List(10, 20, 30, 40)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala index 3ddecbd553..1b3227882f 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIntersperseSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.duration._ - class FlowIntersperseSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala index 8fdd801dc2..c1ff6cbe30 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowIteratorSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.duration._ + import akka.NotUsed import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.collection.immutable -import scala.concurrent.duration._ - class FlowIteratorSpec extends AbstractFlowIteratorSpec { override def testName = "A Flow based on an iterator producing function" override def createSource(elements: Int): Source[Int, NotUsed] = diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala index 0a2d99842b..186d4cf14b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowJoinSpec.scala @@ -4,14 +4,15 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl._ -import akka.stream.FlowShape -import akka.stream.OverflowStrategy +import scala.collection.immutable + import org.scalatest.time._ -import scala.collection.immutable +import akka.stream.FlowShape +import akka.stream.OverflowStrategy +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl._ +import akka.stream.testkit.scaladsl.StreamTestKit._ class FlowJoinSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowKillSwitchSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowKillSwitchSpec.scala index ab6fd0be5d..ecb7e4536e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowKillSwitchSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowKillSwitchSpec.scala @@ -4,16 +4,16 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.Done +import akka.stream.ClosedShape +import akka.stream.KillSwitches import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils.TE import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import akka.stream.ClosedShape -import akka.stream.KillSwitches - -import scala.concurrent.duration._ class FlowKillSwitchSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala index fc3e8535de..35303a737e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitSpec.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl +import scala.concurrent.Await + import akka.stream.StreamLimitReachedException import akka.stream.testkit.StreamSpec -import scala.concurrent.Await - class FlowLimitSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala index ca797ffc02..03dfe40a55 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLimitWeightedSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.Await + import akka.stream.StreamLimitReachedException import akka.stream.testkit.StreamSpec import akka.util.unused -import scala.concurrent.Await - class FlowLimitWeightedSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala index 2eaafbb2ca..79d61e05ec 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogSpec.scala @@ -4,19 +4,19 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.NotUsed import akka.event.{ DummyClassForStringSources, Logging } +import akka.stream._ import akka.stream.ActorAttributes._ import akka.stream.Attributes.LogLevels import akka.stream.Supervision._ import akka.stream.testkit.{ ScriptedTest, StreamSpec } -import akka.stream._ import akka.testkit.TestProbe -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.util.control.NoStackTrace - class FlowLogSpec extends StreamSpec(""" akka.loglevel = DEBUG # test verifies logging """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogWithMarkerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogWithMarkerSpec.scala index 2218ec7495..38eadb821c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogWithMarkerSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowLogWithMarkerSpec.scala @@ -4,19 +4,19 @@ package akka.stream.scaladsl -import akka.NotUsed -import akka.event.{ DummyClassForStringSources, LogMarker, Logging } -import akka.stream.ActorAttributes._ -import akka.stream.Attributes.LogLevels -import akka.stream.Supervision._ -import akka.stream._ -import akka.stream.testkit.{ ScriptedTest, StreamSpec } -import akka.testkit.TestProbe - import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import akka.NotUsed +import akka.event.{ DummyClassForStringSources, LogMarker, Logging } +import akka.stream._ +import akka.stream.ActorAttributes._ +import akka.stream.Attributes.LogLevels +import akka.stream.Supervision._ +import akka.stream.testkit.{ ScriptedTest, StreamSpec } +import akka.testkit.TestProbe + class FlowLogWithMarkerSpec extends StreamSpec(""" akka.loglevel = DEBUG # test verifies logging """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala index 045c30201c..1ced15f919 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncSpec.scala @@ -4,29 +4,30 @@ package akka.stream.scaladsl -import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.ThreadLocalRandom - -import akka.stream.ActorAttributes.supervisionStrategy -import akka.stream.Supervision.resumingDecider -import akka.stream.testkit.Utils._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.ActorAttributes -import akka.stream.Supervision -import akka.testkit.TestLatch -import akka.testkit.TestProbe -import org.scalatest.concurrent.PatienceConfiguration.Timeout +import java.util.concurrent.atomic.AtomicInteger import scala.annotation.tailrec -import scala.concurrent.duration._ import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.Promise +import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import org.scalatest.concurrent.PatienceConfiguration.Timeout + +import akka.stream.ActorAttributes +import akka.stream.ActorAttributes.supervisionStrategy +import akka.stream.Supervision +import akka.stream.Supervision.resumingDecider +import akka.stream.testkit._ +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink +import akka.testkit.TestLatch +import akka.testkit.TestProbe + class FlowMapAsyncSpec extends StreamSpec { "A Flow with mapAsync" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala index e661468aaa..5009bd1384 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapAsyncUnorderedSpec.scala @@ -7,15 +7,6 @@ package akka.stream.scaladsl import java.util.concurrent.LinkedBlockingQueue import java.util.concurrent.atomic.AtomicInteger -import akka.stream.ActorAttributes.supervisionStrategy -import akka.stream.Supervision.resumingDecider -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl._ -import akka.testkit.TestLatch -import akka.testkit.TestProbe -import org.scalatest.concurrent.PatienceConfiguration.Timeout - import scala.annotation.tailrec import scala.concurrent.Await import scala.concurrent.Future @@ -23,6 +14,16 @@ import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import org.scalatest.concurrent.PatienceConfiguration.Timeout + +import akka.stream.ActorAttributes.supervisionStrategy +import akka.stream.Supervision.resumingDecider +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.testkit.TestLatch +import akka.testkit.TestProbe + class FlowMapAsyncUnorderedSpec extends StreamSpec { "A Flow with mapAsyncUnordered" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala index 9d7634da34..ef3755b830 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapConcatSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + +import akka.stream.ActorAttributes +import akka.stream.Supervision import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import akka.stream.ActorAttributes -import akka.stream.Supervision - -import scala.util.control.NoStackTrace class FlowMapConcatSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala index 34458997e0..2cd370316c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMapErrorSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import scala.util.control.NoStackTrace - class FlowMapErrorSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 1 akka.stream.materializer.max-input-buffer-size = 1 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala index ed5a6f19ed..ed7274658c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMergeSpec.scala @@ -4,10 +4,11 @@ package akka.stream.scaladsl -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit._ import org.reactivestreams.Publisher +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowMergeSpec extends BaseTwoStreamsSetup { override type Outputs = Int @@ -130,8 +131,8 @@ class FlowMergeSpec extends BaseTwoStreamsSetup { "works in number example for merge sorted" in { //#merge-sorted - import akka.stream.scaladsl.Source import akka.stream.scaladsl.Sink + import akka.stream.scaladsl.Source val sourceA = Source(List(1, 3, 5, 7)) val sourceB = Source(List(2, 4, 6, 8)) @@ -148,8 +149,8 @@ class FlowMergeSpec extends BaseTwoStreamsSetup { "works in number example for merge" in { //#merge - import akka.stream.scaladsl.Source import akka.stream.scaladsl.Sink + import akka.stream.scaladsl.Source val sourceA = Source(List(1, 2, 3, 4)) val sourceB = Source(List(10, 20, 30, 40)) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMonitorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMonitorSpec.scala index 217ff3f21f..60bf859083 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMonitorSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowMonitorSpec.scala @@ -4,6 +4,8 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.stream.FlowMonitorState import akka.stream.FlowMonitorState._ import akka.stream.Materializer @@ -11,8 +13,6 @@ import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.duration._ - class FlowMonitorSpec extends StreamSpec { "A FlowMonitor" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala index 36427e2440..cce41e1b95 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOnCompleteSpec.scala @@ -4,17 +4,17 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ +import scala.util.Failure +import scala.util.Success +import scala.util.control.NoStackTrace + import akka.Done import akka.stream.Materializer import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestProbe -import scala.concurrent.duration._ -import scala.util.Failure -import scala.util.Success -import scala.util.control.NoStackTrace - class FlowOnCompleteSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala index c805a92ba3..42f313e846 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowOrElseSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl -import akka.stream.testkit.Utils.TE -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber -import akka.testkit.AkkaSpec - import scala.collection.immutable.Seq import scala.concurrent.duration._ +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.Utils.TE +import akka.testkit.AkkaSpec + class FlowOrElseSpec extends AkkaSpec { "An OrElse flow" should { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala index b6477a4e47..f634bb2d10 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowPrefixAndTailSpec.scala @@ -4,16 +4,17 @@ package akka.stream.scaladsl -import akka.stream._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import com.github.ghik.silencer.silent - import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent + +import akka.stream._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowPrefixAndTailSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala index 3bf67dafaa..739da4e40b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.EventFilter -import scala.util.control.NoStackTrace - class FlowRecoverSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 1 akka.stream.materializer.max-input-buffer-size = 1 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala index 6c45005e10..632d9c5b59 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowRecoverWithSpec.scala @@ -4,15 +4,16 @@ package akka.stream.scaladsl -import akka.stream.stage.{ GraphStage, GraphStageLogic } -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.scaladsl.TestSink -import akka.stream._ -import akka.stream.testkit.Utils._ -import akka.stream.testkit.scaladsl.StreamTestKit._ +import scala.util.control.NoStackTrace + import com.github.ghik.silencer.silent -import scala.util.control.NoStackTrace +import akka.stream._ +import akka.stream.stage.{ GraphStage, GraphStageLogic } +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink @silent // tests deprecated APIs class FlowRecoverWithSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala index 6ca3db24db..a8af5afe6e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowReduceSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ + +import akka.stream.ActorAttributes +import akka.stream.Supervision import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.ActorAttributes -import akka.stream.Supervision - -import scala.concurrent.Await -import scala.concurrent.duration._ class FlowReduceSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala index 3b29e75b09..9850268d45 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanAsyncSpec.scala @@ -4,22 +4,23 @@ package akka.stream.scaladsl -import akka.pattern -import akka.stream.impl.ReactiveStreamsCompliance -import akka.stream.testkit.TestSubscriber.Probe -import akka.stream.testkit.Utils.TE -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl._ -import akka.stream.ActorAttributes -import akka.stream.Supervision - import scala.collection.immutable -import scala.concurrent.duration._ +import scala.concurrent.ExecutionContextExecutor import scala.concurrent.Future import scala.concurrent.Promise +import scala.concurrent.duration._ import scala.util.Failure + import org.scalatest.matchers.should.Matchers -import scala.concurrent.ExecutionContextExecutor + +import akka.pattern +import akka.stream.ActorAttributes +import akka.stream.Supervision +import akka.stream.impl.ReactiveStreamsCompliance +import akka.stream.testkit._ +import akka.stream.testkit.TestSubscriber.Probe +import akka.stream.testkit.Utils.TE +import akka.stream.testkit.scaladsl._ class FlowScanAsyncSpec extends StreamSpec with Matchers { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala index e139027d1b..249c2c87e6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowScanSpec.scala @@ -6,17 +6,17 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom.{ current => random } +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.NotUsed +import akka.stream.ActorAttributes +import akka.stream.Supervision import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import akka.stream.ActorAttributes -import akka.stream.Supervision - -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.duration._ class FlowScanSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala index a477286056..0ee7942055 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSlidingSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl -import akka.stream.testkit.scaladsl.StreamTestKit._ +import com.github.ghik.silencer.silent +import org.scalacheck.Gen +import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks + +import akka.pattern.pipe import akka.stream.{ ActorMaterializer, ActorMaterializerSettings } import akka.stream.testkit._ -import org.scalacheck.Gen -import akka.pattern.pipe -import com.github.ghik.silencer.silent -import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks +import akka.stream.testkit.scaladsl.StreamTestKit._ @silent class FlowSlidingSpec extends StreamSpec with ScalaCheckPropertyChecks { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala index 6dff6ab8e9..8eb54e90e3 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSpec.scala @@ -6,22 +6,23 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom -import akka.NotUsed -import akka.actor._ -import akka.stream.impl._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit._ -import akka.stream._ -import akka.testkit.TestDuration -import com.github.ghik.silencer.silent -import com.typesafe.config.ConfigFactory -import org.reactivestreams.{ Publisher, Subscriber } - import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import org.reactivestreams.{ Publisher, Subscriber } + +import akka.NotUsed +import akka.actor._ +import akka.stream._ +import akka.stream.impl._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.testkit.TestDuration + object FlowSpec { class Fruit extends Serializable class Apple extends Fruit diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala index d7f6306ff3..9ff96901e2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitAfterSpec.scala @@ -4,20 +4,21 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ + +import org.reactivestreams.Publisher + import akka.NotUsed +import akka.stream._ import akka.stream.StreamSubscriptionTimeoutTerminationMode import akka.stream.Supervision.resumingDecider -import akka.stream._ import akka.stream.impl.SubscriptionTimeoutException import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import org.reactivestreams.Publisher - -import scala.concurrent.Await -import scala.concurrent.duration._ object FlowSplitAfterSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala index a2d1767a3d..0be8c6798c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSplitWhenSpec.scala @@ -4,22 +4,23 @@ package akka.stream.scaladsl -import akka.Done -import akka.NotUsed -import akka.stream.Supervision.resumingDecider -import akka.stream._ -import akka.stream.impl.SubscriptionTimeoutException -import akka.stream.impl.fusing.Split -import akka.stream.testkit.Utils._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl.TestSink -import org.reactivestreams.Publisher - import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ +import org.reactivestreams.Publisher + +import akka.Done +import akka.NotUsed +import akka.stream._ +import akka.stream.Supervision.resumingDecider +import akka.stream.impl.SubscriptionTimeoutException +import akka.stream.impl.fusing.Split +import akka.stream.testkit._ +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink + class FlowSplitWhenSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 akka.stream.materializer.max-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala index 3597677467..82af09dade 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowStatefulMapConcatSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.TestSink +import scala.util.control.NoStackTrace + import akka.stream.ActorAttributes import akka.stream.Supervision - -import scala.util.control.NoStackTrace +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.TestSink class FlowStatefulMapConcatSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala index 2a380114ce..9f181c881d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowSupervisionSpec.scala @@ -4,17 +4,17 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.NotUsed import akka.stream.ActorAttributes import akka.stream.Supervision import akka.stream.impl.ReactiveStreamsCompliance import akka.stream.testkit._ -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace - class FlowSupervisionSpec extends StreamSpec { import ActorAttributes.supervisionStrategy diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala index 1a15b304fd..e15c7a1fe2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeSpec.scala @@ -6,14 +6,14 @@ package akka.stream.scaladsl import java.util.concurrent.ThreadLocalRandom.{ current => random } +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.stream.impl.ActorSubscriberMessage.OnComplete import akka.stream.impl.ActorSubscriberMessage.OnNext import akka.stream.impl.RequestMore import akka.stream.testkit._ -import scala.concurrent.Await -import scala.concurrent.duration._ - class FlowTakeSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala index aa3b342bf5..175135e2f8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWhileSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.stream.ActorAttributes._ import akka.stream.Supervision._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import scala.util.control.NoStackTrace - class FlowTakeWhileSpec extends StreamSpec { "A TakeWhile" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala index 616076471d..e7d3a16fd0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowTakeWithinSpec.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.concurrent.duration._ - class FlowTakeWithinSpec extends StreamSpec { "A TakeWithin" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala index 72d43cf2dc..c67a3b061a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowThrottleSpec.scala @@ -7,19 +7,19 @@ package akka.stream.scaladsl import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicLong -import akka.stream.ThrottleMode.{ Enforcing, Shaping } -import akka.stream._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.util.ByteString import scala.concurrent.Await import scala.concurrent.duration._ import scala.util.Random import scala.util.control.NoStackTrace import akka.Done +import akka.stream._ +import akka.stream.ThrottleMode.{ Enforcing, Shaping } +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink import akka.testkit.TimingTest +import akka.util.ByteString class FlowThrottleSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala index 462072eb0e..0faf0bfc5d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchSpec.scala @@ -4,6 +4,9 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.actor.Actor import akka.actor.PoisonPill import akka.actor.Props @@ -11,9 +14,6 @@ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestActors -import scala.concurrent.Await -import scala.concurrent.duration._ - object FlowWatchSpec { case class Reply(payload: Int) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala index ed83a34239..813f5b42e0 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWatchTerminationSpec.scala @@ -4,6 +4,9 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.Done import akka.pattern.pipe import akka.stream._ @@ -12,9 +15,6 @@ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace - class FlowWatchTerminationSpec extends StreamSpec { "A WatchTermination" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala index 5000ecdf95..ba48600b4d 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWireTapSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl -import akka.Done -import akka.stream.testkit.Utils._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ - import scala.util.control.NoStackTrace +import akka.Done +import akka.stream.testkit._ +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class FlowWireTapSpec extends StreamSpec("akka.stream.materializer.debug.fuzzing-mode = off") { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextLogSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextLogSpec.scala index 915c739554..ba272160ff 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextLogSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextLogSpec.scala @@ -5,8 +5,8 @@ package akka.stream.scaladsl import akka.event.Logging -import akka.stream.Attributes.LogLevels import akka.stream._ +import akka.stream.Attributes.LogLevels import akka.stream.testkit.ScriptedTest import akka.stream.testkit.StreamSpec import akka.testkit.TestProbe diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextSpec.scala index 270dd50838..753f4d5b73 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowWithContextSpec.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.TestSink -import scala.util.control.NoStackTrace - class FlowWithContextSpec extends StreamSpec { "A FlowWithContext" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipAllSpec.scala index e38ce37c8f..3cc471f016 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipAllSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FlowZipAllSpec.scala @@ -4,9 +4,10 @@ package akka.stream.scaladsl +import org.reactivestreams.Publisher + import akka.stream.testkit.{ BaseTwoStreamsSetup, TestSubscriber } import akka.stream.testkit.scaladsl.StreamTestKit._ -import org.reactivestreams.Publisher class FlowZipAllSpec extends BaseTwoStreamsSetup { override type Outputs = (Int, Int) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala index 84858b549e..1a8937873c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/FramingSpec.scala @@ -7,10 +7,15 @@ package akka.stream.scaladsl import java.nio.ByteOrder import java.util.concurrent.ThreadLocalRandom +import scala.collection.immutable +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.Random + import akka.stream._ import akka.stream.scaladsl.Framing.FramingException -import akka.stream.stage.GraphStage import akka.stream.stage._ +import akka.stream.stage.GraphStage import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher import akka.stream.testkit.TestSubscriber @@ -18,11 +23,6 @@ import akka.util.ByteString import akka.util.ByteStringBuilder import akka.util.unused -import scala.collection.immutable -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.Random - class FramingSpec extends StreamSpec { class Rechunker extends GraphStage[FlowShape[ByteString, ByteString]] { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala index 0dee4cd596..0199e053dc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBackedFlowSpec.scala @@ -4,12 +4,13 @@ package akka.stream.scaladsl +import com.github.ghik.silencer.silent +import org.reactivestreams.Subscriber + +import akka.stream._ import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings import akka.stream.testkit._ -import akka.stream._ -import com.github.ghik.silencer.silent -import org.reactivestreams.Subscriber object GraphFlowSpec { val source1 = Source(0 to 3) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala index 32074205d1..aa4098b98e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBalanceSpec.scala @@ -4,15 +4,15 @@ package akka.stream.scaladsl -import akka.stream._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl._ - import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.duration._ +import akka.stream._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class GraphBalanceSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala index 02cd1cf752..bda68c9302 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphBroadcastSpec.scala @@ -4,16 +4,16 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future - class GraphBroadcastSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala index 3bcaff91d9..2fc9e100dc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphConcatSpec.scala @@ -4,7 +4,7 @@ package akka.stream.scaladsl -import scala.concurrent.{ Promise } +import scala.concurrent.Promise import akka.stream._ import akka.stream.testkit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphDSLCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphDSLCompileSpec.scala index e4a5de307a..32f5ad1630 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphDSLCompileSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphDSLCompileSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl -import akka.NotUsed -import akka.stream.impl.fusing.GraphStages -import akka.stream._ -import akka.stream.testkit._ -import akka.stream.stage._ import com.github.ghik.silencer.silent +import akka.NotUsed +import akka.stream._ +import akka.stream.impl.fusing.GraphStages +import akka.stream.stage._ +import akka.stream.testkit._ + object GraphDSLCompileSpec { class Fruit class Apple extends Fruit diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala index 5117337842..145c581db7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMatValueSpec.scala @@ -6,16 +6,16 @@ package akka.stream.scaladsl import java.util.concurrent.atomic.AtomicInteger -import akka.Done -import akka.NotUsed -import akka.stream._ -import akka.stream.testkit._ - import scala.concurrent.Await import scala.concurrent.Future import scala.concurrent.Promise import scala.concurrent.duration._ +import akka.Done +import akka.NotUsed +import akka.stream._ +import akka.stream.testkit._ + class GraphMatValueSpec extends StreamSpec { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala index 49fe82df16..3bbdf79246 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeLatestSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl -import akka.stream._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.TestSource - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSource + class GraphMergeLatestSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePreferredSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePreferredSpec.scala index e3e9f6414d..882ebf4528 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePreferredSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePreferredSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl -import akka.stream.testkit.TwoStreamsSetup -import akka.stream._ -import com.github.ghik.silencer.silent - import scala.concurrent.Await import scala.concurrent.duration._ +import com.github.ghik.silencer.silent + +import akka.stream._ +import akka.stream.testkit.TwoStreamsSetup + @silent // stream usage class GraphMergePreferredSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePrioritizedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePrioritizedSpec.scala index a0f1b23f69..5c80b063b6 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePrioritizedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergePrioritizedSpec.scala @@ -4,11 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.NotUsed -import akka.stream.testkit.TestSubscriber.ManualProbe import akka.stream.{ ClosedShape, Inlet, Outlet } import akka.stream.testkit.{ TestSubscriber, TwoStreamsSetup } -import scala.concurrent.duration._ +import akka.stream.testkit.TestSubscriber.ManualProbe class GraphMergePrioritizedSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala index d3d19ac200..8527e97e9a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSortedSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl -import akka.stream._ -import akka.stream.testkit.TwoStreamsSetup import com.github.ghik.silencer.silent import org.scalacheck.Gen import org.scalacheck.Shrink import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks +import akka.stream._ +import akka.stream.testkit.TwoStreamsSetup + @silent // tests deprecated apis class GraphMergeSortedSpec extends TwoStreamsSetup with ScalaCheckPropertyChecks { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala index 5233247118..bd1bb8f4fd 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphMergeSpec.scala @@ -4,11 +4,10 @@ package akka.stream.scaladsl -import akka.stream._ - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala index d9cffc877b..c89b16ecf7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphOpsIntegrationSpec.scala @@ -4,15 +4,15 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.NotUsed import akka.stream._ import akka.stream.testkit._ -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future - object GraphOpsIntegrationSpec { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala index 05148bc30d..b90b79d1dc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartialSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl -import akka.stream.testkit.StreamSpec -import akka.stream.ClosedShape -import akka.stream.FlowShape - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream.ClosedShape +import akka.stream.FlowShape +import akka.stream.testkit.StreamSpec + class GraphPartialSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala index 9488c6913e..79583cb819 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphPartitionSpec.scala @@ -4,17 +4,17 @@ package akka.stream.scaladsl -import akka.stream.ActorAttributes -import akka.stream.Supervision -import akka.stream.testkit.Utils.TE -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.ClosedShape -import akka.stream.OverflowStrategy - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream.ActorAttributes +import akka.stream.ClosedShape +import akka.stream.OverflowStrategy +import akka.stream.Supervision +import akka.stream.testkit._ +import akka.stream.testkit.Utils.TE +import akka.stream.testkit.scaladsl.StreamTestKit._ + class GraphPartitionSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala index c96cd310a9..baade9267b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphStageTimersSpec.scala @@ -4,6 +4,9 @@ package akka.stream.scaladsl +import scala.concurrent.Promise +import scala.concurrent.duration._ + import akka.actor.ActorRef import akka.stream.Attributes import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage @@ -11,14 +14,11 @@ import akka.stream.stage.AsyncCallback import akka.stream.stage.InHandler import akka.stream.stage.OutHandler import akka.stream.stage.TimerGraphStageLogic -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestDuration -import scala.concurrent.Promise -import scala.concurrent.duration._ - object GraphStageTimersSpec { case object TestSingleTimer case object TestSingleTimerResubmit diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala index 884ca4c99a..39be569aa6 100755 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ +import scala.concurrent.duration._ + import akka.stream.ClosedShape import akka.stream.OverflowStrategy - -import scala.concurrent.duration._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ class GraphUnzipSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala index 098bf26c57..feed781481 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphUnzipWithSpec.scala @@ -4,21 +4,22 @@ package akka.stream.scaladsl +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import org.reactivestreams.Publisher + +import akka.Done +import akka.NotUsed import akka.stream._ +import akka.stream.testkit._ import akka.stream.testkit.TestSubscriber.Probe import akka.stream.testkit.Utils.TE -import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.EventFilter import akka.testkit.TestProbe import akka.util.unused -import akka.Done -import akka.NotUsed -import org.reactivestreams.Publisher - -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace class GraphUnzipWithSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestSpec.scala index d87412f297..c115ba7dd7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestSpec.scala @@ -4,20 +4,21 @@ package akka.stream.scaladsl -import akka.stream.ClosedShape -import akka.stream.testkit.TestPublisher.Probe -import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.scaladsl.TestSource -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber +import scala.concurrent.duration._ +import scala.language.postfixOps + import org.scalacheck.Gen import org.scalatest.concurrent.ScalaFutures import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks -import scala.concurrent.duration._ -import scala.language.postfixOps +import akka.stream.ClosedShape +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestPublisher.Probe +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.scaladsl.StreamTestKit.assertAllStagesStopped +import akka.stream.testkit.scaladsl.TestSink +import akka.stream.testkit.scaladsl.TestSource object GraphZipLatestSpec { val someString = "someString" diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestWithSpec.scala index fbfe300f27..a92bc4fd37 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipLatestWithSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ +import scala.language.postfixOps + +import org.reactivestreams.Publisher + import akka.stream._ import akka.stream.testkit._ import akka.testkit.EventFilter -import org.reactivestreams.Publisher - -import scala.concurrent.duration._ -import scala.language.postfixOps class GraphZipLatestWithSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala index 79e7ba4da8..c39edaad89 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipNSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.duration._ + +import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream._ - -import scala.concurrent.duration._ -import scala.collection.immutable class GraphZipNSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala index aa82af7f17..9c9ed08b13 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream._ - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream._ +import akka.stream.testkit._ +import akka.stream.testkit.scaladsl.StreamTestKit._ + class GraphZipSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithNSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithNSpec.scala index a2dbd3be4c..7d2b222004 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithNSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithNSpec.scala @@ -4,11 +4,12 @@ package akka.stream.scaladsl -import akka.stream.testkit._ -import scala.concurrent.duration._ -import akka.stream._ -import akka.testkit.EventFilter import scala.collection.immutable +import scala.concurrent.duration._ + +import akka.stream._ +import akka.stream.testkit._ +import akka.testkit.EventFilter class GraphZipWithNSpec extends TwoStreamsSetup { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithSpec.scala index a78082db2f..f0a017a7e5 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/GraphZipWithSpec.scala @@ -4,9 +4,10 @@ package akka.stream.scaladsl -import akka.stream.testkit._ import scala.concurrent.duration._ + import akka.stream._ +import akka.stream.testkit._ import akka.testkit.EventFilter class GraphZipWithSpec extends TwoStreamsSetup { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala index 66f379cbe4..925d980a7c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HeadSinkSpec.scala @@ -4,15 +4,15 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.stream.AbruptTerminationException import akka.stream.Materializer import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.duration._ - class HeadSinkSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) with ScriptedTest { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HubSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HubSpec.scala index 33789df10e..e739025530 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HubSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/HubSpec.scala @@ -4,21 +4,21 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.duration._ + +import akka.stream.KillSwitches +import akka.stream.ThrottleMode +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestSubscriber import akka.stream.testkit.Utils.TE import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber -import akka.stream.KillSwitches -import akka.stream.ThrottleMode import akka.testkit.EventFilter -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.duration._ - class HubSpec extends StreamSpec { "MergeHub" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/JsonFramingSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/JsonFramingSpec.scala index df91326d09..6e2aced1eb 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/JsonFramingSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/JsonFramingSpec.scala @@ -4,18 +4,18 @@ package akka.stream.scaladsl -import akka.stream.impl.JsonObjectParser -import akka.stream.scaladsl.Framing.FramingException -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber -import akka.testkit.AkkaSpec -import akka.util.ByteString - import scala.collection.immutable.Seq import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream.impl.JsonObjectParser +import akka.stream.scaladsl.Framing.FramingException +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.scaladsl.TestSink +import akka.testkit.AkkaSpec +import akka.util.ByteString + class JsonFramingSpec extends AkkaSpec { "collecting multiple json" should { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala index 0567105456..82936f2943 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LastSinkSpec.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.Future +import scala.concurrent.duration._ + import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.ExecutionContextExecutor - class LastSinkSpec extends StreamSpec with ScriptedTest { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazilyAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazilyAsyncSpec.scala index 2435baeeac..757e6605be 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazilyAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazilyAsyncSpec.scala @@ -6,15 +6,16 @@ package akka.stream.scaladsl import java.util.concurrent.atomic.AtomicBoolean -import akka.Done -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestSubscriber -import akka.testkit.DefaultTimeout +import scala.concurrent.Future + import com.github.ghik.silencer.silent import org.scalatest.concurrent.ScalaFutures -import scala.concurrent.Future +import akka.Done +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.testkit.DefaultTimeout @silent("deprecated") // tests deprecated methods class LazilyAsyncSpec extends StreamSpec with DefaultTimeout with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala index db5336b8be..062e2e5e44 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazyFlowSpec.scala @@ -4,6 +4,13 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.stream.AbruptStageTerminationException import akka.stream.Materializer @@ -15,12 +22,6 @@ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.stream.testkit.scaladsl.TestSource import akka.testkit.TestProbe -import com.github.ghik.silencer.silent - -import scala.collection.immutable -import scala.concurrent.Future -import scala.concurrent.Promise -import scala.concurrent.duration._ @silent("deprecated") // tests deprecated API as well class LazyFlowSpec extends StreamSpec(""" diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala index 25d236d02a..70bd3fd1d2 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySinkSpec.scala @@ -6,6 +6,14 @@ package akka.stream.scaladsl import java.util.concurrent.TimeoutException +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.stream._ import akka.stream.stage.GraphStage @@ -16,13 +24,6 @@ import akka.stream.testkit.TestSubscriber.Probe import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink -import com.github.ghik.silencer.silent - -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.Future -import scala.concurrent.Promise -import scala.concurrent.duration._ @silent("deprecated") class LazySinkSpec extends StreamSpec(""" diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySourceSpec.scala index bd0ffb43fe..feb23b249b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/LazySourceSpec.scala @@ -6,24 +6,25 @@ package akka.stream.scaladsl import java.util.concurrent.atomic.AtomicBoolean -import akka.stream._ -import akka.stream.stage.GraphStage -import akka.stream.stage.GraphStageLogic -import akka.stream.testkit.Utils.TE -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber -import akka.testkit.DefaultTimeout -import akka.testkit.TestProbe -import akka.Done -import akka.NotUsed -import org.scalatest.concurrent.ScalaFutures - import scala.collection.immutable.Seq import scala.concurrent.Future import scala.concurrent.Promise +import org.scalatest.concurrent.ScalaFutures + +import akka.Done +import akka.NotUsed +import akka.stream._ +import akka.stream.stage.GraphStage +import akka.stream.stage.GraphStageLogic +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.Utils.TE +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.testkit.DefaultTimeout +import akka.testkit.TestProbe + class LazySourceSpec extends StreamSpec with DefaultTimeout with ScalaFutures { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/MaybeSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/MaybeSourceSpec.scala index 93d73de1cc..10ce335cbd 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/MaybeSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/MaybeSourceSpec.scala @@ -4,16 +4,16 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.stream.{ AbruptStageTerminationException, KillSwitches, Materializer } import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestSubscriber -import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.Utils.TE +import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.DefaultTimeout -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace - class MaybeSourceSpec extends StreamSpec with DefaultTimeout { "The Maybe Source" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala index 8fac7afa05..5abb4dba74 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/PublisherSinkSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.duration._ + import akka.stream.ClosedShape import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.concurrent.Await -import scala.concurrent.duration._ - class PublisherSinkSpec extends StreamSpec { "A PublisherSink" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala index 3fd072ba4c..b01736a648 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSinkSpec.scala @@ -4,6 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.Await +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.Promise +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + import akka.pattern.pipe import akka.stream.AbruptTerminationException import akka.stream.Attributes.inputBuffer @@ -12,11 +18,6 @@ import akka.stream.StreamDetachedException import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSource -import scala.concurrent.Await -import scala.concurrent.Promise -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace -import scala.concurrent.ExecutionContextExecutor class QueueSinkSpec extends StreamSpec { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala index f90afe8217..6107f8e5a7 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/QueueSourceSpec.scala @@ -4,6 +4,11 @@ package akka.stream.scaladsl +import scala.concurrent._ +import scala.concurrent.duration._ + +import org.scalatest.time.Span + import akka.Done import akka.actor.Status import akka.pattern.pipe @@ -16,10 +21,6 @@ import akka.stream.testkit.TestSubscriber import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.TestProbe -import org.scalatest.time.Span - -import scala.concurrent._ -import scala.concurrent.duration._ class QueueSourceSpec extends StreamSpec { implicit val ec: ExecutionContextExecutor = system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RestartSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RestartSpec.scala index 27a5e80545..0ee74dd84c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RestartSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RestartSpec.scala @@ -6,26 +6,26 @@ package akka.stream.scaladsl import java.util.concurrent.atomic.AtomicInteger -import akka.stream.scaladsl.RestartWithBackoffFlow.Delay -import akka.stream.testkit.Utils.TE -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.scaladsl.TestSink -import akka.stream.testkit.scaladsl.TestSource -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestPublisher -import akka.stream.testkit.TestSubscriber -import akka.stream.Attributes -import akka.stream.OverflowStrategy -import akka.testkit.DefaultTimeout -import akka.testkit.TestDuration -import akka.Done -import akka.NotUsed - import scala.concurrent.Promise import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success +import akka.Done +import akka.NotUsed +import akka.stream.Attributes +import akka.stream.OverflowStrategy +import akka.stream.scaladsl.RestartWithBackoffFlow.Delay +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestPublisher +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.Utils.TE +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.stream.testkit.scaladsl.TestSink +import akka.stream.testkit.scaladsl.TestSource +import akka.testkit.DefaultTimeout +import akka.testkit.TestDuration + class RestartSpec extends StreamSpec(Map("akka.test.single-expect-default" -> "10s")) with DefaultTimeout { import system.dispatcher diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RetryFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RetryFlowSpec.scala index 683f44bd4f..b04733509a 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RetryFlowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/RetryFlowSpec.scala @@ -4,15 +4,16 @@ package akka.stream.scaladsl -import akka.NotUsed -import akka.stream.OverflowStrategy -import akka.stream.testkit.scaladsl.{ TestSink, TestSource } -import akka.stream.testkit.{ StreamSpec, TestPublisher, TestSubscriber } -import org.scalatest.matchers.{ MatchResult, Matcher } - import scala.concurrent.duration._ import scala.util.{ Failure, Success, Try } +import org.scalatest.matchers.{ MatchResult, Matcher } + +import akka.NotUsed +import akka.stream.OverflowStrategy +import akka.stream.testkit.{ StreamSpec, TestPublisher, TestSubscriber } +import akka.stream.testkit.scaladsl.{ TestSink, TestSource } + class RetryFlowSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 1 akka.stream.materializer.max-input-buffer-size = 1 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala index 972fafa2ea..c99dc59ffc 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/ReverseArrowSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl -import akka.stream._ -import akka.stream.testkit._ - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream._ +import akka.stream.testkit._ + class ReverseArrowSpec extends StreamSpec { import GraphDSL.Implicits._ diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala index 641bb0b5e4..1f66a7e5e4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SeqSinkSpec.scala @@ -4,15 +4,15 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.Await +import scala.concurrent.Future + import akka.stream.AbruptTerminationException import akka.stream.Materializer import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestPublisher -import scala.collection.immutable -import scala.concurrent.Await -import scala.concurrent.Future - class SeqSinkSpec extends StreamSpec(""" akka.stream.materializer.initial-input-buffer-size = 2 """) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SetupSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SetupSpec.scala index 02b28abdbb..1d0e14c1c8 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SetupSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SetupSpec.scala @@ -4,9 +4,10 @@ package akka.stream.scaladsl +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.stream.testkit.StreamSpec -import com.github.ghik.silencer.silent @silent("deprecated") class SetupSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkAsJavaStreamSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkAsJavaStreamSpec.scala index 5c4d3950eb..b996b497f4 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkAsJavaStreamSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkAsJavaStreamSpec.scala @@ -10,8 +10,8 @@ import akka.stream._ import akka.stream.impl.PhasedFusingActorMaterializer import akka.stream.impl.StreamSupervisor import akka.stream.impl.StreamSupervisor.Children -import akka.stream.testkit.Utils._ import akka.stream.testkit._ +import akka.stream.testkit.Utils._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSource import akka.util.ByteString diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachAsyncSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachAsyncSpec.scala index f67aa78d04..5461956965 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachAsyncSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachAsyncSpec.scala @@ -8,6 +8,13 @@ import java.util.concurrent.CountDownLatch import java.util.concurrent.Executors import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.ExecutionContext +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.language.postfixOps +import scala.util.control.NoStackTrace + import akka.Done import akka.stream.ActorAttributes.supervisionStrategy import akka.stream.Supervision.resumingDecider @@ -17,13 +24,6 @@ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestLatch import akka.testkit.TestProbe -import scala.concurrent.duration._ -import scala.concurrent.Await -import scala.concurrent.ExecutionContext -import scala.concurrent.Future -import scala.language.postfixOps -import scala.util.control.NoStackTrace - class SinkForeachAsyncSpec extends StreamSpec { "A foreachAsync" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala index d550e9d4c0..6b39bbbe04 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkForeachParallelSpec.scala @@ -7,17 +7,18 @@ package akka.stream.scaladsl import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit +import scala.concurrent.Await +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import com.github.ghik.silencer.silent + import akka.stream.ActorAttributes._ import akka.stream.Supervision._ import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TestLatch import akka.testkit.TestProbe -import com.github.ghik.silencer.silent - -import scala.concurrent.Await -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace @silent // tests deprecated APIs class SinkForeachParallelSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala index 4b9e16c7c8..b5a8b1f92b 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SinkSpec.scala @@ -4,17 +4,18 @@ package akka.stream.scaladsl +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent +import org.reactivestreams.Publisher +import org.scalatest.concurrent.ScalaFutures + import akka.Done import akka.stream._ import akka.stream.testkit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.DefaultTimeout -import com.github.ghik.silencer.silent -import org.reactivestreams.Publisher -import org.scalatest.concurrent.ScalaFutures - -import scala.concurrent.{ Await, Future } -import scala.concurrent.duration._ class SinkSpec extends StreamSpec with DefaultTimeout with ScalaFutures { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceWithContextSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceWithContextSpec.scala index 4b601a74e9..64145a6163 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceWithContextSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SourceWithContextSpec.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl +import scala.util.control.NoStackTrace + import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.TestSink -import scala.util.control.NoStackTrace - case class Message(data: String, offset: Long) class SourceWithContextSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala index f420314d1b..2ef72c1200 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StageActorRefSpec.scala @@ -4,6 +4,10 @@ package akka.stream.scaladsl +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.concurrent.duration._ + import akka.actor.ActorRef import akka.actor.Kill import akka.actor.NoSerializationVerificationNeeded @@ -19,13 +23,9 @@ import akka.testkit.ImplicitSender import akka.testkit.TestEvent import akka.testkit.TestProbe -import scala.concurrent.duration._ -import scala.concurrent.Future -import scala.concurrent.Promise - class StageActorRefSpec extends StreamSpec with ImplicitSender { import StageActorRefSpec._ - import ControlProtocol._ + import StageActorRefSpec.ControlProtocol._ def sumStage(probe: ActorRef) = SumTestStage(probe) diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamConvertersSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamConvertersSpec.scala index 7011e34bfb..bdd367f1ac 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamConvertersSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamConvertersSpec.scala @@ -9,22 +9,22 @@ import java.util.function.BiConsumer import java.util.function.BinaryOperator import java.util.function.Supplier import java.util.function.ToIntFunction -import java.util.stream.Collector.Characteristics import java.util.stream.BaseStream import java.util.stream.Collector +import java.util.stream.Collector.Characteristics import java.util.stream.Collectors +import scala.concurrent.Await +import scala.concurrent.duration._ + +import org.scalatest.time.Millis +import org.scalatest.time.Span + import akka.stream.ActorAttributes import akka.stream.testkit.StreamSpec import akka.stream.testkit.Utils.TE -import akka.util.ByteString - import akka.testkit.DefaultTimeout -import org.scalatest.time.Millis -import org.scalatest.time.Span - -import scala.concurrent.Await -import scala.concurrent.duration._ +import akka.util.ByteString class StreamConvertersSpec extends StreamSpec with DefaultTimeout { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala index 791f8a601d..cf3620147e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/StreamRefsSpec.scala @@ -4,6 +4,14 @@ package akka.stream.scaladsl +import scala.collection.immutable +import scala.concurrent.{ Await, Future } +import scala.concurrent.Promise +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import com.typesafe.config._ + import akka.{ Done, NotUsed } import akka.actor.{ Actor, ActorIdentity, ActorLogging, ActorRef, ActorSystem, ActorSystemImpl, Identify, Props } import akka.actor.Status.Failure @@ -15,13 +23,6 @@ import akka.stream.testkit.Utils.TE import akka.stream.testkit.scaladsl._ import akka.testkit.{ AkkaSpec, TestKit, TestProbe } import akka.util.ByteString -import com.typesafe.config._ - -import scala.collection.immutable -import scala.concurrent.Promise -import scala.concurrent.{ Await, Future } -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace object StreamRefsSpec { @@ -33,8 +34,8 @@ object StreamRefsSpec { class DataSourceActor() extends Actor with ActorLogging { - import context.system import context.dispatcher + import context.system def receive = { case "give" => diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala index 2cc641a9a3..d9d706f72e 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubscriberSourceSpec.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl -import akka.stream.testkit.StreamSpec - import scala.concurrent.Await import scala.concurrent.duration._ +import akka.stream.testkit.StreamSpec + class SubscriberSourceSpec extends StreamSpec { "A SubscriberSource" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala index 6e6d267f72..ab131ebc83 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/SubstreamSubscriptionTimeoutSpec.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.Await + import akka.stream.impl.SubscriptionTimeoutException import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ -import scala.concurrent.Await - class SubstreamSubscriptionTimeoutSpec extends StreamSpec(""" akka.stream.materializer { initial-input-buffer-size = 2 diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TakeLastSinkSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TakeLastSinkSpec.scala index b686bac561..fd326800de 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TakeLastSinkSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TakeLastSinkSpec.scala @@ -4,13 +4,14 @@ package akka.stream.scaladsl -import akka.stream.testkit.{ StreamSpec, TestPublisher } -import akka.stream.{ AbruptTerminationException, ActorMaterializer, ActorMaterializerSettings } -import com.github.ghik.silencer.silent - import scala.collection.immutable import scala.concurrent.{ Await, Future } +import com.github.ghik.silencer.silent + +import akka.stream.{ AbruptTerminationException, ActorMaterializer, ActorMaterializerSettings } +import akka.stream.testkit.{ StreamSpec, TestPublisher } + @silent class TakeLastSinkSpec extends StreamSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala index e232d32964..190c565f07 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/TickSourceSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.stream.ClosedShape import akka.stream.testkit._ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.testkit.TimingTest -import scala.concurrent.duration._ - class TickSourceSpec extends StreamSpec { "A Flow based on tick publisher" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceAsyncSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceAsyncSourceSpec.scala index 4a1c0c66c8..375b6cd756 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceAsyncSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceAsyncSourceSpec.scala @@ -6,25 +6,25 @@ package akka.stream.scaladsl import java.util.concurrent.atomic.AtomicInteger -import akka.Done -import akka.stream.ActorAttributes -import akka.stream.Materializer -import akka.stream.Supervision -import akka.stream.impl.StreamSupervisor.Children -import akka.stream.impl.PhasedFusingActorMaterializer -import akka.stream.impl.StreamSupervisor -import akka.stream.testkit.Utils._ -import akka.stream.testkit.scaladsl.StreamTestKit._ -import akka.stream.testkit.StreamSpec -import akka.stream.testkit.TestSubscriber -import akka.testkit.TestLatch -import akka.testkit.TestProbe - -import scala.concurrent.duration._ import scala.concurrent.Await import scala.concurrent.ExecutionContext import scala.concurrent.Future import scala.concurrent.Promise +import scala.concurrent.duration._ + +import akka.Done +import akka.stream.ActorAttributes +import akka.stream.Materializer +import akka.stream.Supervision +import akka.stream.impl.PhasedFusingActorMaterializer +import akka.stream.impl.StreamSupervisor +import akka.stream.impl.StreamSupervisor.Children +import akka.stream.testkit.StreamSpec +import akka.stream.testkit.TestSubscriber +import akka.stream.testkit.Utils._ +import akka.stream.testkit.scaladsl.StreamTestKit._ +import akka.testkit.TestLatch +import akka.testkit.TestProbe object UnfoldResourceAsyncSourceSpec { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceSourceSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceSourceSpec.scala index 35eb3918d2..1340738954 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceSourceSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/UnfoldResourceSourceSpec.scala @@ -9,6 +9,11 @@ import java.nio.charset.StandardCharsets import java.nio.file.Files import java.util.concurrent.atomic.AtomicInteger +import scala.concurrent.duration._ + +import com.google.common.jimfs.Configuration +import com.google.common.jimfs.Jimfs + import akka.stream.ActorAttributes import akka.stream.ActorAttributes._ import akka.stream.Supervision._ @@ -23,10 +28,6 @@ import akka.stream.testkit.scaladsl.StreamTestKit._ import akka.stream.testkit.scaladsl.TestSink import akka.testkit.EventFilter import akka.util.ByteString -import com.google.common.jimfs.Configuration -import com.google.common.jimfs.Jimfs - -import scala.concurrent.duration._ class UnfoldResourceSourceSpec extends StreamSpec(UnboundedMailboxConfig) { diff --git a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/WithContextUsageSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/WithContextUsageSpec.scala index 84ba83d3e3..de4314f3cf 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/scaladsl/WithContextUsageSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/scaladsl/WithContextUsageSpec.scala @@ -4,13 +4,13 @@ package akka.stream.scaladsl +import scala.collection.immutable + import akka.NotUsed import akka.stream.testkit.StreamSpec import akka.stream.testkit.TestSubscriber.Probe import akka.stream.testkit.scaladsl.TestSink -import scala.collection.immutable - class WithContextUsageSpec extends StreamSpec { "Context propagation used for committing offsets" must { diff --git a/akka-stream-tests/src/test/scala/akka/stream/snapshot/MaterializerStateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/snapshot/MaterializerStateSpec.scala index 8ab91b2c35..18aa45d71c 100644 --- a/akka-stream-tests/src/test/scala/akka/stream/snapshot/MaterializerStateSpec.scala +++ b/akka-stream-tests/src/test/scala/akka/stream/snapshot/MaterializerStateSpec.scala @@ -4,6 +4,8 @@ package akka.stream.snapshot +import scala.concurrent.Promise + import akka.stream.FlowShape import akka.stream.Materializer import akka.stream.scaladsl.Flow @@ -16,8 +18,6 @@ import akka.stream.scaladsl.Source import akka.stream.testkit.StreamSpec import akka.stream.testkit.scaladsl.TestSink -import scala.concurrent.Promise - class MaterializerStateSpec extends StreamSpec { "The MaterializerSnapshotting" must { diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala index 9bf18757e3..200f339ef3 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorFlow.scala @@ -6,13 +6,13 @@ package akka.stream.typed.javadsl import java.util.function.BiFunction +import scala.concurrent.duration._ + import akka.NotUsed import akka.actor.typed.ActorRef import akka.stream.javadsl.Flow import akka.util.JavaDurationConverters -import scala.concurrent.duration._ - /** * Collection of Flows aimed at integrating with typed Actors. */ diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSink.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSink.scala index 31eb825660..ab26ff4add 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSink.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSink.scala @@ -4,8 +4,8 @@ package akka.stream.typed.javadsl -import akka.actor.typed._ import akka.NotUsed +import akka.actor.typed._ import akka.stream.javadsl._ import akka.stream.typed diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSource.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSource.scala index 1eff7bb3e5..b5925cd0cb 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSource.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/javadsl/ActorSource.scala @@ -8,8 +8,8 @@ import java.util.function.Predicate import akka.actor.typed._ import akka.japi.JavaPartialFunction -import akka.stream.javadsl._ import akka.stream.{ CompletionStrategy, OverflowStrategy } +import akka.stream.javadsl._ /** * Collection of Sources aimed at integrating with typed Actors. diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala index b40e0f77fa..4a1efffc2c 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorFlow.scala @@ -4,6 +4,9 @@ package akka.stream.typed.scaladsl +import scala.annotation.implicitNotFound +import scala.concurrent.Future + import akka.NotUsed import akka.actor.typed.ActorRef import akka.pattern.AskTimeoutException @@ -11,9 +14,6 @@ import akka.stream._ import akka.stream.scaladsl._ import akka.util.Timeout -import scala.annotation.implicitNotFound -import scala.concurrent.Future - /** * Collection of Flows aimed at integrating with typed Actors. */ diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSink.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSink.scala index 9fc870fc3f..8e371bc376 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSink.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSink.scala @@ -4,9 +4,9 @@ package akka.stream.typed.scaladsl +import akka.NotUsed import akka.actor.typed._ import akka.stream.scaladsl._ -import akka.NotUsed /** * Collection of Sinks aimed at integrating with typed Actors. diff --git a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSource.scala b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSource.scala index c1318d537c..60df2faa95 100644 --- a/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSource.scala +++ b/akka-stream-typed/src/main/scala/akka/stream/typed/scaladsl/ActorSource.scala @@ -5,8 +5,8 @@ package akka.stream.typed.scaladsl import akka.actor.typed._ -import akka.stream.scaladsl._ import akka.stream.{ CompletionStrategy, OverflowStrategy } +import akka.stream.scaladsl._ /** * Collection of Sources aimed at integrating with typed Actors. diff --git a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala index 367c4340ea..0ae5b85d75 100644 --- a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala +++ b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/ActorSourceSinkSpec.scala @@ -4,14 +4,15 @@ package akka.stream.typed.scaladsl +import org.scalatest.wordspec.AnyWordSpecLike + +import akka.actor.testkit.typed.scaladsl._ import akka.actor.typed.ActorRef import akka.actor.typed.scaladsl.Behaviors import akka.stream.{ CompletionStrategy, OverflowStrategy } import akka.stream.scaladsl.Keep import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import akka.actor.testkit.typed.scaladsl._ -import org.scalatest.wordspec.AnyWordSpecLike object ActorSourceSinkSpec { diff --git a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/MaterializerForTypedSpec.scala b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/MaterializerForTypedSpec.scala index b62f2d6a9c..090b42f5db 100644 --- a/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/MaterializerForTypedSpec.scala +++ b/akka-stream-typed/src/test/scala/akka/stream/typed/scaladsl/MaterializerForTypedSpec.scala @@ -4,6 +4,11 @@ package akka.stream.typed.scaladsl +import scala.concurrent.Future +import scala.util.Success + +import org.scalatest.wordspec.AnyWordSpecLike + import akka.Done import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit import akka.actor.typed.scaladsl.Behaviors @@ -12,10 +17,6 @@ import akka.stream.Materializer import akka.stream.scaladsl.Sink import akka.stream.scaladsl.Source -import scala.concurrent.Future -import scala.util.Success -import org.scalatest.wordspec.AnyWordSpecLike - class MaterializerForTypedSpec extends ScalaTestWithActorTestKit with AnyWordSpecLike { "Materialization in typed" should { diff --git a/akka-stream/src/main/scala-jdk-9/akka/stream/impl/JavaFlowAndRsConverters.scala b/akka-stream/src/main/scala-jdk-9/akka/stream/impl/JavaFlowAndRsConverters.scala index 7fe03f2201..b4e20c0f5b 100644 --- a/akka-stream/src/main/scala-jdk-9/akka/stream/impl/JavaFlowAndRsConverters.scala +++ b/akka-stream/src/main/scala-jdk-9/akka/stream/impl/JavaFlowAndRsConverters.scala @@ -6,9 +6,10 @@ package akka.stream.impl import java.util.concurrent.Flow -import akka.annotation.InternalApi -import org.{ reactivestreams => rs } import JavaFlowAndRsConverters.Implicits._ +import org.{reactivestreams => rs} + +import akka.annotation.InternalApi /** * INTERNAL API: Provides converters between Reactive Streams (reactive-streams.org) and their Java 9+ counter-parts, diff --git a/akka-stream/src/main/scala-jdk-9/akka/stream/scaladsl/JavaFlowSupport.scala b/akka-stream/src/main/scala-jdk-9/akka/stream/scaladsl/JavaFlowSupport.scala index 01f0dad606..d4b08ce757 100644 --- a/akka-stream/src/main/scala-jdk-9/akka/stream/scaladsl/JavaFlowSupport.scala +++ b/akka-stream/src/main/scala-jdk-9/akka/stream/scaladsl/JavaFlowSupport.scala @@ -4,14 +4,14 @@ package akka.stream.scaladsl -import java.util.{ concurrent => juc } +import java.util.{concurrent => juc} + +import scala.annotation.unchecked.uncheckedVariance import akka.NotUsed import akka.stream.impl.JavaFlowAndRsConverters import akka.stream.scaladsl -import scala.annotation.unchecked.uncheckedVariance - /** * For use only with `JDK 9+`. * diff --git a/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala b/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala index d603f8ac72..a06e7c0cdf 100644 --- a/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala +++ b/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala @@ -6,6 +6,13 @@ package akka.stream import java.util.concurrent.TimeUnit +import scala.concurrent.duration._ +import scala.util.control.NoStackTrace + +import com.github.ghik.silencer.silent +import com.typesafe.config.Config +import com.typesafe.config.ConfigFactory + import akka.actor.ActorContext import akka.actor.ActorRef import akka.actor.ActorRefFactory @@ -18,12 +25,6 @@ import akka.japi.function import akka.stream.impl._ import akka.stream.stage.GraphStageLogic import akka.util.Helpers.toRootLowerCase -import com.github.ghik.silencer.silent -import com.typesafe.config.Config -import com.typesafe.config.ConfigFactory - -import scala.concurrent.duration._ -import scala.util.control.NoStackTrace object ActorMaterializer { diff --git a/akka-stream/src/main/scala/akka/stream/Attributes.scala b/akka-stream/src/main/scala/akka/stream/Attributes.scala index d977c648d0..f86fb8eb32 100644 --- a/akka-stream/src/main/scala/akka/stream/Attributes.scala +++ b/akka-stream/src/main/scala/akka/stream/Attributes.scala @@ -4,26 +4,23 @@ package akka.stream -import java.util.Optional - -import akka.event.Logging - -import scala.annotation.tailrec -import scala.reflect.{ classTag, ClassTag } -import akka.japi.function import java.net.URLEncoder import java.time.Duration +import java.util.Optional + +import scala.annotation.tailrec +import scala.compat.java8.OptionConverters._ +import scala.concurrent.duration.FiniteDuration +import scala.reflect.{ classTag, ClassTag } import akka.annotation.ApiMayChange import akka.annotation.DoNotInherit import akka.annotation.InternalApi +import akka.event.Logging +import akka.japi.function import akka.stream.impl.TraversalBuilder -import akka.util.JavaDurationConverters._ - -import scala.compat.java8.OptionConverters._ import akka.util.{ ByteString, OptionVal } - -import scala.concurrent.duration.FiniteDuration +import akka.util.JavaDurationConverters._ /** * Holds attributes which can be used to alter [[akka.stream.scaladsl.Flow]] / [[akka.stream.javadsl.Flow]] diff --git a/akka-stream/src/main/scala/akka/stream/FanInShape.scala b/akka-stream/src/main/scala/akka/stream/FanInShape.scala index 588ab4cfe1..4a84c79e5c 100644 --- a/akka-stream/src/main/scala/akka/stream/FanInShape.scala +++ b/akka-stream/src/main/scala/akka/stream/FanInShape.scala @@ -4,8 +4,8 @@ package akka.stream -import scala.collection.immutable import scala.annotation.unchecked.uncheckedVariance +import scala.collection.immutable object FanInShape { sealed trait Init[O] { diff --git a/akka-stream/src/main/scala/akka/stream/FanOutShape.scala b/akka-stream/src/main/scala/akka/stream/FanOutShape.scala index 253cb3db6d..76ef3c2265 100644 --- a/akka-stream/src/main/scala/akka/stream/FanOutShape.scala +++ b/akka-stream/src/main/scala/akka/stream/FanOutShape.scala @@ -4,8 +4,8 @@ package akka.stream -import scala.collection.immutable import scala.annotation.unchecked.uncheckedVariance +import scala.collection.immutable object FanOutShape { sealed trait Init[I] { diff --git a/akka-stream/src/main/scala/akka/stream/Graph.scala b/akka-stream/src/main/scala/akka/stream/Graph.scala index a7b1c40f81..63ce1ceb1a 100644 --- a/akka-stream/src/main/scala/akka/stream/Graph.scala +++ b/akka-stream/src/main/scala/akka/stream/Graph.scala @@ -4,12 +4,12 @@ package akka.stream +import scala.annotation.unchecked.uncheckedVariance + import akka.annotation.InternalApi import akka.stream.impl.TraversalBuilder import akka.stream.scaladsl.GenericGraph -import scala.annotation.unchecked.uncheckedVariance - /** * Not intended to be directly extended by user classes * diff --git a/akka-stream/src/main/scala/akka/stream/IOResult.scala b/akka-stream/src/main/scala/akka/stream/IOResult.scala index ced4c65382..be51e45b74 100644 --- a/akka-stream/src/main/scala/akka/stream/IOResult.scala +++ b/akka-stream/src/main/scala/akka/stream/IOResult.scala @@ -4,11 +4,12 @@ package akka.stream -import akka.Done +import scala.util.{ Failure, Success, Try } +import scala.util.control.NoStackTrace + import com.github.ghik.silencer.silent -import scala.util.control.NoStackTrace -import scala.util.{ Failure, Success, Try } +import akka.Done /** * Holds a result of an IO operation. diff --git a/akka-stream/src/main/scala/akka/stream/KillSwitch.scala b/akka-stream/src/main/scala/akka/stream/KillSwitch.scala index d2078ac3ad..a5e6c83d72 100644 --- a/akka-stream/src/main/scala/akka/stream/KillSwitch.scala +++ b/akka-stream/src/main/scala/akka/stream/KillSwitch.scala @@ -4,14 +4,14 @@ package akka.stream -import akka.{ Done, NotUsed } -import akka.stream.stage._ +import java.util.concurrent.atomic.AtomicReference -import scala.concurrent.{ Future, Promise } import scala.collection.concurrent.TrieMap +import scala.concurrent.{ Future, Promise } import scala.util.{ Failure, Success, Try } -import java.util.concurrent.atomic.AtomicReference +import akka.{ Done, NotUsed } +import akka.stream.stage._ /** * Creates shared or single kill switches which can be used to control completion of graphs from the outside. diff --git a/akka-stream/src/main/scala/akka/stream/Materializer.scala b/akka-stream/src/main/scala/akka/stream/Materializer.scala index e8142e160d..46b9ca1631 100644 --- a/akka-stream/src/main/scala/akka/stream/Materializer.scala +++ b/akka-stream/src/main/scala/akka/stream/Materializer.scala @@ -4,6 +4,11 @@ package akka.stream +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent + import akka.actor.ActorRef import akka.actor.ActorSystem import akka.actor.Cancellable @@ -13,10 +18,6 @@ import akka.actor.Props import akka.annotation.DoNotInherit import akka.annotation.InternalApi import akka.event.LoggingAdapter -import com.github.ghik.silencer.silent - -import scala.concurrent.ExecutionContextExecutor -import scala.concurrent.duration.FiniteDuration /** * The Materializer is the component responsible for turning a stream blueprint into a running stream. diff --git a/akka-stream/src/main/scala/akka/stream/OverflowStrategy.scala b/akka-stream/src/main/scala/akka/stream/OverflowStrategy.scala index 4567491a79..0277032da8 100644 --- a/akka-stream/src/main/scala/akka/stream/OverflowStrategy.scala +++ b/akka-stream/src/main/scala/akka/stream/OverflowStrategy.scala @@ -5,6 +5,7 @@ package akka.stream import OverflowStrategies._ + import akka.annotation.{ DoNotInherit, InternalApi } import akka.event.Logging import akka.event.Logging.LogLevel diff --git a/akka-stream/src/main/scala/akka/stream/Shape.scala b/akka-stream/src/main/scala/akka/stream/Shape.scala index 8a4fa3fdea..9f62895e75 100644 --- a/akka-stream/src/main/scala/akka/stream/Shape.scala +++ b/akka-stream/src/main/scala/akka/stream/Shape.scala @@ -4,11 +4,12 @@ package akka.stream -import akka.util.Collections.EmptyImmutableSeq -import scala.collection.immutable -import akka.util.ccompat.JavaConverters._ import scala.annotation.unchecked.uncheckedVariance +import scala.collection.immutable + import akka.annotation.InternalApi +import akka.util.Collections.EmptyImmutableSeq +import akka.util.ccompat.JavaConverters._ /** * An input port of a StreamLayout.Module. This type logically belongs diff --git a/akka-stream/src/main/scala/akka/stream/SslTlsOptions.scala b/akka-stream/src/main/scala/akka/stream/SslTlsOptions.scala index e0c3b1bf08..d14092fe08 100644 --- a/akka-stream/src/main/scala/akka/stream/SslTlsOptions.scala +++ b/akka-stream/src/main/scala/akka/stream/SslTlsOptions.scala @@ -4,13 +4,13 @@ package akka.stream +import scala.annotation.varargs +import scala.collection.immutable + import javax.net.ssl._ import akka.util.ByteString -import scala.annotation.varargs -import scala.collection.immutable - /** * Many protocols are asymmetric and distinguish between the client and the * server, where the latter listens passively for messages and the former diff --git a/akka-stream/src/main/scala/akka/stream/StreamRefSettings.scala b/akka-stream/src/main/scala/akka/stream/StreamRefSettings.scala index 7bf96032e7..76f44ad5f0 100644 --- a/akka-stream/src/main/scala/akka/stream/StreamRefSettings.scala +++ b/akka-stream/src/main/scala/akka/stream/StreamRefSettings.scala @@ -6,13 +6,14 @@ package akka.stream import java.util.concurrent.TimeUnit -import akka.actor.ActorSystem -import akka.annotation.DoNotInherit -import akka.stream.impl.streamref.StreamRefSettingsImpl +import scala.concurrent.duration._ + import com.github.ghik.silencer.silent import com.typesafe.config.Config -import scala.concurrent.duration._ +import akka.actor.ActorSystem +import akka.annotation.DoNotInherit +import akka.stream.impl.streamref.StreamRefSettingsImpl @silent("deprecated") object StreamRefSettings { diff --git a/akka-stream/src/main/scala/akka/stream/StreamRefs.scala b/akka-stream/src/main/scala/akka/stream/StreamRefs.scala index 13b22d936a..2a780bb896 100644 --- a/akka-stream/src/main/scala/akka/stream/StreamRefs.scala +++ b/akka-stream/src/main/scala/akka/stream/StreamRefs.scala @@ -4,6 +4,8 @@ package akka.stream +import scala.language.implicitConversions + import akka.NotUsed import akka.actor.ActorRef import akka.actor.ActorSystem @@ -15,8 +17,6 @@ import akka.annotation.DoNotInherit import akka.stream.impl.streamref.StreamRefResolverImpl import akka.stream.scaladsl.{ Sink, Source } -import scala.language.implicitConversions - /** * See full documentation on [[SinkRef]]. */ diff --git a/akka-stream/src/main/scala/akka/stream/SubscriptionWithCancelException.scala b/akka-stream/src/main/scala/akka/stream/SubscriptionWithCancelException.scala index b05ced9a37..b7aacdff59 100644 --- a/akka-stream/src/main/scala/akka/stream/SubscriptionWithCancelException.scala +++ b/akka-stream/src/main/scala/akka/stream/SubscriptionWithCancelException.scala @@ -4,10 +4,11 @@ package akka.stream -import akka.annotation.DoNotInherit +import scala.util.control.NoStackTrace + import org.reactivestreams.Subscription -import scala.util.control.NoStackTrace +import akka.annotation.DoNotInherit /** * Extension of Subscription that allows to pass a cause when a subscription is cancelled. diff --git a/akka-stream/src/main/scala/akka/stream/SystemMaterializer.scala b/akka-stream/src/main/scala/akka/stream/SystemMaterializer.scala index 2361432d7d..27b521bdf6 100644 --- a/akka-stream/src/main/scala/akka/stream/SystemMaterializer.scala +++ b/akka-stream/src/main/scala/akka/stream/SystemMaterializer.scala @@ -4,6 +4,11 @@ package akka.stream +import scala.concurrent.Await +import scala.concurrent.Promise + +import com.github.ghik.silencer.silent + import akka.actor.ActorSystem import akka.actor.ClassicActorSystemProvider import akka.actor.Deploy @@ -13,14 +18,10 @@ import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider import akka.annotation.InternalApi import akka.dispatch.Dispatchers -import akka.stream.impl.MaterializerGuardian - -import scala.concurrent.Await -import scala.concurrent.Promise -import akka.util.JavaDurationConverters._ import akka.pattern.ask +import akka.stream.impl.MaterializerGuardian +import akka.util.JavaDurationConverters._ import akka.util.Timeout -import com.github.ghik.silencer.silent /** * The system materializer is a default materializer to use for most cases running streams, it is a single instance diff --git a/akka-stream/src/main/scala/akka/stream/UniformFanInShape.scala b/akka-stream/src/main/scala/akka/stream/UniformFanInShape.scala index 585401fb2f..9ffac112d4 100644 --- a/akka-stream/src/main/scala/akka/stream/UniformFanInShape.scala +++ b/akka-stream/src/main/scala/akka/stream/UniformFanInShape.scala @@ -4,8 +4,8 @@ package akka.stream -import scala.collection.immutable import scala.annotation.unchecked.uncheckedVariance +import scala.collection.immutable object UniformFanInShape { def apply[I, O](outlet: Outlet[O], inlets: Inlet[I]*): UniformFanInShape[I, O] = diff --git a/akka-stream/src/main/scala/akka/stream/UniformFanOutShape.scala b/akka-stream/src/main/scala/akka/stream/UniformFanOutShape.scala index 6658eb0db0..ae6fe73a8a 100644 --- a/akka-stream/src/main/scala/akka/stream/UniformFanOutShape.scala +++ b/akka-stream/src/main/scala/akka/stream/UniformFanOutShape.scala @@ -4,8 +4,8 @@ package akka.stream -import scala.collection.immutable import scala.annotation.unchecked.uncheckedVariance +import scala.collection.immutable object UniformFanOutShape { def apply[I, O](inlet: Inlet[I], outlets: Outlet[O]*): UniformFanOutShape[I, O] = diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala index acc6768ff4..482254c0ba 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala @@ -6,6 +6,13 @@ package akka.stream.impl import java.util.concurrent.atomic.AtomicBoolean +import scala.collection.immutable +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.Future +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent + import akka.actor._ import akka.annotation.DoNotInherit import akka.annotation.InternalApi @@ -20,12 +27,6 @@ import akka.stream.impl.fusing.GraphInterpreterShell import akka.stream.snapshot.StreamSnapshot import akka.util.OptionVal import akka.util.Timeout -import com.github.ghik.silencer.silent - -import scala.collection.immutable -import scala.concurrent.duration._ -import scala.concurrent.ExecutionContextExecutor -import scala.concurrent.Future /** * ExtendedActorMaterializer used by subtypes which delegates in-island wiring to [[akka.stream.impl.PhaseIsland]]s diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala index cd3782bc6f..d548570e43 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorProcessor.scala @@ -4,13 +4,14 @@ package akka.stream.impl +import org.reactivestreams.{ Processor, Subscriber, Subscription } + import akka.actor._ import akka.annotation.InternalApi -import akka.stream.{ AbruptTerminationException, Attributes } -import akka.stream.impl.ActorSubscriberMessage.{ OnComplete, OnError, OnNext, OnSubscribe } -import org.reactivestreams.{ Processor, Subscriber, Subscription } import akka.event.Logging +import akka.stream.{ AbruptTerminationException, Attributes } import akka.stream.ActorAttributes +import akka.stream.impl.ActorSubscriberMessage.{ OnComplete, OnError, OnNext, OnSubscribe } import akka.util.unused /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala index 3d211826da..168a207aa8 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorPublisher.scala @@ -10,11 +10,12 @@ import scala.annotation.tailrec import scala.collection.immutable import scala.util.control.NoStackTrace -import akka.actor.{ Actor, ActorRef, Terminated } -import akka.annotation.InternalApi import org.reactivestreams.{ Publisher, Subscriber } import org.reactivestreams.Subscription +import akka.actor.{ Actor, ActorRef, Terminated } +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala index ce5f460ba4..aea6e87c82 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSinkStage.scala @@ -8,9 +8,9 @@ import java.util import akka.actor._ import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes import akka.stream._ import akka.stream.Attributes.InputBuffer +import akka.stream.impl.Stages.DefaultAttributes import akka.stream.stage._ /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkStage.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkStage.scala index 1227928412..6ab22c2993 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSinkStage.scala @@ -6,8 +6,8 @@ package akka.stream.impl import akka.actor.{ ActorRef, Terminated } import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes import akka.stream.{ AbruptStageTerminationException, Attributes, Inlet, SinkShape } +import akka.stream.impl.Stages.DefaultAttributes import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, StageLogging } /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala index 1d26120300..fcd8a7daa0 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala @@ -6,8 +6,8 @@ package akka.stream.impl import akka.actor.{ ActorRef, PoisonPill } import akka.annotation.InternalApi -import akka.stream.OverflowStrategies._ import akka.stream._ +import akka.stream.OverflowStrategies._ import akka.stream.stage._ import akka.util.OptionVal diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorSubscriberMessage.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorSubscriberMessage.scala index c198fbfe9a..60dbcaa937 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorSubscriberMessage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorSubscriberMessage.scala @@ -4,10 +4,11 @@ package akka.stream.impl +import org.reactivestreams.Subscription + import akka.actor.DeadLetterSuppression import akka.actor.NoSerializationVerificationNeeded import akka.annotation.InternalApi -import org.reactivestreams.Subscription /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala b/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala index 3082f348d7..e2c7606790 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/CompletedPublishers.scala @@ -4,9 +4,10 @@ package akka.stream.impl -import akka.annotation.InternalApi import org.reactivestreams.{ Publisher, Subscriber, Subscription } +import akka.annotation.InternalApi + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala b/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala index d7e32c8bc0..d758ef09be 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala @@ -5,8 +5,8 @@ package akka.stream.impl import akka.annotation.InternalApi -import akka.japi.function.{ Function => JFun, Function2 => JFun2 } import akka.japi.{ Pair => JPair } +import akka.japi.function.{ Function => JFun, Function2 => JFun2 } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala b/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala index b8ec41b199..920aad53dd 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanIn.scala @@ -4,13 +4,14 @@ package akka.stream.impl +import org.reactivestreams.{ Subscriber, Subscription } + import akka.actor._ import akka.annotation.{ DoNotInherit, InternalApi } +import akka.stream.AbruptTerminationException import akka.stream.ActorAttributes import akka.stream.Attributes -import akka.stream.AbruptTerminationException import akka.util.unused -import org.reactivestreams.{ Subscriber, Subscription } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala b/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala index 0430e6e6e4..b3d0d846ab 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanOut.scala @@ -4,15 +4,16 @@ package akka.stream.impl -import akka.stream.AbruptTerminationException - import scala.collection.immutable + +import org.reactivestreams.Subscription + import akka.actor._ import akka.annotation.{ DoNotInherit, InternalApi } +import akka.stream.AbruptTerminationException import akka.stream.ActorAttributes import akka.stream.Attributes import akka.util.unused -import org.reactivestreams.Subscription /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/FanoutProcessor.scala b/akka-stream/src/main/scala/akka/stream/impl/FanoutProcessor.scala index d7bf1b5545..39e9529611 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/FanoutProcessor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/FanoutProcessor.scala @@ -4,6 +4,8 @@ package akka.stream.impl +import org.reactivestreams.Subscriber + import akka.actor.Actor import akka.actor.ActorRef import akka.actor.Deploy @@ -12,7 +14,6 @@ import akka.annotation.InternalApi import akka.stream.ActorAttributes.StreamSubscriptionTimeout import akka.stream.Attributes import akka.stream.StreamSubscriptionTimeoutTerminationMode -import org.reactivestreams.Subscriber import akka.util.OptionVal /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/JavaStreamSource.scala b/akka-stream/src/main/scala/akka/stream/impl/JavaStreamSource.scala index 37ec2604e7..52cedecaa4 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/JavaStreamSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/JavaStreamSource.scala @@ -4,9 +4,9 @@ package akka.stream.impl +import akka.annotation.InternalApi import akka.stream._ import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler } -import akka.annotation.InternalApi /** INTERNAL API */ @InternalApi private[stream] final class JavaStreamSource[T, S <: java.util.stream.BaseStream[T, S]]( diff --git a/akka-stream/src/main/scala/akka/stream/impl/JsonObjectParser.scala b/akka-stream/src/main/scala/akka/stream/impl/JsonObjectParser.scala index 7de77599d3..dd3a9486bc 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/JsonObjectParser.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/JsonObjectParser.scala @@ -4,12 +4,12 @@ package akka.stream.impl +import scala.annotation.switch + import akka.annotation.InternalApi import akka.stream.scaladsl.Framing.FramingException import akka.util.ByteString -import scala.annotation.switch - /** * INTERNAL API: Use [[akka.stream.scaladsl.JsonFraming]] instead. */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/LazySource.scala b/akka-stream/src/main/scala/akka/stream/impl/LazySource.scala index 2da7982d6a..586befd6a3 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/LazySource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/LazySource.scala @@ -4,15 +4,15 @@ package akka.stream.impl +import scala.concurrent.{ Future, Promise } +import scala.util.control.NonFatal + import akka.annotation.InternalApi import akka.stream._ import akka.stream.impl.Stages.DefaultAttributes import akka.stream.scaladsl.{ Keep, Source } import akka.stream.stage._ -import scala.concurrent.{ Future, Promise } -import scala.util.control.NonFatal - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/MaterializerGuardian.scala b/akka-stream/src/main/scala/akka/stream/impl/MaterializerGuardian.scala index 830786ed98..4bbfd918e6 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/MaterializerGuardian.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/MaterializerGuardian.scala @@ -4,14 +4,15 @@ package akka.stream.impl +import scala.concurrent.Promise + +import com.github.ghik.silencer.silent + import akka.actor.Actor import akka.actor.Props import akka.annotation.InternalApi import akka.stream.ActorMaterializerSettings import akka.stream.Materializer -import com.github.ghik.silencer.silent - -import scala.concurrent.Promise /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/MaybeSource.scala b/akka-stream/src/main/scala/akka/stream/impl/MaybeSource.scala index b2d532b94e..98fdae89b5 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/MaybeSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/MaybeSource.scala @@ -4,16 +4,16 @@ package akka.stream.impl -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, OutHandler } -import akka.stream._ -import akka.util.OptionVal - import scala.concurrent.Promise import scala.util.Try +import akka.annotation.InternalApi +import akka.dispatch.ExecutionContexts +import akka.stream._ +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, OutHandler } +import akka.util.OptionVal + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Modules.scala b/akka-stream/src/main/scala/akka/stream/impl/Modules.scala index ebe2dbb625..fbc1695645 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Modules.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Modules.scala @@ -4,14 +4,15 @@ package akka.stream.impl -import akka.NotUsed -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.stream._ -import akka.stream.impl.StreamLayout.AtomicModule +import scala.annotation.unchecked.uncheckedVariance + import org.reactivestreams._ -import scala.annotation.unchecked.uncheckedVariance +import akka.NotUsed +import akka.annotation.{ DoNotInherit, InternalApi } import akka.event.Logging +import akka.stream._ +import akka.stream.impl.StreamLayout.AtomicModule /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala b/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala index 36fb7d20d1..894c7767fb 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/PhasedFusingActorMaterializer.scala @@ -7,6 +7,16 @@ package akka.stream.impl import java.util import java.util.concurrent.atomic.AtomicBoolean +import scala.collection.immutable.Map +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.ExecutionContextExecutor +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent +import org.reactivestreams.Processor +import org.reactivestreams.Publisher +import org.reactivestreams.Subscriber + import akka.NotUsed import akka.actor.ActorContext import akka.actor.ActorRef @@ -21,30 +31,21 @@ import akka.annotation.InternalStableApi import akka.dispatch.Dispatchers import akka.event.Logging import akka.event.LoggingAdapter -import akka.stream.Attributes.InputBuffer import akka.stream._ +import akka.stream.Attributes.InputBuffer import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.StreamLayout.AtomicModule +import akka.stream.impl.fusing._ import akka.stream.impl.fusing.ActorGraphInterpreter.ActorOutputBoundary import akka.stream.impl.fusing.ActorGraphInterpreter.BatchingActorInputBoundary import akka.stream.impl.fusing.GraphInterpreter.Connection -import akka.stream.impl.fusing._ import akka.stream.impl.io.TLSActor import akka.stream.impl.io.TlsModule import akka.stream.stage.GraphStageLogic import akka.stream.stage.InHandler import akka.stream.stage.OutHandler import akka.util.OptionVal -import org.reactivestreams.Processor -import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber - -import scala.collection.immutable.Map -import scala.concurrent.ExecutionContextExecutor -import scala.concurrent.duration.FiniteDuration -import scala.concurrent.ExecutionContextExecutor import akka.util.OptionVal -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala b/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala index 3230939a1f..8606a314a0 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/QueueSource.scala @@ -4,13 +4,14 @@ package akka.stream.impl +import scala.concurrent.{ Future, Promise } + import akka.Done import akka.annotation.InternalApi -import akka.stream.OverflowStrategies._ import akka.stream._ -import akka.stream.stage._ +import akka.stream.OverflowStrategies._ import akka.stream.scaladsl.SourceQueueWithComplete -import scala.concurrent.{ Future, Promise } +import akka.stream.stage._ /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala b/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala index 81033acd27..1bfe32f631 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ReactiveStreamsCompliance.scala @@ -4,12 +4,13 @@ package akka.stream.impl +import scala.util.control.NonFatal + +import org.reactivestreams.{ Subscriber, Subscription } + import akka.annotation.InternalApi import akka.stream.SubscriptionWithCancelException -import scala.util.control.NonFatal -import org.reactivestreams.{ Subscriber, Subscription } - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/ResizableMultiReaderRingBuffer.scala b/akka-stream/src/main/scala/akka/stream/impl/ResizableMultiReaderRingBuffer.scala index 68563948e9..4587b3bf38 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ResizableMultiReaderRingBuffer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ResizableMultiReaderRingBuffer.scala @@ -6,7 +6,9 @@ package akka.stream.impl import scala.annotation.tailrec import scala.util.control.NoStackTrace + import ResizableMultiReaderRingBuffer._ + import akka.annotation.InternalApi /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/RetryFlowCoordinator.scala b/akka-stream/src/main/scala/akka/stream/impl/RetryFlowCoordinator.scala index 6fee0c8267..3f915a7144 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/RetryFlowCoordinator.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/RetryFlowCoordinator.scala @@ -4,15 +4,15 @@ package akka.stream.impl +import scala.concurrent.duration._ + import akka.annotation.InternalApi import akka.pattern.BackoffSupervisor +import akka.stream.{ Attributes, BidiShape, Inlet, Outlet } import akka.stream.SubscriptionWithCancelException.NonFailureCancellation import akka.stream.stage._ -import akka.stream.{ Attributes, BidiShape, Inlet, Outlet } import akka.util.OptionVal -import scala.concurrent.duration._ - /** * INTERNAL API. * diff --git a/akka-stream/src/main/scala/akka/stream/impl/SetupStage.scala b/akka-stream/src/main/scala/akka/stream/impl/SetupStage.scala index 885b880681..dd3330b65b 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/SetupStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/SetupStage.scala @@ -4,6 +4,10 @@ package akka.stream.impl +import scala.concurrent.Future +import scala.concurrent.Promise +import scala.util.control.NonFatal + import akka.annotation.InternalApi import akka.stream._ import akka.stream.scaladsl.Flow @@ -15,10 +19,6 @@ import akka.stream.stage.GraphStageWithMaterializedValue import akka.stream.stage.InHandler import akka.stream.stage.OutHandler -import scala.concurrent.Future -import scala.concurrent.Promise -import scala.util.control.NonFatal - /** Internal Api */ @InternalApi private[stream] final class SetupSinkStage[T, M](factory: (Materializer, Attributes) => Sink[T, M]) extends GraphStageWithMaterializedValue[SinkShape[T], Future[M]] { diff --git a/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala b/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala index 4aac9ebd81..45f7d41ea6 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/SinkholeSubscriber.scala @@ -4,12 +4,13 @@ package akka.stream.impl +import scala.concurrent.Promise + +import org.reactivestreams.{ Subscriber, Subscription } + import akka.Done import akka.annotation.InternalApi -import scala.concurrent.Promise -import org.reactivestreams.{ Subscriber, Subscription } - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala index 23ce66bf21..3e42f9d872 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Sinks.scala @@ -6,26 +6,6 @@ package akka.stream.impl import java.util.function.BinaryOperator -import akka.NotUsed -import akka.annotation.DoNotInherit -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.event.Logging -import akka.stream.ActorAttributes.StreamSubscriptionTimeout -import akka.stream.Attributes.InputBuffer -import akka.stream._ -import akka.stream.impl.QueueSink.Output -import akka.stream.impl.QueueSink.Pull -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.impl.StreamLayout.AtomicModule -import akka.stream.scaladsl.Sink -import akka.stream.scaladsl.SinkQueueWithCancel -import akka.stream.scaladsl.Source -import akka.stream.stage._ -import akka.util.ccompat._ -import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber - import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.collection.mutable @@ -36,6 +16,27 @@ import scala.util.Success import scala.util.Try import scala.util.control.NonFatal +import org.reactivestreams.Publisher +import org.reactivestreams.Subscriber + +import akka.NotUsed +import akka.annotation.DoNotInherit +import akka.annotation.InternalApi +import akka.dispatch.ExecutionContexts +import akka.event.Logging +import akka.stream._ +import akka.stream.ActorAttributes.StreamSubscriptionTimeout +import akka.stream.Attributes.InputBuffer +import akka.stream.impl.QueueSink.Output +import akka.stream.impl.QueueSink.Pull +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.impl.StreamLayout.AtomicModule +import akka.stream.scaladsl.Sink +import akka.stream.scaladsl.SinkQueueWithCancel +import akka.stream.scaladsl.Source +import akka.stream.stage._ +import akka.util.ccompat._ + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Stages.scala b/akka-stream/src/main/scala/akka/stream/impl/Stages.scala index 0aa4719579..3dd5239b4c 100755 --- a/akka-stream/src/main/scala/akka/stream/impl/Stages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Stages.scala @@ -5,8 +5,8 @@ package akka.stream.impl import akka.annotation.InternalApi -import akka.stream.Attributes._ import akka.stream._ +import akka.stream.Attributes._ /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala b/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala index 539be980c6..faaad6c797 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/StreamLayout.scala @@ -6,17 +6,18 @@ package akka.stream.impl import java.util.concurrent.atomic.AtomicReference -import akka.annotation.InternalApi -import akka.stream._ -import akka.stream.impl.Stages.DefaultAttributes -import akka.util.OptionVal +import scala.annotation.tailrec +import scala.util.control.NonFatal + import org.reactivestreams.Processor import org.reactivestreams.Publisher import org.reactivestreams.Subscriber import org.reactivestreams.Subscription -import scala.annotation.tailrec -import scala.util.control.NonFatal +import akka.annotation.InternalApi +import akka.stream._ +import akka.stream.impl.Stages.DefaultAttributes +import akka.util.OptionVal /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala b/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala index b62da2fd4a..c4361cff32 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala @@ -4,15 +4,16 @@ package akka.stream.impl -import akka.actor._ -import akka.annotation.InternalApi -import akka.stream.StreamSubscriptionTimeoutTerminationMode.{ CancelTermination, NoopTermination, WarnTermination } -import akka.stream.StreamSubscriptionTimeoutSettings +import scala.concurrent.duration.FiniteDuration +import scala.util.control.NoStackTrace + import com.github.ghik.silencer.silent import org.reactivestreams._ -import scala.concurrent.duration.FiniteDuration -import scala.util.control.NoStackTrace +import akka.actor._ +import akka.annotation.InternalApi +import akka.stream.StreamSubscriptionTimeoutSettings +import akka.stream.StreamSubscriptionTimeoutTerminationMode.{ CancelTermination, NoopTermination, WarnTermination } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala b/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala index c3dfda54d8..f45ed42485 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/SubscriberManagement.scala @@ -5,8 +5,9 @@ package akka.stream.impl import scala.annotation.tailrec -import org.reactivestreams.{ Subscriber, Subscription } + import SubscriberManagement.ShutDown +import org.reactivestreams.{ Subscriber, Subscription } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/Throttle.scala b/akka-stream/src/main/scala/akka/stream/impl/Throttle.scala index f438f98e91..1e98dae943 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Throttle.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Throttle.scala @@ -4,15 +4,15 @@ package akka.stream.impl +import scala.concurrent.duration.{ FiniteDuration, _ } + import akka.annotation.InternalApi +import akka.stream._ import akka.stream.ThrottleMode.{ Enforcing, Shaping } import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage._ -import akka.stream._ import akka.util.NanoTimeTokenBucket -import scala.concurrent.duration.{ FiniteDuration, _ } - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/Timers.scala b/akka-stream/src/main/scala/akka/stream/impl/Timers.scala index 22cb1c9da0..917fbfcb5a 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Timers.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Timers.scala @@ -6,14 +6,14 @@ package akka.stream.impl import java.util.concurrent.{ TimeUnit, TimeoutException } +import scala.concurrent.duration.{ Duration, FiniteDuration } + import akka.annotation.InternalApi import akka.stream._ import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage._ -import scala.concurrent.duration.{ Duration, FiniteDuration } - /** * INTERNAL API * diff --git a/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala b/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala index fa34bc8861..f8e71eacfb 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Transfer.scala @@ -5,6 +5,7 @@ package akka.stream.impl import scala.util.control.NonFatal + import akka.actor.Actor import akka.annotation.InternalApi diff --git a/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala b/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala index aeb431fa03..49bb4b7d59 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/TraversalBuilder.scala @@ -4,17 +4,17 @@ package akka.stream.impl +import scala.collection.immutable.Map.Map1 +import scala.language.existentials + import akka.annotation.{ DoNotInherit, InternalApi } import akka.stream._ import akka.stream.impl.StreamLayout.AtomicModule import akka.stream.impl.TraversalBuilder.{ AnyFunction1, AnyFunction2 } -import akka.stream.scaladsl.Keep -import akka.util.OptionVal - -import scala.language.existentials -import scala.collection.immutable.Map.Map1 import akka.stream.impl.fusing.GraphStageModule import akka.stream.impl.fusing.GraphStages.SingleSource +import akka.stream.scaladsl.Keep +import akka.util.OptionVal import akka.util.unused /** diff --git a/akka-stream/src/main/scala/akka/stream/impl/Unfold.scala b/akka-stream/src/main/scala/akka/stream/impl/Unfold.scala index 896be90077..6b97314137 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/Unfold.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/Unfold.scala @@ -4,14 +4,14 @@ package akka.stream.impl -import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler } -import akka.stream._ - import scala.concurrent.Future import scala.util.{ Failure, Success, Try } +import akka.annotation.InternalApi +import akka.stream._ +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.stage.{ GraphStage, GraphStageLogic, OutHandler } + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSource.scala b/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSource.scala index 2a7b466446..7d66e41460 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSource.scala @@ -4,15 +4,15 @@ package akka.stream.impl -import akka.annotation.InternalApi -import akka.stream.ActorAttributes.SupervisionStrategy -import akka.stream._ -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.stage._ - import scala.annotation.tailrec import scala.util.control.NonFatal +import akka.annotation.InternalApi +import akka.stream._ +import akka.stream.ActorAttributes.SupervisionStrategy +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.stage._ + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSourceAsync.scala b/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSourceAsync.scala index 3feb338de6..9b0fce64c3 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSourceAsync.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/UnfoldResourceSourceAsync.scala @@ -4,18 +4,18 @@ package akka.stream.impl -import akka.Done -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts.parasitic -import akka.stream.ActorAttributes.SupervisionStrategy -import akka.stream._ -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.stage._ - import scala.concurrent.Future import scala.util.{ Failure, Success, Try } import scala.util.control.NonFatal +import akka.Done +import akka.annotation.InternalApi +import akka.dispatch.ExecutionContexts.parasitic +import akka.stream._ +import akka.stream.ActorAttributes.SupervisionStrategy +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.stage._ + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala index 102330ee75..5d83ca3e94 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/ActorGraphInterpreter.scala @@ -8,31 +8,32 @@ import java.util import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicReference +import scala.annotation.tailrec +import scala.collection.immutable +import scala.concurrent.Promise +import scala.util.control.NonFatal + +import org.reactivestreams.Publisher +import org.reactivestreams.Subscriber +import org.reactivestreams.Subscription + import akka.Done import akka.actor._ import akka.annotation.InternalApi import akka.annotation.InternalStableApi import akka.event.Logging import akka.stream._ +import akka.stream.impl._ import akka.stream.impl.ReactiveStreamsCompliance._ +import akka.stream.impl.SubFusingActorMaterializerImpl import akka.stream.impl.fusing.GraphInterpreter.Connection import akka.stream.impl.fusing.GraphInterpreter.DownstreamBoundaryStageLogic import akka.stream.impl.fusing.GraphInterpreter.UpstreamBoundaryStageLogic -import akka.stream.impl.SubFusingActorMaterializerImpl -import akka.stream.impl._ import akka.stream.snapshot._ import akka.stream.stage.GraphStageLogic import akka.stream.stage.InHandler import akka.stream.stage.OutHandler import akka.util.OptionVal -import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber -import org.reactivestreams.Subscription - -import scala.annotation.tailrec -import scala.collection.immutable -import scala.concurrent.Promise -import scala.util.control.NonFatal /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/FlatMapPrefix.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/FlatMapPrefix.scala index 1ffc3a40d1..66aff9a909 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/FlatMapPrefix.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/FlatMapPrefix.scala @@ -4,17 +4,17 @@ package akka.stream.impl.fusing -import akka.annotation.InternalApi -import akka.stream.scaladsl.{ Flow, Keep, Source } -import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, InHandler, OutHandler } -import akka.stream._ -import akka.stream.impl.Stages.DefaultAttributes -import akka.util.OptionVal - import scala.collection.immutable import scala.concurrent.{ Future, Promise } import scala.util.control.NonFatal +import akka.annotation.InternalApi +import akka.stream._ +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.scaladsl.{ Flow, Keep, Source } +import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, InHandler, OutHandler } +import akka.util.OptionVal + @InternalApi private[akka] final class FlatMapPrefix[In, Out, M](n: Int, f: immutable.Seq[In] => Flow[In, Out, M]) extends GraphStageWithMaterializedValue[FlowShape[In, Out], Future[M]] { diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala index 2e9b8f96bb..cfff2a5ca3 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala @@ -4,19 +4,19 @@ package akka.stream.impl.fusing -import akka.actor.ActorRef -import akka.event.LoggingAdapter -import akka.stream.stage._ -import akka.stream._ import java.util.concurrent.ThreadLocalRandom -import akka.Done -import akka.annotation.{ InternalApi, InternalStableApi } - import scala.concurrent.Promise import scala.util.control.NonFatal + +import akka.Done +import akka.actor.ActorRef +import akka.annotation.{ InternalApi, InternalStableApi } +import akka.event.LoggingAdapter +import akka.stream._ import akka.stream.Attributes.LogLevels import akka.stream.snapshot._ +import akka.stream.stage._ /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala index 47ceb941a2..dd8b8cd5f1 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/GraphStages.scala @@ -6,23 +6,23 @@ package akka.stream.impl.fusing import java.util.concurrent.atomic.{ AtomicBoolean, AtomicReference } +import scala.annotation.unchecked.uncheckedVariance +import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration.FiniteDuration +import scala.util.Try + import akka.Done import akka.actor.Cancellable import akka.annotation.InternalApi import akka.dispatch.ExecutionContexts import akka.event.Logging +import akka.stream.{ Shape, _ } import akka.stream.FlowMonitorState._ +import akka.stream.impl.{ LinearTraversalBuilder, ReactiveStreamsCompliance } import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.StreamLayout._ -import akka.stream.impl.{ LinearTraversalBuilder, ReactiveStreamsCompliance } import akka.stream.scaladsl._ import akka.stream.stage._ -import akka.stream.{ Shape, _ } - -import scala.annotation.unchecked.uncheckedVariance -import scala.util.Try -import scala.concurrent.duration.FiniteDuration -import scala.concurrent.{ Future, Promise } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala index 934ed08262..c187c9f706 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala @@ -6,33 +6,33 @@ package akka.stream.impl.fusing import java.util.concurrent.TimeUnit.NANOSECONDS -import akka.actor.{ ActorRef, Terminated } -import akka.annotation.{ DoNotInherit, InternalApi } -import akka.dispatch.ExecutionContexts -import akka.event.Logging.LogLevel -import akka.event.{ LogMarker, LogSource, Logging, LoggingAdapter, MarkerLoggingAdapter } -import akka.stream.Attributes.{ InputBuffer, LogLevels } -import akka.stream.OverflowStrategies._ -import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage -import akka.stream.impl.{ ReactiveStreamsCompliance, Buffer => BufferImpl } -import akka.stream.scaladsl.{ DelayStrategy, Flow, Keep, Source } -import akka.stream.stage._ -import akka.stream.{ Supervision, _ } - import scala.annotation.tailrec import scala.collection.immutable import scala.collection.immutable.VectorBuilder import scala.concurrent.{ Future, Promise } -import scala.util.control.{ NoStackTrace, NonFatal } -import scala.util.{ Failure, Success, Try } -import akka.stream.ActorAttributes.SupervisionStrategy - import scala.concurrent.duration.{ FiniteDuration, _ } +import scala.util.{ Failure, Success, Try } +import scala.util.control.{ NoStackTrace, NonFatal } import scala.util.control.Exception.Catcher + +import com.github.ghik.silencer.silent + +import akka.actor.{ ActorRef, Terminated } +import akka.annotation.{ DoNotInherit, InternalApi } +import akka.dispatch.ExecutionContexts +import akka.event.{ LogMarker, LogSource, Logging, LoggingAdapter, MarkerLoggingAdapter } +import akka.event.Logging.LogLevel +import akka.stream.{ Supervision, _ } +import akka.stream.ActorAttributes.SupervisionStrategy +import akka.stream.Attributes.{ InputBuffer, LogLevels } +import akka.stream.OverflowStrategies._ +import akka.stream.impl.{ ReactiveStreamsCompliance, Buffer => BufferImpl } import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage +import akka.stream.scaladsl.{ DelayStrategy, Flow, Keep, Source } +import akka.stream.stage._ import akka.util.OptionVal import akka.util.unused -import com.github.ghik.silencer.silent /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala b/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala index 122dfac20b..c90a2f9a6d 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/fusing/StreamOfStreams.scala @@ -7,27 +7,27 @@ package akka.stream.impl.fusing import java.util.Collections import java.util.concurrent.atomic.AtomicReference -import akka.NotUsed -import akka.annotation.InternalApi -import akka.stream.ActorAttributes.StreamSubscriptionTimeout -import akka.stream.ActorAttributes.SupervisionStrategy -import akka.stream._ -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.impl.fusing.GraphStages.SingleSource -import akka.stream.impl.ActorSubscriberMessage -import akka.stream.impl.SubscriptionTimeoutException -import akka.stream.impl.TraversalBuilder -import akka.stream.impl.{ Buffer => BufferImpl } -import akka.stream.scaladsl._ -import akka.stream.stage._ -import akka.util.OptionVal -import akka.util.ccompat.JavaConverters._ - import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.duration.FiniteDuration import scala.util.control.NonFatal +import akka.NotUsed +import akka.annotation.InternalApi +import akka.stream._ +import akka.stream.ActorAttributes.StreamSubscriptionTimeout +import akka.stream.ActorAttributes.SupervisionStrategy +import akka.stream.impl.{ Buffer => BufferImpl } +import akka.stream.impl.ActorSubscriberMessage +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.impl.SubscriptionTimeoutException +import akka.stream.impl.TraversalBuilder +import akka.stream.impl.fusing.GraphStages.SingleSource +import akka.stream.scaladsl._ +import akka.stream.stage._ +import akka.util.OptionVal +import akka.util.ccompat.JavaConverters._ + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala b/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala index bdd8c380c6..0709c4e0ec 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/ByteStringParser.scala @@ -4,14 +4,14 @@ package akka.stream.impl.io +import scala.annotation.tailrec +import scala.util.control.{ NoStackTrace, NonFatal } + import akka.annotation.InternalApi import akka.stream._ import akka.stream.stage._ import akka.util.ByteString -import scala.annotation.tailrec -import scala.util.control.{ NoStackTrace, NonFatal } - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/FileOutputStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/FileOutputStage.scala index 08d52da17b..06b4bb2624 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/FileOutputStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/FileOutputStage.scala @@ -8,8 +8,11 @@ import java.nio.channels.FileChannel import java.nio.file.{ OpenOption, Path } import scala.collection.immutable +import scala.concurrent.{ Future, Promise } +import scala.util.Success +import scala.util.control.NonFatal + import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes import akka.stream.{ AbruptStageTerminationException, Attributes, @@ -18,14 +21,11 @@ import akka.stream.{ Inlet, SinkShape } +import akka.stream.impl.Stages.DefaultAttributes import akka.stream.stage.{ GraphStageLogic, GraphStageWithMaterializedValue, InHandler } import akka.util.ByteString import akka.util.ccompat.JavaConverters._ -import scala.concurrent.{ Future, Promise } -import scala.util.Success -import scala.util.control.NonFatal - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala b/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala index c34ae00913..5e8a2cea82 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/IOSources.scala @@ -8,16 +8,16 @@ import java.nio.ByteBuffer import java.nio.channels.{ CompletionHandler, FileChannel } import java.nio.file.{ Files, NoSuchFileException, Path, StandardOpenOption } -import akka.Done -import akka.stream.Attributes.InputBuffer -import akka.stream.stage._ -import akka.stream.{ IOResult, _ } -import akka.util.ByteString - import scala.annotation.tailrec import scala.concurrent.{ Future, Promise } -import scala.util.control.NonFatal import scala.util.{ Failure, Success, Try } +import scala.util.control.NonFatal + +import akka.Done +import akka.stream.{ IOResult, _ } +import akka.stream.Attributes.InputBuffer +import akka.stream.stage._ +import akka.util.ByteString /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala index 211b18a92a..3df85f973c 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSinkStage.scala @@ -8,17 +8,17 @@ import java.io.{ IOException, InputStream } import java.util.concurrent.{ BlockingQueue, LinkedBlockingDeque, TimeUnit } import java.util.concurrent.atomic.AtomicBoolean +import scala.annotation.tailrec +import scala.concurrent.duration.FiniteDuration + import akka.annotation.InternalApi +import akka.stream.{ AbruptStageTerminationException, Attributes, Inlet, SinkShape } import akka.stream.Attributes.InputBuffer import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io.InputStreamSinkStage._ import akka.stream.stage._ -import akka.stream.{ AbruptStageTerminationException, Attributes, Inlet, SinkShape } import akka.util.ByteString -import scala.annotation.tailrec -import scala.concurrent.duration.FiniteDuration - private[stream] object InputStreamSinkStage { sealed trait AdapterToStageMessage diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSource.scala b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSource.scala index c7a14e34b7..9bcc91efe6 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/InputStreamSource.scala @@ -6,8 +6,10 @@ package akka.stream.impl.io import java.io.InputStream +import scala.concurrent.{ Future, Promise } +import scala.util.control.NonFatal + import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes import akka.stream.{ AbruptStageTerminationException, Attributes, @@ -17,12 +19,10 @@ import akka.stream.{ SourceShape, SubscriptionWithCancelException } +import akka.stream.impl.Stages.DefaultAttributes import akka.stream.stage.{ GraphStageLogic, GraphStageLogicWithLogging, GraphStageWithMaterializedValue, OutHandler } import akka.util.ByteString -import scala.concurrent.{ Future, Promise } -import scala.util.control.NonFatal - /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamGraphStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamGraphStage.scala index ac8104775c..a1a1c2ca73 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamGraphStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamGraphStage.scala @@ -6,15 +6,15 @@ package akka.stream.impl.io import java.io.OutputStream -import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.stage.{ GraphStageLogic, GraphStageLogicWithLogging, GraphStageWithMaterializedValue, InHandler } -import akka.stream.{ Attributes, IOOperationIncompleteException, IOResult, Inlet, SinkShape } -import akka.util.ByteString - import scala.concurrent.{ Future, Promise } import scala.util.control.NonFatal +import akka.annotation.InternalApi +import akka.stream.{ Attributes, IOOperationIncompleteException, IOResult, Inlet, SinkShape } +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.stage.{ GraphStageLogic, GraphStageLogicWithLogging, GraphStageWithMaterializedValue, InHandler } +import akka.util.ByteString + /** * INTERNAL API */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala index b1295c2e73..747561dd11 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/OutputStreamSourceStage.scala @@ -7,17 +7,17 @@ package akka.stream.impl.io import java.io.{ IOException, OutputStream } import java.util.concurrent.{ Semaphore, TimeUnit } +import scala.concurrent.Await +import scala.concurrent.duration.FiniteDuration +import scala.util.control.NonFatal + +import akka.stream.{ Attributes, Outlet, SourceShape } import akka.stream.Attributes.InputBuffer import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io.OutputStreamSourceStage._ import akka.stream.stage._ -import akka.stream.{ Attributes, Outlet, SourceShape } import akka.util.ByteString -import scala.concurrent.Await -import scala.concurrent.duration.FiniteDuration -import scala.util.control.NonFatal - private[stream] object OutputStreamSourceStage { sealed trait AdapterToStageMessage case class Send(data: ByteString) extends AdapterToStageMessage diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TLSActor.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TLSActor.scala index 5252eb9cf6..524d22f28f 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/TLSActor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/TLSActor.scala @@ -5,25 +5,25 @@ package akka.stream.impl.io import java.nio.ByteBuffer + +import scala.annotation.tailrec +import scala.util.{ Failure, Success, Try } +import scala.util.control.NonFatal + +import javax.net.ssl._ import javax.net.ssl.SSLEngineResult.HandshakeStatus import javax.net.ssl.SSLEngineResult.HandshakeStatus._ import javax.net.ssl.SSLEngineResult.Status._ -import javax.net.ssl._ import akka.actor._ import akka.annotation.InternalApi import akka.stream._ +import akka.stream.TLSProtocol._ +import akka.stream.impl._ import akka.stream.impl.FanIn.InputBunch import akka.stream.impl.FanOut.OutputBunch -import akka.stream.impl._ import akka.util.ByteString -import scala.annotation.tailrec -import akka.stream.TLSProtocol._ - -import scala.util.control.NonFatal -import scala.util.{ Failure, Success, Try } - /** * INTERNAL API. */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala index d0b385a2b7..97fd534198 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/TcpStages.scala @@ -8,6 +8,12 @@ import java.net.InetSocketAddress import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.{ AtomicBoolean, AtomicLong } +import scala.collection.immutable +import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration.{ Duration, FiniteDuration } + +import com.github.ghik.silencer.silent + import akka.{ Done, NotUsed } import akka.actor.{ ActorRef, Terminated } import akka.annotation.InternalApi @@ -18,16 +24,11 @@ import akka.io.Tcp._ import akka.stream._ import akka.stream.impl.ReactiveStreamsCompliance import akka.stream.impl.fusing.GraphStages.detacher +import akka.stream.scaladsl.{ BidiFlow, Flow, TcpIdleTimeoutException, Tcp => StreamTcp } import akka.stream.scaladsl.Tcp.{ OutgoingConnection, ServerBinding } import akka.stream.scaladsl.TcpAttributes -import akka.stream.scaladsl.{ BidiFlow, Flow, TcpIdleTimeoutException, Tcp => StreamTcp } import akka.stream.stage._ import akka.util.ByteString -import com.github.ghik.silencer.silent - -import scala.collection.immutable -import scala.concurrent.duration.{ Duration, FiniteDuration } -import scala.concurrent.{ Future, Promise } /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala b/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala index b3686f3ded..ffda5d5c80 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/TlsModule.scala @@ -4,19 +4,19 @@ package akka.stream.impl.io +import scala.util.Try + import javax.net.ssl.{ SSLEngine, SSLSession } import akka.NotUsed import akka.actor.ActorSystem import akka.annotation.InternalApi import akka.stream._ -import akka.stream.impl.StreamLayout.AtomicModule import akka.stream.TLSProtocol._ import akka.stream.impl.{ TlsModuleIslandTag, TraversalBuilder } +import akka.stream.impl.StreamLayout.AtomicModule import akka.util.ByteString -import scala.util.Try - /** * INTERNAL API. */ diff --git a/akka-stream/src/main/scala/akka/stream/impl/io/compression/DeflateCompressor.scala b/akka-stream/src/main/scala/akka/stream/impl/io/compression/DeflateCompressor.scala index d234b345ab..46757b7c5f 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/io/compression/DeflateCompressor.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/io/compression/DeflateCompressor.scala @@ -6,11 +6,11 @@ package akka.stream.impl.io.compression import java.util.zip.Deflater +import scala.annotation.tailrec + import akka.annotation.InternalApi import akka.util.{ ByteString, ByteStringBuilder } -import scala.annotation.tailrec - /** INTERNAL API */ @InternalApi private[akka] class DeflateCompressor(level: Int = Deflater.BEST_COMPRESSION, nowrap: Boolean = false) extends Compressor { diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala index 45fa08d359..5e79888820 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/SinkRefImpl.scala @@ -4,6 +4,10 @@ package akka.stream.impl.streamref +import scala.util.{ Failure, Success, Try } + +import com.github.ghik.silencer.silent + import akka.Done import akka.NotUsed import akka.actor.{ ActorRef, Terminated } @@ -13,9 +17,6 @@ import akka.stream._ import akka.stream.scaladsl.Sink import akka.stream.stage._ import akka.util.{ OptionVal, PrettyDuration } -import com.github.ghik.silencer.silent - -import scala.util.{ Failure, Success, Try } /** INTERNAL API: Implementation class, not intended to be touched directly by end-users */ @InternalApi diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala index a6cb2ab795..896173f69b 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/SourceRefImpl.scala @@ -4,6 +4,8 @@ package akka.stream.impl.streamref +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.actor.{ ActorRef, Terminated } import akka.annotation.InternalApi @@ -13,7 +15,6 @@ import akka.stream.impl.FixedSizeBuffer import akka.stream.scaladsl.Source import akka.stream.stage._ import akka.util.{ OptionVal, PrettyDuration } -import com.github.ghik.silencer.silent /** INTERNAL API: Implementation class, not intended to be touched directly by end-users */ @InternalApi diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefSettingsImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefSettingsImpl.scala index bf1f88ef83..85bec19d60 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefSettingsImpl.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefSettingsImpl.scala @@ -4,12 +4,12 @@ package akka.stream.impl.streamref +import scala.concurrent.duration.FiniteDuration + import akka.annotation.InternalApi import akka.event.Logging import akka.stream.StreamRefSettings -import scala.concurrent.duration.FiniteDuration - /** INTERNAL API */ @InternalApi private[akka] final case class StreamRefSettingsImpl private ( diff --git a/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala b/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala index ef0abf61f2..52272ef98b 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/streamref/StreamRefsMaster.scala @@ -4,8 +4,8 @@ package akka.stream.impl.streamref -import akka.actor.ClassicActorSystemProvider import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } +import akka.actor.ClassicActorSystemProvider import akka.annotation.InternalApi import akka.stream.impl.SeqActorName diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/BidiFlow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/BidiFlow.scala index 7bafd72a19..c94af574ce 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/BidiFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/BidiFlow.scala @@ -4,12 +4,13 @@ package akka.stream.javadsl +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.japi.function import akka.stream._ -import com.github.ghik.silencer.silent - -import scala.concurrent.duration.FiniteDuration object BidiFlow { diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/DelayStrategy.scala b/akka-stream/src/main/scala/akka/stream/javadsl/DelayStrategy.scala index d27c5cd501..dbbe90f210 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/DelayStrategy.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/DelayStrategy.scala @@ -4,12 +4,12 @@ package akka.stream.javadsl +import scala.concurrent.duration.FiniteDuration + import akka.annotation.InternalApi import akka.stream.scaladsl import akka.util.JavaDurationConverters.JavaDurationOps -import scala.concurrent.duration.FiniteDuration - /** * Allows to manage delay and can be stateful to compute delay for any sequence of elements, * all elements go through nextDelay() updating state and returning delay for each element diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala b/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala index 7618eb2eb0..9e96109924 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/FileIO.scala @@ -11,7 +11,6 @@ import java.util.concurrent.CompletionStage import akka.stream.{ javadsl, scaladsl, IOResult } import akka.util.ByteString - import akka.util.ccompat.JavaConverters._ /** 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 12ab4fc8b2..f29779b5c7 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Flow.scala @@ -4,13 +4,23 @@ package akka.stream.javadsl -import java.util.concurrent.CompletionStage -import java.util.function.BiFunction -import java.util.function.Supplier import java.util.Comparator import java.util.Optional import java.util.concurrent.CompletableFuture +import java.util.concurrent.CompletionStage +import java.util.function.BiFunction +import java.util.function.Supplier +import scala.annotation.unchecked.uncheckedVariance +import scala.compat.java8.FutureConverters._ +import scala.concurrent.duration.FiniteDuration +import scala.reflect.ClassTag + +import com.github.ghik.silencer.silent +import org.reactivestreams.Processor + +import akka.Done +import akka.NotUsed import akka.actor.ActorRef import akka.actor.ClassicActorSystemProvider import akka.dispatch.ExecutionContexts @@ -18,22 +28,13 @@ import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } import akka.japi.Pair import akka.japi.Util import akka.japi.function +import akka.japi.function.Creator import akka.stream._ import akka.stream.impl.fusing.LazyFlow -import akka.util.JavaDurationConverters._ -import akka.util.unused import akka.util.ConstantFun +import akka.util.JavaDurationConverters._ import akka.util.Timeout -import akka.Done -import akka.NotUsed -import akka.japi.function.Creator -import com.github.ghik.silencer.silent -import org.reactivestreams.Processor - -import scala.annotation.unchecked.uncheckedVariance -import scala.compat.java8.FutureConverters._ -import scala.concurrent.duration.FiniteDuration -import scala.reflect.ClassTag +import akka.util.unused object Flow { diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/FlowWithContext.scala b/akka-stream/src/main/scala/akka/stream/javadsl/FlowWithContext.scala index 22e331f989..4267165d1b 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/FlowWithContext.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/FlowWithContext.scala @@ -4,17 +4,17 @@ package akka.stream.javadsl -import akka.japi.{ function, Pair, Util } -import akka.stream._ -import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } -import akka.util.ConstantFun - -import scala.annotation.unchecked.uncheckedVariance -import akka.util.ccompat.JavaConverters._ import java.util.concurrent.CompletionStage +import scala.annotation.unchecked.uncheckedVariance import scala.compat.java8.FutureConverters._ +import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } +import akka.japi.{ function, Pair, Util } +import akka.stream._ +import akka.util.ConstantFun +import akka.util.ccompat.JavaConverters._ + object FlowWithContext { def create[In, Ctx](): FlowWithContext[In, Ctx, In, Ctx, akka.NotUsed] = diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Graph.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Graph.scala index 174990b86a..a45990f27b 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Graph.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Graph.scala @@ -6,14 +6,14 @@ package akka.stream.javadsl import java.util -import akka.NotUsed -import akka.stream._ -import akka.japi.{ function, Pair } -import akka.util.ConstantFun - import scala.annotation.unchecked.uncheckedVariance -import akka.util.ccompat.JavaConverters._ + +import akka.NotUsed +import akka.japi.{ function, Pair } +import akka.stream._ import akka.stream.scaladsl.GenericGraph +import akka.util.ConstantFun +import akka.util.ccompat.JavaConverters._ import akka.util.unused /** @@ -380,8 +380,8 @@ object Balance { * '''Cancels when''' downstream cancels */ object Zip { - import akka.japi.function.Function2 import akka.japi.Pair + import akka.japi.function.Function2 /** * Create a new `Zip` operator with the specified input types and zipping-function @@ -409,8 +409,8 @@ object Zip { * '''Cancels when''' downstream cancels */ object ZipLatest { - import akka.japi.function.Function2 import akka.japi.Pair + import akka.japi.function.Function2 /** * Create a new `ZipLatest` operator with the specified input types and zipping-function diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Hub.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Hub.scala index f5b840fa0f..4bd0cb3100 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Hub.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Hub.scala @@ -4,9 +4,9 @@ package akka.stream.javadsl -import akka.NotUsed import java.util.function.{ BiFunction, Supplier, ToLongBiFunction } +import akka.NotUsed import akka.annotation.DoNotInherit import akka.util.unused diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Keep.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Keep.scala index c08bc891ae..31f3ba833a 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Keep.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Keep.scala @@ -5,8 +5,8 @@ package akka.stream.javadsl import akka.NotUsed -import akka.japi.function import akka.japi.Pair +import akka.japi.function object Keep { private val _left = new function.Function2[Any, Any, Any] with ((Any, Any) => Any) { def apply(l: Any, r: Any) = l } diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/MergeLatest.scala b/akka-stream/src/main/scala/akka/stream/javadsl/MergeLatest.scala index 94a853cc06..c4debf0f67 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/MergeLatest.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/MergeLatest.scala @@ -4,9 +4,8 @@ package akka.stream.javadsl -import akka.stream.stage.GraphStage import akka.stream.{ scaladsl, UniformFanInShape } - +import akka.stream.stage.GraphStage import akka.util.ccompat.JavaConverters._ /** diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala index 1bc96ba2e6..a99812cdf4 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Queue.scala @@ -7,14 +7,14 @@ package akka.stream.javadsl import java.util.Optional import java.util.concurrent.CompletionStage -import akka.Done -import akka.dispatch.ExecutionContexts -import akka.stream.QueueOfferResult - import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ import scala.concurrent.Future +import akka.Done +import akka.dispatch.ExecutionContexts +import akka.stream.QueueOfferResult + /** * This trait allows to have a queue as a data source for some stream. */ diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/RestartFlow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/RestartFlow.scala index 0b5442ab64..0dfc51ff62 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/RestartFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/RestartFlow.scala @@ -4,11 +4,12 @@ package akka.stream.javadsl -import akka.NotUsed -import akka.japi.function.Creator +import scala.concurrent.duration.FiniteDuration + import com.github.ghik.silencer.silent -import scala.concurrent.duration.FiniteDuration +import akka.NotUsed +import akka.japi.function.Creator /** * A RestartFlow wraps a [[Flow]] that gets restarted when it completes or fails. diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/RestartSink.scala b/akka-stream/src/main/scala/akka/stream/javadsl/RestartSink.scala index 305c79a81b..56bf831939 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/RestartSink.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/RestartSink.scala @@ -4,11 +4,12 @@ package akka.stream.javadsl -import akka.NotUsed -import akka.japi.function.Creator +import scala.concurrent.duration.FiniteDuration + import com.github.ghik.silencer.silent -import scala.concurrent.duration.FiniteDuration +import akka.NotUsed +import akka.japi.function.Creator /** * A RestartSink wraps a [[Sink]] that gets restarted when it completes or fails. diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/RestartSource.scala b/akka-stream/src/main/scala/akka/stream/javadsl/RestartSource.scala index cd97a09ba4..fc533c4b59 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/RestartSource.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/RestartSource.scala @@ -4,11 +4,12 @@ package akka.stream.javadsl -import akka.NotUsed -import akka.japi.function.Creator +import scala.concurrent.duration.FiniteDuration + import com.github.ghik.silencer.silent -import scala.concurrent.duration.FiniteDuration +import akka.NotUsed +import akka.japi.function.Creator /** * A RestartSource wraps a [[Source]] that gets restarted when it completes or fails. diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/RetryFlow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/RetryFlow.scala index d88f6b99d2..09df716c65 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/RetryFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/RetryFlow.scala @@ -6,13 +6,13 @@ package akka.stream.javadsl import java.util.Optional +import scala.compat.java8.OptionConverters._ + import akka.annotation.ApiMayChange import akka.japi.Pair import akka.stream.scaladsl import akka.util.JavaDurationConverters._ -import scala.compat.java8.OptionConverters._ - object RetryFlow { /** diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Sink.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Sink.scala index 6ae596fb7f..85ef30685a 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Sink.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Sink.scala @@ -9,15 +9,6 @@ import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletionStage import java.util.function.BiFunction -import akka.actor.{ ActorRef, ClassicActorSystemProvider, Status } -import akka.dispatch.ExecutionContexts -import akka._ -import akka.japi.function -import akka.japi.function.Creator -import akka.stream.impl.LinearTraversalBuilder -import akka.stream.{ javadsl, scaladsl, _ } -import org.reactivestreams.{ Publisher, Subscriber } - import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.compat.java8.FutureConverters._ @@ -25,6 +16,16 @@ import scala.compat.java8.OptionConverters._ import scala.concurrent.ExecutionContext import scala.util.Try +import org.reactivestreams.{ Publisher, Subscriber } + +import akka._ +import akka.actor.{ ActorRef, ClassicActorSystemProvider, Status } +import akka.dispatch.ExecutionContexts +import akka.japi.function +import akka.japi.function.Creator +import akka.stream.{ javadsl, scaladsl, _ } +import akka.stream.impl.LinearTraversalBuilder + /** Java API */ object Sink { diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index 7d1799de18..f59066e6e6 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -9,28 +9,29 @@ import java.util.Optional import java.util.concurrent.{ CompletableFuture, CompletionStage } import java.util.function.{ BiFunction, Supplier } -import akka.actor.{ ActorRef, Cancellable, ClassicActorSystemProvider } -import akka.dispatch.ExecutionContexts -import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } -import akka.japi.function.Creator -import akka.japi.{ function, JavaPartialFunction, Pair, Util } -import akka.stream._ -import akka.stream.impl.LinearTraversalBuilder -import akka.util.JavaDurationConverters._ -import akka.util.ccompat.JavaConverters._ -import akka.util.{ unused, _ } -import akka.{ Done, NotUsed } -import com.github.ghik.silencer.silent -import org.reactivestreams.{ Publisher, Subscriber } - import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ -import scala.concurrent.duration.FiniteDuration import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag +import com.github.ghik.silencer.silent +import org.reactivestreams.{ Publisher, Subscriber } + +import akka.{ Done, NotUsed } +import akka.actor.{ ActorRef, Cancellable, ClassicActorSystemProvider } +import akka.dispatch.ExecutionContexts +import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } +import akka.japi.{ function, JavaPartialFunction, Pair, Util } +import akka.japi.function.Creator +import akka.stream._ +import akka.stream.impl.LinearTraversalBuilder +import akka.util.{ unused, _ } +import akka.util.JavaDurationConverters._ +import akka.util.ccompat.JavaConverters._ + /** Java API */ object Source { private[this] val _empty = new Source[Any, NotUsed](scaladsl.Source.empty) diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SourceWithContext.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SourceWithContext.scala index 58a434a7d2..4544482283 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SourceWithContext.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SourceWithContext.scala @@ -6,6 +6,9 @@ package akka.stream.javadsl import java.util.concurrent.CompletionStage +import scala.annotation.unchecked.uncheckedVariance +import scala.compat.java8.FutureConverters._ + import akka.actor.ClassicActorSystemProvider import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } import akka.japi.Pair @@ -15,9 +18,6 @@ import akka.stream._ import akka.util.ConstantFun import akka.util.ccompat.JavaConverters._ -import scala.annotation.unchecked.uncheckedVariance -import scala.compat.java8.FutureConverters._ - object SourceWithContext { /** diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala b/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala index 06285322b5..5707e19a56 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/StreamConverters.scala @@ -5,19 +5,19 @@ package akka.stream.javadsl import java.io.{ InputStream, OutputStream } +import java.util.concurrent.CompletionStage import java.util.stream.Collector +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent + +import akka.NotUsed import akka.japi.function import akka.stream.{ javadsl, scaladsl } import akka.stream.IOResult import akka.util.ByteString -import scala.concurrent.duration.FiniteDuration -import java.util.concurrent.CompletionStage - -import akka.NotUsed -import com.github.ghik.silencer.silent - /** * Converters for interacting with the blocking `java.io` streams APIs and Java 8 Streams */ diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala index d2848cbc77..aa7562fbda 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubFlow.scala @@ -4,6 +4,17 @@ package akka.stream.javadsl +import java.util.Comparator +import java.util.concurrent.CompletionStage +import java.util.function.Supplier + +import scala.annotation.unchecked.uncheckedVariance +import scala.compat.java8.FutureConverters._ +import scala.concurrent.duration.FiniteDuration +import scala.reflect.ClassTag + +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } import akka.japi.{ function, Pair, Util } @@ -12,18 +23,6 @@ import akka.util.ConstantFun import akka.util.JavaDurationConverters._ import akka.util.ccompat.JavaConverters._ -import scala.annotation.unchecked.uncheckedVariance -import scala.concurrent.duration.FiniteDuration -import java.util.Comparator -import java.util.function.Supplier - -import scala.compat.java8.FutureConverters._ -import java.util.concurrent.CompletionStage - -import com.github.ghik.silencer.silent - -import scala.reflect.ClassTag - object SubFlow { /** diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala index 217c1bea0f..e55670c992 100755 --- a/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/SubSource.scala @@ -4,6 +4,17 @@ package akka.stream.javadsl +import java.util.Comparator +import java.util.concurrent.CompletionStage +import java.util.function.Supplier + +import scala.annotation.unchecked.uncheckedVariance +import scala.compat.java8.FutureConverters._ +import scala.concurrent.duration.FiniteDuration +import scala.reflect.ClassTag + +import com.github.ghik.silencer.silent + import akka.NotUsed import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } import akka.japi.{ function, Pair, Util } @@ -12,17 +23,6 @@ import akka.util.ConstantFun import akka.util.JavaDurationConverters._ import akka.util.ccompat.JavaConverters._ -import scala.annotation.unchecked.uncheckedVariance -import scala.concurrent.duration.FiniteDuration -import java.util.Comparator -import java.util.concurrent.CompletionStage -import java.util.function.Supplier - -import com.github.ghik.silencer.silent - -import scala.compat.java8.FutureConverters._ -import scala.reflect.ClassTag - /** * * Upcast a stream of elements to a stream of supertypes of that element. Useful in combination with * fan-in operators where you do not want to pay the cost of casting each element in a `map`. diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala b/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala index 3b03ee5d7a..383bf830cf 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/TLS.scala @@ -6,16 +6,17 @@ package akka.stream.javadsl import java.util.Optional import java.util.function.{ Consumer, Supplier } + +import scala.compat.java8.OptionConverters +import scala.util.Try + +import com.typesafe.sslconfig.akka.AkkaSSLConfig import javax.net.ssl.{ SSLContext, SSLEngine, SSLSession } import akka.{ japi, NotUsed } import akka.stream._ import akka.stream.TLSProtocol._ import akka.util.ByteString -import com.typesafe.sslconfig.akka.AkkaSSLConfig - -import scala.compat.java8.OptionConverters -import scala.util.Try /** * Stream cipher support based upon JSSE. diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala index f720e1d2e2..9f47a48e7f 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Tcp.scala @@ -5,40 +5,39 @@ package akka.stream.javadsl import java.lang.{ Iterable => JIterable } -import java.util.Optional -import java.util.function.{ Function => JFunction } - -import akka.{ Done, NotUsed } -import scala.concurrent.duration._ import java.net.InetSocketAddress - -import akka.actor.ActorSystem -import akka.actor.ExtendedActorSystem -import akka.actor.ExtensionId -import akka.actor.ExtensionIdProvider -import akka.stream.Materializer -import akka.stream.scaladsl -import akka.util.ByteString -import akka.japi.Util.immutableSeq -import akka.io.Inet.SocketOption -import scala.compat.java8.OptionConverters._ -import scala.compat.java8.FutureConverters._ +import java.util.Optional import java.util.concurrent.CompletionStage +import java.util.function.{ Function => JFunction } import java.util.function.Supplier +import scala.compat.java8.FutureConverters._ +import scala.compat.java8.OptionConverters._ +import scala.concurrent.duration._ import scala.util.Failure import scala.util.Success -import akka.actor.ClassicActorSystemProvider +import com.github.ghik.silencer.silent import javax.net.ssl.SSLContext +import javax.net.ssl.SSLEngine +import javax.net.ssl.SSLSession + +import akka.{ Done, NotUsed } +import akka.actor.ActorSystem +import akka.actor.ClassicActorSystemProvider +import akka.actor.ExtendedActorSystem +import akka.actor.ExtensionId +import akka.actor.ExtensionIdProvider import akka.annotation.InternalApi +import akka.io.Inet.SocketOption +import akka.japi.Util.immutableSeq +import akka.stream.Materializer import akka.stream.SystemMaterializer import akka.stream.TLSClosing import akka.stream.TLSProtocol.NegotiateNewSession +import akka.stream.scaladsl +import akka.util.ByteString import akka.util.JavaDurationConverters._ -import com.github.ghik.silencer.silent -import javax.net.ssl.SSLEngine -import javax.net.ssl.SSLSession object Tcp extends ExtensionId[Tcp] with ExtensionIdProvider { @@ -139,6 +138,7 @@ object Tcp extends ExtensionId[Tcp] with ExtensionIdProvider { class Tcp(system: ExtendedActorSystem) extends akka.actor.Extension { import Tcp._ + import akka.dispatch.ExecutionContexts.parasitic private lazy val delegate: scaladsl.Tcp = scaladsl.Tcp(system) diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/BidiFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/BidiFlow.scala index 56e0a6d993..9b653d3bca 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/BidiFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/BidiFlow.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.duration.FiniteDuration + import akka.NotUsed import akka.stream.{ BidiShape, _ } import akka.stream.impl.{ LinearTraversalBuilder, Timers, TraversalBuilder } -import scala.concurrent.duration.FiniteDuration - final class BidiFlow[-I1, +O1, -I2, +O2, +Mat]( override val traversalBuilder: TraversalBuilder, override val shape: BidiShape[I1, O1, I2, O2]) diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala index f0d84d3abc..8f072b2417 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/FileIO.scala @@ -8,13 +8,13 @@ import java.io.File import java.nio.file.{ OpenOption, Path } import java.nio.file.StandardOpenOption._ +import scala.concurrent.Future + +import akka.stream.IOResult import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io._ -import akka.stream.IOResult import akka.util.ByteString -import scala.concurrent.Future - /** * Factories to create sinks and sources from files */ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala index c3d79c9e34..6f0db2bc75 100755 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala @@ -4,9 +4,21 @@ package akka.stream.scaladsl +import scala.annotation.implicitNotFound +import scala.annotation.unchecked.uncheckedVariance +import scala.collection.immutable +import scala.concurrent.Future +import scala.concurrent.duration.FiniteDuration +import scala.reflect.ClassTag + +import org.reactivestreams.{ Processor, Publisher, Subscriber, Subscription } + +import akka.Done +import akka.NotUsed +import akka.actor.ActorRef +import akka.annotation.DoNotInherit import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } import akka.stream._ -import akka.Done import akka.stream.impl.{ fusing, LinearTraversalBuilder, @@ -18,21 +30,9 @@ import akka.stream.impl.{ TraversalBuilder } import akka.stream.impl.fusing._ +import akka.stream.impl.fusing.FlattenMerge import akka.stream.stage._ import akka.util.{ ConstantFun, Timeout } -import org.reactivestreams.{ Processor, Publisher, Subscriber, Subscription } - -import scala.annotation.unchecked.uncheckedVariance -import scala.collection.immutable -import scala.concurrent.Future -import scala.concurrent.duration.FiniteDuration -import akka.stream.impl.fusing.FlattenMerge -import akka.NotUsed -import akka.actor.ActorRef -import akka.annotation.DoNotInherit - -import scala.annotation.implicitNotFound -import scala.reflect.ClassTag /** * A `Flow` is a set of stream processing steps that has one open input and one open output. @@ -743,9 +743,10 @@ final case class RunnableGraph[+Mat](override val traversalBuilder: TraversalBui */ @DoNotInherit trait FlowOps[+Out, +Mat] { - import akka.stream.impl.Stages._ import GraphDSL.Implicits._ + import akka.stream.impl.Stages._ + type Repr[+O] <: FlowOps[O, Mat] { type Repr[+OO] = FlowOps.this.Repr[OO] type Closed = FlowOps.this.Closed diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContext.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContext.scala index 395e564ecf..6fb63381b0 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContext.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContext.scala @@ -4,9 +4,9 @@ package akka.stream.scaladsl -import akka.NotUsed - import scala.annotation.unchecked.uncheckedVariance + +import akka.NotUsed import akka.japi.Pair import akka.stream._ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala index 343904d5e6..00eadebe80 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala @@ -4,14 +4,15 @@ package akka.stream.scaladsl +import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable import scala.concurrent.Future -import scala.annotation.unchecked.uncheckedVariance + import akka.NotUsed import akka.dispatch.ExecutionContexts +import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } import akka.stream._ import akka.util.ConstantFun -import akka.event.{ LogMarker, LoggingAdapter, MarkerLoggingAdapter } /** * Shared stream operations for [[FlowWithContext]] and [[SourceWithContext]] that automatically propagate a context diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala index 43cdee6ea9..ac9f7ab6ad 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala @@ -6,16 +6,16 @@ package akka.stream.scaladsl import java.nio.ByteOrder +import scala.annotation.tailrec +import scala.reflect.ClassTag + import akka.NotUsed +import akka.stream.{ Attributes, FlowShape, Inlet, Outlet } import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage._ -import akka.stream.{ Attributes, FlowShape, Inlet, Outlet } import akka.util.{ ByteIterator, ByteString, OptionVal } -import scala.annotation.tailrec -import scala.reflect.ClassTag - object Framing { /** diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala index 76f35f00fa..232db8a9f4 100755 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Graph.scala @@ -6,22 +6,22 @@ package akka.stream.scaladsl import java.util.SplittableRandom -import akka.NotUsed -import akka.annotation.InternalApi -import akka.stream._ -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.impl._ -import akka.stream.impl.fusing.GraphStages -import akka.stream.scaladsl.Partition.PartitionOutOfBoundsException -import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } -import akka.util.ConstantFun - import scala.annotation.tailrec import scala.annotation.unchecked.uncheckedVariance import scala.collection.{ immutable, mutable } import scala.concurrent.Promise import scala.util.control.{ NoStackTrace, NonFatal } + +import akka.NotUsed +import akka.annotation.InternalApi +import akka.stream._ import akka.stream.ActorAttributes.SupervisionStrategy +import akka.stream.impl._ +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.impl.fusing.GraphStages +import akka.stream.scaladsl.Partition.PartitionOutOfBoundsException +import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } +import akka.util.ConstantFun /** * INTERNAL API diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala index 60cd9670ad..55689134d0 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Hub.scala @@ -5,26 +5,25 @@ package akka.stream.scaladsl import java.util -import java.util.concurrent.atomic.{ AtomicLong, AtomicReference } - -import akka.NotUsed -import akka.dispatch.AbstractNodeQueue -import akka.stream._ -import akka.stream.stage._ -import scala.annotation.tailrec -import scala.concurrent.{ Future, Promise } -import scala.util.{ Failure, Success, Try } import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.atomic.{ AtomicLong, AtomicReference } import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReferenceArray +import scala.annotation.tailrec import scala.collection.immutable -import scala.collection.mutable.LongMap import scala.collection.immutable.Queue +import scala.collection.mutable.LongMap +import scala.concurrent.{ Future, Promise } +import scala.util.{ Failure, Success, Try } -import akka.annotation.InternalApi +import akka.NotUsed import akka.annotation.DoNotInherit +import akka.annotation.InternalApi +import akka.dispatch.AbstractNodeQueue +import akka.stream._ import akka.stream.Attributes.LogLevels +import akka.stream.stage._ /** * A MergeHub is a special streaming hub that is able to collect streamed elements from a dynamic set of @@ -1012,8 +1011,8 @@ object PartitionHub { startAfterNrOfConsumers: Int, bufferSize: Int) extends GraphStageWithMaterializedValue[SinkShape[T], Source[T, NotUsed]] { - import PartitionHub.Internal._ import PartitionHub.ConsumerInfo + import PartitionHub.Internal._ val in: Inlet[T] = Inlet("PartitionHub.in") override val shape: SinkShape[T] = SinkShape(in) diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/JsonFraming.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/JsonFraming.scala index c9614c2306..8449264632 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/JsonFraming.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/JsonFraming.scala @@ -4,6 +4,8 @@ package akka.stream.scaladsl +import scala.util.control.NonFatal + import akka.NotUsed import akka.stream.Attributes import akka.stream.impl.JsonObjectParser @@ -11,8 +13,6 @@ import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.stage.{ GraphStageLogic, InHandler, OutHandler } import akka.util.ByteString -import scala.util.control.NonFatal - /** Provides JSON framing operators that can separate valid JSON objects from incoming [[ByteString]] objects. */ object JsonFraming { diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala index cd2d16ad82..61de2f6d80 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/MergeLatest.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl -import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } -import akka.stream.{ Attributes, Inlet, Outlet, UniformFanInShape } - import scala.collection.immutable +import akka.stream.{ Attributes, Inlet, Outlet, UniformFanInShape } +import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } + /** * MergeLatest joins elements from N input streams into stream of lists of size N. * i-th element in list is the latest emitted element from i-th input stream. diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala index 7902877bfc..5962ddb036 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Queue.scala @@ -7,14 +7,14 @@ package akka.stream.scaladsl import java.util.Optional import java.util.concurrent.CompletionStage -import scala.concurrent.Future -import akka.Done -import akka.stream.QueueOfferResult - import scala.compat.java8.FutureConverters._ import scala.compat.java8.OptionConverters._ +import scala.concurrent.Future + +import akka.Done import akka.annotation.InternalApi import akka.dispatch.ExecutionContexts +import akka.stream.QueueOfferResult /** * This trait allows to have a queue as a data source for some stream. diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartFlow.scala index b7900487d7..931a2819d2 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartFlow.scala @@ -4,17 +4,17 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.NotUsed import akka.event.Logging import akka.pattern.BackoffSupervisor -import akka.stream.Attributes.Attribute import akka.stream._ +import akka.stream.Attributes.Attribute +import akka.stream.Attributes.LogLevels import akka.stream.impl.fusing.GraphStages.SimpleLinearGraphStage import akka.stream.scaladsl.RestartWithBackoffFlow.Delay import akka.stream.stage._ - -import scala.concurrent.duration._ -import akka.stream.Attributes.LogLevels import akka.util.OptionVal /** diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala index e341163ecb..8c48dea817 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSink.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.duration.FiniteDuration + import akka.NotUsed import akka.stream.{ Attributes, Inlet, SinkShape } import akka.stream.stage.{ GraphStage, InHandler } -import scala.concurrent.duration.FiniteDuration - /** * A RestartSink wraps a [[Sink]] that gets restarted when it completes or fails. * diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala index fa3bcbb6c0..46c063940e 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/RestartSource.scala @@ -4,12 +4,12 @@ package akka.stream.scaladsl +import scala.concurrent.duration.FiniteDuration + import akka.NotUsed import akka.stream.{ Attributes, Outlet, SourceShape } import akka.stream.stage.{ GraphStage, OutHandler } -import scala.concurrent.duration.FiniteDuration - /** * A RestartSource wraps a [[Source]] that gets restarted when it completes or fails. * diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/RetryFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/RetryFlow.scala index f64b67b74f..90afccf82b 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/RetryFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/RetryFlow.scala @@ -4,11 +4,11 @@ package akka.stream.scaladsl +import scala.concurrent.duration._ + import akka.annotation.ApiMayChange import akka.stream.impl.RetryFlowCoordinator -import scala.concurrent.duration._ - object RetryFlow { /** diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala index 713cb6deb3..61ce286cc1 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Sink.scala @@ -4,22 +4,6 @@ package akka.stream.scaladsl -import akka.actor.ActorRef -import akka.actor.Status -import akka.annotation.InternalApi -import akka.dispatch.ExecutionContexts -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.impl._ -import akka.stream.impl.fusing.GraphStages -import akka.stream.stage._ -import akka.stream.javadsl -import akka.stream._ -import akka.util.ccompat._ -import akka.Done -import akka.NotUsed -import org.reactivestreams.Publisher -import org.reactivestreams.Subscriber - import scala.annotation.tailrec import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable @@ -29,6 +13,23 @@ import scala.util.Failure import scala.util.Success import scala.util.Try +import org.reactivestreams.Publisher +import org.reactivestreams.Subscriber + +import akka.Done +import akka.NotUsed +import akka.actor.ActorRef +import akka.actor.Status +import akka.annotation.InternalApi +import akka.dispatch.ExecutionContexts +import akka.stream._ +import akka.stream.impl._ +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.impl.fusing.GraphStages +import akka.stream.javadsl +import akka.stream.stage._ +import akka.util.ccompat._ + /** * A `Sink` is a set of stream processing steps that has one open input. * Can be used as a `Subscriber` diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala index 8477f6aa16..993c61aeea 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Source.scala @@ -6,25 +6,25 @@ package akka.stream.scaladsl import java.util.concurrent.CompletionStage -import akka.actor.{ ActorRef, Cancellable } -import akka.annotation.InternalApi -import akka.stream.impl.Stages.DefaultAttributes -import akka.stream.impl.fusing.GraphStages -import akka.stream.impl.fusing.GraphStages._ -import akka.stream.impl.{ PublisherSource, _ } -import akka.stream.{ Outlet, SourceShape, _ } -import akka.util.ConstantFun -import akka.{ Done, NotUsed } -import org.reactivestreams.{ Publisher, Subscriber } - import scala.annotation.tailrec import scala.annotation.unchecked.uncheckedVariance import scala.collection.immutable -import scala.concurrent.duration.FiniteDuration -import scala.concurrent.{ Future, Promise } -import akka.stream.stage.GraphStageWithMaterializedValue - import scala.compat.java8.FutureConverters._ +import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration.FiniteDuration + +import org.reactivestreams.{ Publisher, Subscriber } + +import akka.{ Done, NotUsed } +import akka.actor.{ ActorRef, Cancellable } +import akka.annotation.InternalApi +import akka.stream.{ Outlet, SourceShape, _ } +import akka.stream.impl.{ PublisherSource, _ } +import akka.stream.impl.Stages.DefaultAttributes +import akka.stream.impl.fusing.GraphStages +import akka.stream.impl.fusing.GraphStages._ +import akka.stream.stage.GraphStageWithMaterializedValue +import akka.util.ConstantFun /** * A `Source` is a set of stream processing steps that has one open output. It can comprise diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala index 6fc893c080..983416855c 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/StreamConverters.scala @@ -8,17 +8,17 @@ import java.io.{ InputStream, OutputStream } import java.util.Spliterators import java.util.stream.{ Collector, StreamSupport } +import scala.concurrent.{ Await, Future } +import scala.concurrent.duration._ +import scala.concurrent.duration.Duration._ + +import akka.NotUsed import akka.stream.{ Attributes, IOResult, SinkShape } import akka.stream.impl._ import akka.stream.impl.Stages.DefaultAttributes import akka.stream.impl.io.{ InputStreamSinkStage, InputStreamSource, OutputStreamGraphStage, OutputStreamSourceStage } import akka.util.ByteString -import scala.concurrent.duration.Duration._ -import scala.concurrent.{ Await, Future } -import scala.concurrent.duration._ -import akka.NotUsed - /** * Converters for interacting with the blocking `java.io` streams APIs and Java 8 Streams */ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala index 2c66c94ef3..4cae7ac6e8 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala @@ -4,9 +4,10 @@ package akka.stream.scaladsl -import akka.stream._ import scala.annotation.unchecked.uncheckedVariance +import akka.stream._ + /** * A “stream of streams” sub-flow of data elements, e.g. produced by `groupBy`. * SubFlows cannot contribute to the super-flow’s materialized value since they diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala index 0af2ab80cb..74c934b102 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/TLS.scala @@ -6,17 +6,18 @@ package akka.stream.scaladsl import java.util.Collections +import scala.util.{ Failure, Success, Try } + +import com.typesafe.sslconfig.akka.AkkaSSLConfig import javax.net.ssl.{ SNIHostName, SSLContext, SSLEngine, SSLSession } -import akka.stream.impl.io.{ TlsModule, TlsUtils } +import javax.net.ssl.SSLParameters + import akka.NotUsed import akka.actor.ActorSystem import akka.stream._ import akka.stream.TLSProtocol._ +import akka.stream.impl.io.{ TlsModule, TlsUtils } import akka.util.ByteString -import com.typesafe.sslconfig.akka.AkkaSSLConfig -import scala.util.{ Failure, Success, Try } - -import javax.net.ssl.SSLParameters /** * Stream cipher support based upon JSSE. @@ -228,6 +229,7 @@ object TLSPlacebo { import java.security.Principal import java.security.cert.Certificate + import javax.net.ssl.{ SSLPeerUnverifiedException, SSLSession } /** Allows access to an SSLSession with Scala types */ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala index 245ad3e236..0272d5551f 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Tcp.scala @@ -7,27 +7,6 @@ package akka.stream.scaladsl import java.net.InetSocketAddress import java.util.concurrent.TimeoutException -import akka.actor._ -import akka.annotation.InternalApi -import akka.io.Inet.SocketOption -import akka.io.IO -import akka.io.{ Tcp => IoTcp } -import akka.stream.Attributes.Attribute -import akka.stream.TLSProtocol.NegotiateNewSession -import akka.stream._ -import akka.stream.impl.fusing.GraphStages.detacher -import akka.stream.impl.io.ConnectionSourceStage -import akka.stream.impl.io.OutgoingConnectionStage -import akka.stream.impl.io.TcpIdleTimeout -import akka.util.ByteString -import akka.util.unused -import akka.util.JavaDurationConverters._ -import akka.Done -import akka.NotUsed -import com.github.ghik.silencer.silent -import javax.net.ssl.SSLContext -import javax.net.ssl.SSLEngine -import javax.net.ssl.SSLSession import scala.collection.immutable import scala.concurrent.Future import scala.concurrent.duration._ @@ -37,6 +16,29 @@ import scala.util.Success import scala.util.Try import scala.util.control.NoStackTrace +import com.github.ghik.silencer.silent +import javax.net.ssl.SSLContext +import javax.net.ssl.SSLEngine +import javax.net.ssl.SSLSession + +import akka.Done +import akka.NotUsed +import akka.actor._ +import akka.annotation.InternalApi +import akka.io.{ Tcp => IoTcp } +import akka.io.IO +import akka.io.Inet.SocketOption +import akka.stream._ +import akka.stream.Attributes.Attribute +import akka.stream.TLSProtocol.NegotiateNewSession +import akka.stream.impl.fusing.GraphStages.detacher +import akka.stream.impl.io.ConnectionSourceStage +import akka.stream.impl.io.OutgoingConnectionStage +import akka.stream.impl.io.TcpIdleTimeout +import akka.util.ByteString +import akka.util.JavaDurationConverters._ +import akka.util.unused + object Tcp extends ExtensionId[Tcp] with ExtensionIdProvider { /** diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala index b9384fa7d2..3ed4c6d2a5 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/package.scala @@ -5,8 +5,9 @@ package akka.stream import java.util.concurrent.CompletionStage -import scala.concurrent.Future + import scala.compat.java8.FutureConverters +import scala.concurrent.Future /** * Scala API: The flow DSL allows the formulation of stream transformations based on some diff --git a/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala b/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala index 5e21921451..a5b36331d6 100644 --- a/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala +++ b/akka-stream/src/main/scala/akka/stream/serialization/StreamRefSerializer.scala @@ -4,9 +4,9 @@ package akka.stream.serialization -import akka.protobufv3.internal.ByteString import akka.actor.ExtendedActorSystem import akka.annotation.InternalApi +import akka.protobufv3.internal.ByteString import akka.serialization._ import akka.stream.StreamRefMessages import akka.stream.impl.streamref._ diff --git a/akka-stream/src/main/scala/akka/stream/snapshot/MaterializerState.scala b/akka-stream/src/main/scala/akka/stream/snapshot/MaterializerState.scala index 872b84ce1d..ac4968d83c 100644 --- a/akka-stream/src/main/scala/akka/stream/snapshot/MaterializerState.scala +++ b/akka-stream/src/main/scala/akka/stream/snapshot/MaterializerState.scala @@ -4,20 +4,20 @@ package akka.stream.snapshot -import akka.actor.ActorSystem -import akka.actor.{ ActorPath, ActorRef } -import akka.annotation.{ ApiMayChange, DoNotInherit, InternalApi } -import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } -import akka.pattern.ask -import akka.stream.SystemMaterializer -import akka.stream.impl.fusing.ActorGraphInterpreter -import akka.stream.{ Attributes, Materializer } -import akka.util.Timeout - import scala.collection.immutable import scala.concurrent.{ ExecutionContext, Future } import scala.concurrent.duration._ +import akka.actor.{ ActorPath, ActorRef } +import akka.actor.ActorSystem +import akka.annotation.{ ApiMayChange, DoNotInherit, InternalApi } +import akka.pattern.ask +import akka.stream.{ Attributes, Materializer } +import akka.stream.SystemMaterializer +import akka.stream.impl.{ PhasedFusingActorMaterializer, StreamSupervisor } +import akka.stream.impl.fusing.ActorGraphInterpreter +import akka.util.Timeout + /** * Debug utility to dump the running streams of a materializers in a structure describing the graph layout * and "waits-on" relationships. diff --git a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala index 353b396c15..ce8da0c079 100644 --- a/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala +++ b/akka-stream/src/main/scala/akka/stream/stage/GraphStage.scala @@ -6,23 +6,24 @@ package akka.stream.stage import java.util.concurrent.atomic.AtomicReference +import scala.annotation.tailrec +import scala.collection.{ immutable, mutable } +import scala.concurrent.{ Future, Promise } +import scala.concurrent.duration.FiniteDuration + +import com.github.ghik.silencer.silent + +import akka.{ Done, NotUsed } import akka.actor._ import akka.annotation.InternalApi import akka.japi.function.{ Effect, Procedure } import akka.stream._ +import akka.stream.impl.{ ReactiveStreamsCompliance, TraversalBuilder } import akka.stream.impl.ActorSubscriberMessage import akka.stream.impl.fusing.{ GraphInterpreter, GraphStageModule, SubSink, SubSource } -import akka.stream.impl.{ ReactiveStreamsCompliance, TraversalBuilder } import akka.stream.scaladsl.GenericGraphWithChangedAttributes import akka.util.OptionVal import akka.util.unused -import akka.{ Done, NotUsed } - -import scala.annotation.tailrec -import scala.collection.{ immutable, mutable } -import scala.concurrent.duration.FiniteDuration -import scala.concurrent.{ Future, Promise } -import com.github.ghik.silencer.silent /** * Scala API: A GraphStage represents a reusable graph stream processing operator. diff --git a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala index df410fa7c2..1f136691b2 100644 --- a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala +++ b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/AkkaSSLConfig.scala @@ -8,13 +8,14 @@ import java.security.KeyStore import java.security.cert.CertPathValidatorException import java.util.Collections -import javax.net.ssl._ -import akka.actor._ -import akka.annotation.InternalApi -import akka.event.Logging import com.typesafe.sslconfig.akka.util.AkkaLoggerFactory import com.typesafe.sslconfig.ssl._ import com.typesafe.sslconfig.util.LoggerFactory +import javax.net.ssl._ + +import akka.actor._ +import akka.annotation.InternalApi +import akka.event.Logging @deprecated("Use Tcp and TLS with SSLEngine parameters instead. Setup the SSLEngine with needed parameters.", "2.6.0") object AkkaSSLConfig extends ExtensionId[AkkaSSLConfig] with ExtensionIdProvider { diff --git a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/SSLEngineConfigurator.scala b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/SSLEngineConfigurator.scala index 4d98ffdb57..89a7ccfee8 100644 --- a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/SSLEngineConfigurator.scala +++ b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/SSLEngineConfigurator.scala @@ -4,9 +4,8 @@ package com.typesafe.sslconfig.akka -import javax.net.ssl.{ SSLContext, SSLEngine } - import com.typesafe.sslconfig.ssl.SSLConfigSettings +import javax.net.ssl.{ SSLContext, SSLEngine } /** * Gives the chance to configure the SSLContext before it is going to be used. diff --git a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala index 1299525838..91f474159c 100644 --- a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala +++ b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala @@ -4,10 +4,11 @@ package com.typesafe.sslconfig.akka.util +import com.typesafe.sslconfig.util.{ LoggerFactory, NoDepsLogger } + import akka.actor.ActorSystem import akka.event.{ DummyClassForStringSources, EventStream } import akka.event.Logging._ -import com.typesafe.sslconfig.util.{ LoggerFactory, NoDepsLogger } final class AkkaLoggerFactory(system: ActorSystem) extends LoggerFactory { override def apply(clazz: Class[_]): NoDepsLogger = new AkkaLoggerBridge(system.eventStream, clazz) diff --git a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala index 3011ba04b3..fc1d36a36e 100644 --- a/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala +++ b/akka-testkit/src/main/scala/akka/testkit/CallingThreadDispatcher.scala @@ -4,12 +4,18 @@ package akka.testkit +import java.lang.ref.WeakReference +import java.util.concurrent.TimeUnit +import java.util.concurrent.locks.ReentrantLock + +import scala.annotation.tailrec +import scala.concurrent.duration._ +import scala.concurrent.duration.Duration +import scala.util.control.NonFatal + +import com.typesafe.config.Config import language.postfixOps -import java.lang.ref.WeakReference -import java.util.concurrent.locks.ReentrantLock -import scala.annotation.tailrec -import com.typesafe.config.Config import akka.actor.{ ActorCell, ActorInitializationException, @@ -31,11 +37,7 @@ import akka.dispatch.{ TaskInvocation } import akka.dispatch.sysmsg.{ Resume, Suspend, SystemMessage } -import scala.concurrent.duration._ import akka.util.Switch -import scala.concurrent.duration.Duration -import scala.util.control.NonFatal -import java.util.concurrent.TimeUnit /* * Locking rules: diff --git a/akka-testkit/src/main/scala/akka/testkit/ExplicitlyTriggeredScheduler.scala b/akka-testkit/src/main/scala/akka/testkit/ExplicitlyTriggeredScheduler.scala index 9a022d3830..99d7bfa2f6 100644 --- a/akka-testkit/src/main/scala/akka/testkit/ExplicitlyTriggeredScheduler.scala +++ b/akka-testkit/src/main/scala/akka/testkit/ExplicitlyTriggeredScheduler.scala @@ -4,21 +4,22 @@ package akka.testkit -import java.util.concurrent.ThreadFactory import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.ThreadFactory import java.util.concurrent.atomic.AtomicLong import scala.annotation.tailrec -import akka.util.ccompat.JavaConverters._ - import scala.concurrent.ExecutionContext import scala.concurrent.duration.{ Duration, FiniteDuration } import scala.util.Try + +import com.typesafe.config.Config + import akka.actor.Cancellable import akka.actor.Scheduler import akka.event.LoggingAdapter +import akka.util.ccompat.JavaConverters._ import akka.util.unused -import com.typesafe.config.Config /** * For testing: scheduler that does not look at the clock, but must be diff --git a/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala b/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala index a179c20590..be5af84012 100644 --- a/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala +++ b/akka-testkit/src/main/scala/akka/testkit/SocketUtil.scala @@ -4,12 +4,12 @@ package akka.testkit -import scala.collection.immutable -import scala.util.Random import java.net.{ DatagramSocket, InetSocketAddress, NetworkInterface, StandardProtocolFamily } import java.nio.channels.DatagramChannel import java.nio.channels.ServerSocketChannel +import scala.collection.immutable +import scala.util.Random import scala.util.control.NonFatal /** diff --git a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala index 52a1e21f4a..0bab6a9dbd 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestActorRef.scala @@ -4,16 +4,17 @@ package akka.testkit -import akka.actor._ import java.util.concurrent.atomic.AtomicLong -import akka.dispatch._ - import scala.concurrent.Await import scala.reflect.ClassTag -import akka.pattern.ask + import com.github.ghik.silencer.silent +import akka.actor._ +import akka.dispatch._ +import akka.pattern.ask + /** * This special ActorRef is exclusively for use during unit testing in a single-threaded environment. Therefore, it * overrides the dispatcher to CallingThreadDispatcher and sets the receiveTimeout to None. Otherwise, diff --git a/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala b/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala index c9541a3b19..7c704e1f03 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestBarrier.scala @@ -4,11 +4,13 @@ package akka.testkit -import scala.concurrent.duration.Duration import java.util.concurrent.{ CyclicBarrier, TimeUnit, TimeoutException } -import akka.actor.ActorSystem + +import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration +import akka.actor.ActorSystem + class TestBarrierTimeoutException(message: String) extends RuntimeException(message) /** diff --git a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala index 07c53f59f1..978da1cad0 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestEventListener.scala @@ -4,20 +4,20 @@ package akka.testkit -import scala.util.matching.Regex +import java.lang.{ Iterable => JIterable } + import scala.collection.immutable import scala.concurrent.duration.Duration import scala.reflect.ClassTag +import scala.util.matching.Regex import akka.actor.{ ActorSystem, DeadLetter, UnhandledMessage } -import akka.dispatch.sysmsg.{ SystemMessage, Terminate } -import akka.event.Logging.{ Debug, Error, Info, InitializeLogger, LogEvent, LoggerInitialized, Warning } -import akka.event.Logging -import akka.actor.NoSerializationVerificationNeeded -import akka.japi.Util.immutableSeq -import java.lang.{ Iterable => JIterable } - import akka.actor.Dropped +import akka.actor.NoSerializationVerificationNeeded +import akka.dispatch.sysmsg.{ SystemMessage, Terminate } +import akka.event.Logging +import akka.event.Logging.{ Debug, Error, Info, InitializeLogger, LogEvent, LoggerInitialized, Warning } +import akka.japi.Util.immutableSeq import akka.util.BoxedType import akka.util.ccompat._ diff --git a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala index b7f8a46475..080035663f 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestFSMRef.scala @@ -4,10 +4,11 @@ package akka.testkit -import akka.actor._ import scala.concurrent.duration.FiniteDuration import scala.reflect.ClassTag +import akka.actor._ + /** * This is a specialized form of the TestActorRef with support for querying and * setting the state of a FSM. Use a LoggingFSM with this class if you also diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala index c2043b2272..f4266ee317 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKit.scala @@ -5,23 +5,25 @@ package akka.testkit import java.util.concurrent._ -import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger -import scala.language.postfixOps import scala.annotation.tailrec import scala.collection.immutable import scala.concurrent.Await import scala.concurrent.duration._ +import scala.language.postfixOps import scala.reflect.ClassTag import scala.util.control.NonFatal + +import com.github.ghik.silencer.silent + import akka.actor._ -import akka.util.{ BoxedType, Timeout } -import akka.actor.IllegalActorStateException import akka.actor.DeadLetter +import akka.actor.IllegalActorStateException import akka.actor.Terminated import akka.annotation.InternalApi -import com.github.ghik.silencer.silent +import akka.util.{ BoxedType, Timeout } object TestActor { type Ignore = Option[PartialFunction[Any, Boolean]] diff --git a/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala b/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala index 109d3c7b50..2a45470471 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestKitExtension.scala @@ -4,13 +4,14 @@ package akka.testkit -import akka.actor.ClassicActorSystemProvider -import com.typesafe.config.Config -import akka.util.Timeout -import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId } - import scala.concurrent.duration.FiniteDuration +import com.typesafe.config.Config + +import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId } +import akka.actor.ClassicActorSystemProvider +import akka.util.Timeout + object TestKitExtension extends ExtensionId[TestKitSettings] { override def get(system: ActorSystem): TestKitSettings = super.get(system) override def get(system: ClassicActorSystemProvider): TestKitSettings = super.get(system) diff --git a/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala b/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala index f6d31a0989..a0d79d8cc4 100644 --- a/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala +++ b/akka-testkit/src/main/scala/akka/testkit/TestLatch.scala @@ -4,12 +4,14 @@ package akka.testkit -import scala.concurrent.duration.Duration -import akka.actor.ActorSystem -import scala.concurrent.{ Awaitable, CanAwait } import java.util.concurrent.{ CountDownLatch, TimeUnit, TimeoutException } + +import scala.concurrent.{ Awaitable, CanAwait } +import scala.concurrent.duration.Duration import scala.concurrent.duration.FiniteDuration +import akka.actor.ActorSystem + /** * A count down latch wrapper for use in testing. * It always uses a timeout when waiting and timeouts are specified as durations. diff --git a/akka-testkit/src/main/scala/akka/testkit/javadsl/TestKit.scala b/akka-testkit/src/main/scala/akka/testkit/javadsl/TestKit.scala index 31b6328f1d..5b3d16520a 100644 --- a/akka-testkit/src/main/scala/akka/testkit/javadsl/TestKit.scala +++ b/akka-testkit/src/main/scala/akka/testkit/javadsl/TestKit.scala @@ -4,19 +4,19 @@ package akka.testkit.javadsl -import java.util.function.{ Supplier, Function => JFunction } import java.util.{ List => JList } +import java.util.function.{ Supplier, Function => JFunction } + +import scala.annotation.varargs +import scala.concurrent.duration._ + +import com.github.ghik.silencer.silent import akka.actor._ import akka.annotation.InternalApi import akka.testkit.{ TestActor, TestDuration, TestProbe } import akka.util.JavaDurationConverters._ - -import scala.annotation.varargs import akka.util.ccompat.JavaConverters._ -import com.github.ghik.silencer.silent - -import scala.concurrent.duration._ /** * Java API: Test kit for testing actors. Inheriting from this class enables diff --git a/akka-testkit/src/main/scala/akka/testkit/package.scala b/akka-testkit/src/main/scala/akka/testkit/package.scala index f751b111f8..c3b934771a 100644 --- a/akka-testkit/src/main/scala/akka/testkit/package.scala +++ b/akka-testkit/src/main/scala/akka/testkit/package.scala @@ -4,12 +4,14 @@ package akka -import akka.actor.ActorSystem -import akka.util.ccompat._ +import java.util.concurrent.TimeUnit.MILLISECONDS + +import scala.collection.immutable import scala.concurrent.duration.{ Duration, FiniteDuration } import scala.reflect.ClassTag -import scala.collection.immutable -import java.util.concurrent.TimeUnit.MILLISECONDS + +import akka.actor.ActorSystem +import akka.util.ccompat._ package object testkit { @ccompatUsedUntil213 diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala index b8265b016d..498f26f91c 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala @@ -4,11 +4,10 @@ package akka.testkit -import akka.actor.ActorSystem -import akka.dispatch.Dispatchers -import akka.event.Logging -import akka.event.LoggingAdapter -import akka.testkit.TestEvent._ +import scala.concurrent.Future +import scala.concurrent.duration._ +import scala.language.postfixOps + import com.typesafe.config.Config import com.typesafe.config.ConfigFactory import org.scalactic.CanEqual @@ -20,9 +19,11 @@ import org.scalatest.time.Millis import org.scalatest.time.Span import org.scalatest.wordspec.AnyWordSpecLike -import scala.concurrent.Future -import scala.concurrent.duration._ -import scala.language.postfixOps +import akka.actor.ActorSystem +import akka.dispatch.Dispatchers +import akka.event.Logging +import akka.event.LoggingAdapter +import akka.testkit.TestEvent._ object AkkaSpec { val testConf: Config = ConfigFactory.parseString(""" diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala index e5bc37f12b..9b32535ab0 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/AkkaSpecSpec.scala @@ -4,18 +4,19 @@ package akka.testkit -import language.postfixOps -import akka.actor._ -import com.typesafe.config.ConfigFactory - import scala.concurrent.Await import scala.concurrent.duration._ -import akka.actor.DeadLetter -import akka.pattern.ask + import com.github.ghik.silencer.silent +import com.typesafe.config.ConfigFactory +import language.postfixOps import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor._ +import akka.actor.DeadLetter +import akka.pattern.ask + @silent class AkkaSpecSpec extends AnyWordSpec with Matchers { diff --git a/akka-testkit/src/test/scala/akka/testkit/Coroner.scala b/akka-testkit/src/test/scala/akka/testkit/Coroner.scala index e329701abf..df159fd32a 100644 --- a/akka-testkit/src/test/scala/akka/testkit/Coroner.scala +++ b/akka-testkit/src/test/scala/akka/testkit/Coroner.scala @@ -8,6 +8,7 @@ import java.io.PrintStream import java.lang.management.{ ManagementFactory, ThreadInfo } import java.util.Date import java.util.concurrent.{ CountDownLatch, TimeoutException } + import scala.concurrent.{ Await, Awaitable, CanAwait, Promise } import scala.concurrent.duration._ import scala.util.control.NonFatal diff --git a/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala b/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala index da8d466465..ad43b9cb14 100644 --- a/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/CoronerSpec.scala @@ -8,8 +8,10 @@ import java.io._ import java.lang.management.ManagementFactory import java.util.concurrent.Semaphore import java.util.concurrent.locks.ReentrantLock -import scala.concurrent.duration._ + import scala.concurrent.Await +import scala.concurrent.duration._ + import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-testkit/src/test/scala/akka/testkit/DefaultTimeoutSpec.scala b/akka-testkit/src/test/scala/akka/testkit/DefaultTimeoutSpec.scala index ee4a1bd14c..20bb50f0f3 100644 --- a/akka-testkit/src/test/scala/akka/testkit/DefaultTimeoutSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/DefaultTimeoutSpec.scala @@ -5,10 +5,11 @@ package akka.testkit import org.scalatest.BeforeAndAfterAll -import akka.actor.ActorSystem import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem + class DefaultTimeoutSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with TestKitBase with DefaultTimeout { implicit lazy val system: ActorSystem = ActorSystem("AkkaCustomSpec") diff --git a/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala b/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala index 9fb008ed90..b81721d363 100644 --- a/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/ImplicitSenderSpec.scala @@ -4,11 +4,12 @@ package akka.testkit -import akka.actor.ActorSystem import org.scalatest.BeforeAndAfterAll import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec +import akka.actor.ActorSystem + class ImplicitSenderSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll with TestKitBase with ImplicitSender { implicit lazy val system: ActorSystem = ActorSystem("AkkaCustomSpec") diff --git a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala index 42a48d8085..0844021d19 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestActorRefSpec.scala @@ -4,14 +4,16 @@ package akka.testkit -import language.{ postfixOps } -import org.scalatest.{ BeforeAndAfterEach } -import akka.actor._ -import akka.event.Logging.Warning import scala.concurrent.{ Await, Promise } import scala.concurrent.duration._ -import akka.pattern.ask + +import language.postfixOps +import org.scalatest.BeforeAndAfterEach + +import akka.actor._ import akka.dispatch.Dispatcher +import akka.event.Logging.Warning +import akka.pattern.ask /** * Test whether TestActorRef behaves as an ActorRef should, besides its own spec. diff --git a/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala index 1277577c18..f4b967f0fa 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestFSMRefSpec.scala @@ -4,10 +4,11 @@ package akka.testkit +import scala.concurrent.duration._ + import language.postfixOps import akka.actor._ -import scala.concurrent.duration._ class TestFSMRefSpec extends AkkaSpec { diff --git a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala index 1e152fd19c..37b96b091c 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestProbeSpec.scala @@ -4,18 +4,18 @@ package akka.testkit -import language.postfixOps -import akka.actor._ +import java.util.concurrent.atomic.AtomicInteger import scala.concurrent.Await import scala.concurrent.duration._ -import akka.pattern.ask - import scala.util.Try -import java.util.concurrent.atomic.AtomicInteger +import language.postfixOps import org.scalatest.concurrent.Eventually +import akka.actor._ +import akka.pattern.ask + class TestProbeSpec extends AkkaSpec with DefaultTimeout with Eventually { "A TestProbe" must { diff --git a/akka-testkit/src/test/scala/akka/testkit/TestTimeSpec.scala b/akka-testkit/src/test/scala/akka/testkit/TestTimeSpec.scala index 24f50a915c..f3e319c03d 100644 --- a/akka-testkit/src/test/scala/akka/testkit/TestTimeSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/TestTimeSpec.scala @@ -5,6 +5,7 @@ package akka.testkit import scala.concurrent.duration._ + import org.scalatest.exceptions.TestFailedException class TestTimeSpec extends AkkaSpec(Map("akka.test.timefactor" -> 2.0)) { diff --git a/akka-testkit/src/test/scala/akka/testkit/WithLogCapturing.scala b/akka-testkit/src/test/scala/akka/testkit/WithLogCapturing.scala index 48496a8515..984fff4d3f 100644 --- a/akka-testkit/src/test/scala/akka/testkit/WithLogCapturing.scala +++ b/akka-testkit/src/test/scala/akka/testkit/WithLogCapturing.scala @@ -6,10 +6,11 @@ package akka.testkit import java.io.{ OutputStream, PrintStream } +import org.scalatest.{ Outcome, SuiteMixin, TestSuite } + import akka.actor.ActorSystem import akka.event.Logging import akka.event.Logging._ -import org.scalatest.{ Outcome, SuiteMixin, TestSuite } /** * Mixin this trait to a test to make log lines appear only when the test failed. diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/FileDescriptorMetricSet.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/FileDescriptorMetricSet.scala index e4760de308..194341358d 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/FileDescriptorMetricSet.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/FileDescriptorMetricSet.scala @@ -4,13 +4,15 @@ package akka.testkit.metrics -import java.util -import akka.util.ccompat.JavaConverters._ import java.lang.management.{ ManagementFactory, OperatingSystemMXBean } +import java.util + import com.codahale.metrics.{ Gauge, Metric, MetricSet } import com.codahale.metrics.MetricRegistry._ import com.codahale.metrics.jvm.FileDescriptorRatioGauge +import akka.util.ccompat.JavaConverters._ + /** * MetricSet exposing number of open and maximum file descriptors used by the JVM process. */ diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/KnownOpsInTimespanTimer.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/KnownOpsInTimespanTimer.scala index 36fd031354..96e3da995c 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/KnownOpsInTimespanTimer.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/KnownOpsInTimespanTimer.scala @@ -4,9 +4,10 @@ package akka.testkit.metrics -import com.codahale.metrics._ -import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.TimeUnit._ +import java.util.concurrent.atomic.AtomicLong + +import com.codahale.metrics._ /** * Specialized "one-shot" Timer. diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala index ebee113f9a..9049d97304 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKit.scala @@ -4,17 +4,19 @@ package akka.testkit.metrics -import com.codahale.metrics._ - -import java.util.concurrent.TimeUnit -import scala.concurrent.duration._ -import com.typesafe.config.Config import java.util -import scala.util.matching.Regex +import java.util.concurrent.TimeUnit + import scala.collection.mutable -import akka.testkit.metrics.reporter.AkkaConsoleReporter -import org.scalatest.Notifying +import scala.concurrent.duration._ import scala.reflect.ClassTag +import scala.util.matching.Regex + +import com.codahale.metrics._ +import com.typesafe.config.Config +import org.scalatest.Notifying + +import akka.testkit.metrics.reporter.AkkaConsoleReporter /** * Allows to easily measure performance / memory / file descriptor use in tests. @@ -29,6 +31,7 @@ private[akka] trait MetricsKit extends MetricsKitOps { this: Notifying => import MetricsKit._ + import akka.util.ccompat.JavaConverters._ private var reporters: List[ScheduledReporter] = Nil diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala index b7795f252f..f1a247e242 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitOps.scala @@ -4,8 +4,9 @@ package akka.testkit.metrics -import com.codahale.metrics._ import java.util + +import com.codahale.metrics._ import com.codahale.metrics.jvm import com.codahale.metrics.jvm.MemoryUsageGaugeSet diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala index 9b11bff17e..20ae2b81e7 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/MetricsKitSpec.scala @@ -4,8 +4,8 @@ package akka.testkit.metrics -import org.scalatest._ import com.typesafe.config.ConfigFactory +import org.scalatest._ import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AnyWordSpec diff --git a/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala b/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala index 3985cf5d33..72c7946ef5 100644 --- a/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala +++ b/akka-testkit/src/test/scala/akka/testkit/metrics/reporter/AkkaConsoleReporter.scala @@ -7,7 +7,9 @@ package akka.testkit.metrics.reporter import java.io.PrintStream import java.util import java.util.concurrent.TimeUnit + import com.codahale.metrics._ + import akka.testkit.metrics._ /** @@ -115,6 +117,7 @@ class AkkaConsoleReporter(registry: AkkaMetricRegistry, verbose: Boolean, output private def printKnownOpsInTimespanCounter(counter: KnownOpsInTimespanTimer): Unit = { import concurrent.duration._ + import akka.util.PrettyDuration._ output.print(" ops = %d%n".format(counter.getCount())) output.print(" time = %s%n".format(counter.elapsedTime.nanos.pretty)) diff --git a/build.sbt b/build.sbt index c39ea9f69e..2e3eaf967f 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -import akka.{ AutomaticModuleName, CopyrightHeaderForBuild, Paradox, ParadoxSupport, ScalafixIgnoreFilePlugin } +import akka.{AutomaticModuleName, CopyrightHeaderForBuild, Paradox, ParadoxSupport, ScalafixIgnoreFilePlugin} enablePlugins( UnidocRoot, @@ -11,13 +11,18 @@ enablePlugins( disablePlugins(MimaPlugin) addCommandAlias( name = "fixall", - value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;test:compile;reload") + value = ";scalafixEnable;compile:scalafix;test:scalafix;multi-jvm:scalafix;scalafmtAll;test:compile;multi-jvm:compile;reload") + +addCommandAlias( + name = "sortImports", + value = ";scalafixEnable;compile:scalafix SortImports;test:scalafix SortImports;multi-jvm:scalafix SortImports;" + + "CompileJdk9:scalafix SortImports;TestJdk9:scalafix SortImports;scalafmtAll;test:compile;multi-jvm:compile;reload") import akka.AkkaBuild._ -import akka.{ AkkaBuild, Dependencies, GitHub, OSGi, Protobuf, SigarLoader, VersionGenerator } +import akka.{AkkaBuild, Dependencies, OSGi, Protobuf, SigarLoader, VersionGenerator} import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm import com.typesafe.tools.mima.plugin.MimaPlugin -import sbt.Keys.{ initialCommands, parallelExecution } +import sbt.Keys.{initialCommands, parallelExecution} import spray.boilerplate.BoilerplatePlugin initialize := { diff --git a/project/ScalaFixExtraRulesPlugin.scala b/project/ScalaFixExtraRulesPlugin.scala new file mode 100644 index 0000000000..dcf6fc6aff --- /dev/null +++ b/project/ScalaFixExtraRulesPlugin.scala @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2020 Lightbend Inc. + */ + +package akka + +import sbt.{AutoPlugin, PluginTrigger, Plugins, ScalafixSupport} +import scalafix.sbt.ScalafixPlugin + +object ScalaFixExtraRulesPlugin extends AutoPlugin with ScalafixSupport{ + override def trigger: PluginTrigger = allRequirements + + override def requires: Plugins = ScalafixPlugin + + import sbt._ + import scalafix.sbt.ScalafixPlugin.autoImport.scalafixDependencies + override def projectSettings: Seq[Def.Setting[_]] = super.projectSettings ++ { + scalafixDependencies in ThisBuild += "com.nequissimus" %% "sort-imports" % "0.4.0" + } +} diff --git a/project/ScalaFixForJdk9Plugin.scala b/project/ScalaFixForJdk9Plugin.scala new file mode 100644 index 0000000000..ff6ae854d3 --- /dev/null +++ b/project/ScalaFixForJdk9Plugin.scala @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2020 Lightbend Inc. + */ + +package akka + +import sbt.{AutoPlugin, PluginTrigger, Plugins, ScalafixSupport} +import scalafix.sbt.ScalafixPlugin +object ScalaFixForJdk9Plugin extends AutoPlugin with ScalafixSupport{ + override def trigger: PluginTrigger = allRequirements + import Jdk9._ + override def requires: Plugins = Jdk9 && ScalafixPlugin + + import ScalafixPlugin.autoImport.scalafixConfigSettings + import sbt._ + override def projectSettings: Seq[Def.Setting[_]] = super.projectSettings ++ { + inConfig(TestJdk9)(scalafixConfigSettings(TestJdk9)) ++ + inConfig(CompileJdk9)(scalafixConfigSettings(CompileJdk9)) + } +} diff --git a/project/plugins.sbt b/project/plugins.sbt index e4338a43d3..b0c50684cf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,8 +9,8 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0") //#sbt-multi-jvm addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.5.1") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.0.6") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.14") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.4") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.15") // sbt-osgi 0.9.5 is available but breaks including jdk9-only classes addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.4") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")