You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by he...@apache.org on 2025/10/19 17:43:03 UTC

(pekko) 01/01: chore: bump sbt-java-formatter to 0.9.0

This is an automated email from the ASF dual-hosted git repository.

hepin pushed a commit to branch 1.3.x-javafmt
in repository https://gitbox.apache.org/repos/asf/pekko.git

commit 701030bc3ba653ac23b66dacccf206ba9c2f6e81
Author: He-Pin <he...@gmail.com>
AuthorDate: Mon Oct 20 01:42:46 2025 +0800

    chore: bump sbt-java-formatter to 0.9.0
---
 .../javadsl/JUnit5IntegrationExampleTest.java      |  8 ++---
 .../javadsl/LogCapturingExtensionExampleTest.java  |  4 +--
 .../typed/javadsl/ManualTimerExampleTest.java      | 13 +++----
 .../testkit/typed/javadsl/ActorTestKitApiTest.java |  5 ++-
 .../typed/javadsl/ActorTestKitJUnit5Test.java      | 18 +++++-----
 .../testkit/typed/javadsl/ActorTestKitTest.java    | 13 ++++---
 .../testkit/typed/javadsl/BehaviorTestKitTest.java | 15 ++++----
 .../testkit/typed/javadsl/LoggingTestKitTest.java  | 11 +++---
 .../actor/testkit/typed/javadsl/TestProbeTest.java |  5 ++-
 .../org/apache/pekko/actor/ActorCreationTest.java  |  4 +--
 .../org/apache/pekko/actor/ActorSelectionTest.java |  6 ++--
 .../org/apache/pekko/actor/ActorSystemTest.java    |  9 +++--
 .../java/org/apache/pekko/actor/AddressTest.java   |  7 ++--
 .../test/java/org/apache/pekko/actor/JavaAPI.java  | 10 +++---
 .../java/org/apache/pekko/actor/JavaExtension.java |  8 ++---
 .../java/org/apache/pekko/actor/StashJavaAPI.java  |  1 -
 .../pekko/actor/setup/ActorSystemSetupTest.java    |  7 ++--
 .../java/org/apache/pekko/event/ActorWithMDC.java  |  3 +-
 .../org/apache/pekko/event/LoggingAdapterTest.java | 26 +++++++-------
 .../org/apache/pekko/japi/JavaAPITestBase.java     |  7 ++--
 .../org/apache/pekko/japi/MatchBuilderTest.java    |  4 +--
 .../org/apache/pekko/japi/pf/PFBuilderTest.java    |  4 +--
 .../apache/pekko/japi/pf/ReceiveBuilderTest.java   |  9 +++--
 .../apache/pekko/pattern/CircuitBreakerTest.java   | 15 ++++----
 .../org/apache/pekko/pattern/PatternsTest.java     | 22 ++++++------
 .../org/apache/pekko/pattern/StatusReplyTest.java  | 16 ++++-----
 .../java/org/apache/pekko/util/ByteStringTest.java |  4 +--
 .../pekko/util/JavaConverterScala3InlineTest.java  |  1 -
 .../java/org/apache/pekko/util/JavaDuration.java   |  4 +--
 .../jdocs/org/apache/pekko/typed/Aggregator.java   | 11 +++---
 .../org/apache/pekko/typed/AggregatorTest.java     | 27 +++++++-------
 .../org/apache/pekko/typed/BubblingSampleTest.java |  9 +++--
 .../org/apache/pekko/typed/DispatchersDocTest.java |  2 +-
 .../jdocs/org/apache/pekko/typed/FSMDocTest.java   |  7 ++--
 .../pekko/typed/InteractionPatternsTest.java       | 21 ++++++-----
 .../org/apache/pekko/typed/MailboxDocTest.java     |  2 +-
 .../org/apache/pekko/typed/StashDocSample.java     |  2 +-
 .../jdocs/org/apache/pekko/typed/StashDocTest.java | 11 +++---
 .../jdocs/org/apache/pekko/typed/TailChopping.java |  5 ++-
 .../pekko/typed/extensions/ExtensionDocTest.java   |  5 ++-
 .../pekko/typed/fromclassic/TypedSample.java       |  5 ++-
 .../supervision/SupervisionCompileOnlyTest.java    |  3 +-
 .../apache/pekko/actor/typed/ActorSystemTest.java  |  9 +++--
 .../apache/pekko/actor/typed/ExtensionsTest.java   | 15 ++++----
 .../pekko/actor/typed/javadsl/ActorCompile.java    |  7 ++--
 .../actor/typed/javadsl/ActorContextAskTest.java   |  7 ++--
 .../typed/javadsl/ActorContextPipeToSelfTest.java  | 15 ++++----
 .../actor/typed/javadsl/ActorLoggingTest.java      |  9 +++--
 .../pekko/actor/typed/javadsl/AdapterTest.java     | 25 +++++++------
 .../actor/typed/javadsl/BehaviorBuilderTest.java   | 18 +++++-----
 .../actor/typed/javadsl/ReceiveBuilderTest.java    |  7 ++--
 .../pekko/actor/typed/javadsl/RoutersTest.java     |  7 ++--
 .../pekko/actor/typed/javadsl/StashBufferTest.java |  9 +++--
 .../pekko/actor/typed/javadsl/WatchTest.java       | 15 ++++----
 .../typed/receptionist/ReceptionistApiTest.java    |  7 ++--
 .../org/apache/pekko/io/ByteBufferCleaner.java     |  4 +--
 .../pekko/japi/pf/FSMStateFunctionBuilder.java     |  2 +-
 .../pekko/japi/pf/FSMTransitionHandlerBuilder.java |  2 +-
 .../main/java/org/apache/pekko/util/Unsafe.java    |  3 +-
 .../cluster/sharding/typed/AccountExampleTest.java | 25 +++++++------
 .../AccountExampleWithEventHandlersInState.java    |  5 ++-
 .../typed/AccountExampleWithMutableState.java      |  5 ++-
 .../typed/AccountExampleWithNullDurableState.java  |  5 ++-
 .../typed/AccountExampleWithNullState.java         |  5 ++-
 .../ExternalShardAllocationCompileOnlyTest.java    |  9 +++--
 .../HelloWorldEventSourcedEntityExampleTest.java   | 12 +++----
 .../typed/ReplicatedShardingCompileOnlySpec.java   |  3 +-
 .../sharding/typed/ReplicatedShardingTest.java     | 15 ++++----
 .../javadsl/ClusterShardingPersistenceTest.java    |  7 ++--
 .../ShardedDaemonProcessCompileOnlyTest.java       |  7 ++--
 .../pekko/cluster/client/ClusterClientTest.java    |  5 ++-
 .../pubsub/DistributedPubSubMediatorTest.java      | 11 +++---
 .../singleton/ClusterSingletonManagerTest.java     |  3 +-
 .../apache/pekko/cluster/singleton/Consumer.java   |  2 +-
 .../ddata/typed/javadsl/ReplicatorDocTest.java     | 13 ++++---
 .../cluster/typed/PingSerializerExampleTest.java   |  3 +-
 .../apache/pekko/cluster/typed/ClusterApiTest.java |  9 +++--
 .../pekko/cluster/ClusterJavaCompileTest.java      |  5 ++-
 .../lease/javadsl/LeaseProviderTest.java           |  4 +--
 .../apache/pekko/discovery/CompileOnlyTest.java    |  7 ++--
 .../java/jdocs/actor/FaultHandlingDocSample.java   | 29 +++++++--------
 .../java/jdocs/actor/InitializationDocTest.java    |  7 ++--
 .../src/test/java/jdocs/actor/MyStoppingActor.java |  2 +-
 .../src/test/java/jdocs/actor/SampleActorTest.java |  6 ++--
 .../src/test/java/jdocs/actor/fsm/BuncherTest.java | 14 ++++----
 docs/src/test/java/jdocs/actor/fsm/Events.java     |  2 +-
 docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java | 14 ++++----
 .../jdocs/actor/io/dns/DnsCompileOnlyDocTest.java  | 10 +++---
 .../java/jdocs/actor/typed/DispatcherDocTest.java  |  3 +-
 .../SeparateDispatcherCompletionStageActor.java    |  1 -
 .../actor/typed/SharedMutableStateDocTest.java     | 13 ++++---
 .../jdocs/circuitbreaker/DangerousJavaActor.java   | 11 +++---
 .../circuitbreaker/EvenNoFailureJavaExample.java   |  5 ++-
 .../jdocs/circuitbreaker/TellPatternJavaActor.java |  4 +--
 .../test/java/jdocs/cluster/FactorialBackend.java  |  4 +--
 .../test/java/jdocs/cluster/FactorialFrontend.java |  9 +++--
 .../java/jdocs/cluster/FactorialFrontendMain.java  |  3 +-
 .../test/java/jdocs/cluster/FactorialResult.java   |  2 +-
 .../test/java/jdocs/cluster/MetricsListener.java   |  4 +--
 .../java/jdocs/cluster/SimpleClusterListener.java  |  2 +-
 .../java/jdocs/cluster/SimpleClusterListener2.java |  2 +-
 .../test/java/jdocs/cluster/StatsAggregator.java   |  5 ++-
 .../test/java/jdocs/cluster/StatsSampleClient.java | 11 +++---
 .../cluster/StatsSampleOneMasterClientMain.java    |  1 -
 .../jdocs/cluster/StatsSampleOneMasterMain.java    |  1 -
 docs/src/test/java/jdocs/cluster/StatsService.java | 17 +++++----
 docs/src/test/java/jdocs/cluster/StatsWorker.java  |  1 -
 .../java/jdocs/cluster/TransformationBackend.java  |  1 +
 .../java/jdocs/cluster/TransformationFrontend.java |  3 +-
 .../test/java/jdocs/coordination/LeaseDocTest.java | 11 +++---
 docs/src/test/java/jdocs/ddata/DataBot.java        |  2 --
 .../java/jdocs/ddata/DistributedDataDocTest.java   | 30 +++++++---------
 docs/src/test/java/jdocs/ddata/ShoppingCart.java   |  3 +-
 docs/src/test/java/jdocs/ddata/TwoPhaseSet.java    |  2 --
 .../ddata/protobuf/TwoPhaseSetSerializer.java      |  3 +-
 .../ddata/protobuf/TwoPhaseSetSerializer2.java     |  3 +-
 .../TwoPhaseSetSerializerWithCompression.java      |  1 -
 .../java/jdocs/dispatcher/MyUnboundedMailbox.java  |  6 ++--
 docs/src/test/java/jdocs/duration/Java.java        |  5 +--
 .../test/java/jdocs/io/JavaReadBackPressure.java   | 11 +++---
 docs/src/test/java/jdocs/io/JavaUdpMulticast.java  | 18 +++++-----
 .../test/java/jdocs/io/JavaUdpMulticastTest.java   | 12 +++----
 docs/src/test/java/jdocs/io/UdpDocTest.java        |  4 +--
 docs/src/test/java/jdocs/io/japi/EchoHandler.java  |  9 +++--
 docs/src/test/java/jdocs/io/japi/EchoManager.java  |  3 +-
 docs/src/test/java/jdocs/io/japi/EchoServer.java   |  6 ++--
 .../test/java/jdocs/io/japi/SimpleEchoHandler.java |  3 +-
 docs/src/test/java/jdocs/io/japi/Watcher.java      |  3 +-
 .../src/test/java/jdocs/pattern/SupervisedAsk.java |  5 ++-
 .../test/java/jdocs/pattern/SupervisedAskSpec.java |  9 +++--
 .../persistence/LambdaPersistenceDocTest.java      |  7 ++--
 .../jdocs/persistence/PersistenceMultiDocTest.java |  4 +--
 .../jdocs/persistence/PersistenceQueryDocTest.java | 18 ++++------
 .../PersistenceSchemaEvolutionDocTest.java         |  5 +--
 .../jdocs/persistence/PersistentActorExample.java  |  5 ++-
 .../query/LeveldbPersistenceQueryDocTest.java      |  5 ++-
 .../persistence/query/MyEventsByTagSource.java     | 15 ++++----
 .../jdocs/persistence/testkit/Configuration.java   |  4 +--
 .../PersistenceTestKitPolicySampleTest.java        |  4 +--
 .../testkit/PersistenceTestKitSampleTest.java      |  6 ++--
 .../test/java/jdocs/routing/RedundancyGroup.java   | 10 +++---
 .../test/java/jdocs/stream/BidiFlowDocTest.java    | 19 +++++-----
 .../test/java/jdocs/stream/CompositionDocTest.java | 14 ++++----
 docs/src/test/java/jdocs/stream/FlowDocTest.java   | 23 ++++++------
 .../test/java/jdocs/stream/FlowErrorDocTest.java   | 13 ++++---
 .../java/jdocs/stream/FlowParallelismDocTest.java  |  8 ++---
 .../java/jdocs/stream/FlowStreamRefsDocTest.java   |  5 ++-
 .../test/java/jdocs/stream/GraphCyclesDocTest.java | 12 +++----
 docs/src/test/java/jdocs/stream/HubDocTest.java    | 11 +++---
 .../test/java/jdocs/stream/IntegrationDocTest.java | 37 ++++++++++---------
 .../test/java/jdocs/stream/KillSwitchDocTest.java  | 18 +++++-----
 .../jdocs/stream/RateTransformationDocTest.java    | 23 ++++++------
 .../src/test/java/jdocs/stream/RestartDocTest.java |  7 ++--
 .../test/java/jdocs/stream/SilenceSystemOut.java   |  3 +-
 .../test/java/jdocs/stream/SinkRecipeDocTest.java  |  9 +++--
 .../jdocs/stream/StreamBuffersRateDocTest.java     |  7 ++--
 .../jdocs/stream/StreamPartialGraphDSLDocTest.java | 17 +++++----
 .../java/jdocs/stream/StreamTestKitDocTest.java    | 13 ++++---
 .../test/java/jdocs/stream/SubstreamDocTest.java   |  5 ++-
 .../java/jdocs/stream/io/StreamFileDocTest.java    | 14 ++++----
 .../java/jdocs/stream/io/StreamTcpDocTest.java     | 19 +++++-----
 .../javadsl/cookbook/RecipeAdhocSourceTest.java    | 13 ++++---
 .../stream/javadsl/cookbook/RecipeByteStrings.java | 19 +++++-----
 .../stream/javadsl/cookbook/RecipeDecompress.java  |  6 ++--
 .../stream/javadsl/cookbook/RecipeDigest.java      | 11 +++---
 .../javadsl/cookbook/RecipeDroppyBroadcast.java    |  7 ++--
 .../stream/javadsl/cookbook/RecipeFlattenList.java | 11 +++---
 .../javadsl/cookbook/RecipeGlobalRateLimit.java    | 11 +++---
 .../jdocs/stream/javadsl/cookbook/RecipeHold.java  |  3 +-
 .../stream/javadsl/cookbook/RecipeKeepAlive.java   |  3 +-
 .../javadsl/cookbook/RecipeLoggingElements.java    |  7 ++--
 .../javadsl/cookbook/RecipeManualTrigger.java      |  5 ++-
 .../stream/javadsl/cookbook/RecipeMissedTicks.java |  5 ++-
 .../javadsl/cookbook/RecipeMultiGroupByTest.java   | 17 +++++----
 .../stream/javadsl/cookbook/RecipeParseLines.java  |  5 ++-
 .../javadsl/cookbook/RecipeReduceByKeyTest.java    | 15 ++++----
 .../jdocs/stream/javadsl/cookbook/RecipeSeq.java   |  9 +++--
 .../stream/javadsl/cookbook/RecipeSimpleDrop.java  |  3 +-
 .../javadsl/cookbook/RecipeSourceFromFunction.java |  9 +++--
 .../stream/javadsl/cookbook/RecipeSplitter.java    |  9 +++--
 .../stream/javadsl/cookbook/RecipeWorkerPool.java  | 13 ++++---
 .../operators/converters/ToFromJavaIOStreams.java  | 29 ++++++++-------
 .../java/jdocs/stream/operators/flow/DiMap.java    |  2 +-
 .../stream/operators/flow/FromSinkAndSource.java   |  9 +++--
 .../jdocs/stream/operators/flow/FutureFlow.java    |  7 ++--
 .../java/jdocs/stream/operators/flow/Lazy.java     |  9 +++--
 .../jdocs/stream/operators/flow/StatefulMap.java   |  5 ++-
 .../stream/operators/flow/StatefulMapConcat.java   |  3 +-
 .../java/jdocs/stream/operators/sink/Exists.java   |  2 +-
 .../java/jdocs/stream/operators/sink/ForAll.java   |  3 +-
 .../java/jdocs/stream/operators/sink/Lazy.java     |  5 ++-
 .../jdocs/stream/operators/sink/NoneMatch.java     |  3 +-
 .../operators/source/CompletionStageSource.java    |  3 +-
 .../java/jdocs/stream/operators/source/From.java   |  5 ++-
 .../operators/source/FromCompletionStage.java      |  5 ++-
 .../java/jdocs/stream/operators/source/Lazy.java   |  5 ++-
 .../jdocs/stream/operators/source/Restart.java     |  5 ++-
 .../java/jdocs/stream/operators/source/Tick.java   |  5 ++-
 .../java/jdocs/stream/operators/source/Unfold.java |  5 ++-
 .../jdocs/stream/operators/source/UnfoldAsync.java |  9 +++--
 .../stream/operators/source/UnfoldResource.java    |  3 +-
 .../operators/source/UnfoldResourceAsync.java      |  7 ++--
 .../java/jdocs/stream/operators/source/Zip.java    |  5 ++-
 .../sourceorflow/ExtrapolateAndExpand.java         |  9 +++--
 .../operators/sourceorflow/FlatMapConcat.java      |  3 +-
 .../operators/sourceorflow/FlatMapMerge.java       |  3 +-
 .../stream/operators/sourceorflow/Intersperse.java |  3 +-
 .../jdocs/stream/operators/sourceorflow/Limit.java |  5 ++-
 .../operators/sourceorflow/LimitWeighted.java      |  3 +-
 .../stream/operators/sourceorflow/MapAsyncs.java   | 11 +++---
 .../stream/operators/sourceorflow/MapConcat.java   |  3 +-
 .../stream/operators/sourceorflow/MapError.java    |  3 +-
 .../operators/sourceorflow/MapWithResource.java    |  5 ++-
 .../stream/operators/sourceorflow/MergeLatest.java |  3 +-
 .../stream/operators/sourceorflow/Monitor.java     | 11 +++---
 .../stream/operators/sourceorflow/Sliding.java     |  3 +-
 .../jdocs/stream/operators/sourceorflow/Split.java | 11 +++---
 .../stream/operators/sourceorflow/Throttle.java    |  7 ++--
 .../test/java/jdocs/testkit/ParentChildTest.java   |  6 ++--
 .../test/java/jdocs/testkit/TestKitDocTest.java    | 38 +++++++++-----------
 .../test/java/jdocs/testkit/TestKitSampleTest.java | 12 +++----
 .../test/java/jdocs/typed/tutorial_3/Device.java   |  1 -
 .../java/jdocs/typed/tutorial_3/DeviceTest.java    |  6 ++--
 .../jdocs/typed/tutorial_3/inprogress1/Device.java |  2 +-
 .../jdocs/typed/tutorial_3/inprogress2/Device.java |  3 +-
 .../test/java/jdocs/typed/tutorial_4/Device.java   |  1 -
 .../java/jdocs/typed/tutorial_4/DeviceGroup.java   |  5 ++-
 .../jdocs/typed/tutorial_4/DeviceGroupTest.java    | 20 +++++------
 .../java/jdocs/typed/tutorial_4/DeviceManager.java |  9 +++--
 .../jdocs/typed/tutorial_4/DeviceManagerTest.java  |  9 +++--
 .../java/jdocs/typed/tutorial_4/DeviceTest.java    |  7 ++--
 .../test/java/jdocs/typed/tutorial_5/Device.java   |  1 -
 .../java/jdocs/typed/tutorial_5/DeviceGroup.java   |  7 ++--
 .../jdocs/typed/tutorial_5/DeviceGroupQuery.java   | 11 +++---
 .../typed/tutorial_5/DeviceGroupQueryTest.java     | 26 +++++++-------
 .../jdocs/typed/tutorial_5/DeviceGroupTest.java    | 34 +++++++++---------
 .../java/jdocs/typed/tutorial_5/DeviceManager.java |  9 +++--
 .../jdocs/typed/tutorial_5/DeviceManagerTest.java  |  9 +++--
 .../java/jdocs/typed/tutorial_5/DeviceTest.java    |  7 ++--
 .../persistence/query/DummyJavaReadJournal.java    |  1 -
 .../persistence/typed/MyReplicatedBehavior.java    |  3 +-
 .../typed/ReplicatedAuctionExampleTest.java        | 25 +++++++------
 .../persistence/typed/ReplicatedBlogExample.java   |  5 ++-
 .../persistence/typed/ReplicatedMovieExample.java  |  5 ++-
 .../typed/ReplicatedShoppingCartExample.java       |  9 +++--
 .../persistence/typed/ReplicatedStringSet.java     |  5 ++-
 .../typed/ReplicatedEventSourcingTest.java         | 11 +++---
 .../javadsl/EventSourcedActorFailureTest.java      | 11 +++---
 .../javadsl/EventSourcedBehaviorJavaDslTest.java   | 23 ++++++------
 .../pekko/persistence/typed/MovieWatchList.java    |  7 ++--
 .../pekko/persistence/typed/OptionalBlogState.java |  3 +-
 ...rsistentFsmToTypedMigrationCompileOnlyTest.java |  7 ++--
 .../pekko/persistence/typed/StashingExample.java   |  5 ++-
 .../persistence/typed/WebStoreCustomerFSM.java     |  3 +-
 .../persistence/typed/auction/AuctionCommand.java  |  3 +-
 .../persistence/typed/auction/AuctionEntity.java   |  7 ++--
 .../typed/javadsl/LoggerSourceTest.java            | 11 +++---
 .../typed/javadsl/NullEmptyStateTest.java          |  4 +--
 .../javadsl/PersistentActorCompileOnlyTest.java    | 17 +++++----
 .../typed/javadsl/PrimitiveStateTest.java          |  4 +--
 .../fsm/japi/pf/FSMStateFunctionBuilder.java       |  3 +-
 .../journal/japi/AsyncRecoveryPlugin.java          |  4 +--
 .../persistence/journal/japi/AsyncWritePlugin.java |  4 +--
 .../snapshot/japi/SnapshotStorePlugin.java         |  3 +-
 .../persistence/fsm/AbstractPersistentFSMTest.java |  5 ++-
 project/JavaFormatter.scala                        |  2 +-
 project/plugins.sbt                                |  2 +-
 .../pekko/remote/artery/aeron/AeronErrorLog.java   | 10 +++---
 .../pekko/remote/artery/aeron/AeronStat.java       | 27 +++++++-------
 .../jackson/v1withv2/ItemAddedMigration.java       |  2 +-
 .../pekko/serialization/jackson/v2a/Customer.java  |  3 +-
 .../jackson/v2a/CustomerMigration.java             |  2 +-
 .../pekko/serialization/jackson/v2a/ItemAdded.java |  3 +-
 .../jackson/v2a/OrderPlacedMigration.java          |  2 +-
 .../jackson/v2c/ItemAddedMigration.java            |  2 +-
 .../jackson/JavaTestEventMigrationV2.java          |  3 +-
 .../serialization/jackson/JavaTestMessages.java    |  5 ++-
 .../pekko/stream/StreamAttributeDocTest.java       | 11 +++---
 .../pekko/stream/io/InputStreamSinkTest.java       | 17 +++++----
 .../pekko/stream/io/OutputStreamSinkTest.java      | 15 ++++----
 .../pekko/stream/io/OutputStreamSourceTest.java    | 10 +++---
 .../pekko/stream/io/SinkAsJavaSourceTest.java      | 15 ++++----
 .../pekko/stream/javadsl/AttributesTest.java       |  6 ++--
 .../org/apache/pekko/stream/javadsl/FlowTest.java  | 41 +++++++++++-----------
 .../pekko/stream/javadsl/FlowThrottleTest.java     | 13 ++++---
 .../pekko/stream/javadsl/FlowWithContextTest.java  | 13 ++++---
 .../javadsl/FlowWithContextThrottleTest.java       | 11 +++---
 .../apache/pekko/stream/javadsl/FramingTest.java   |  2 +-
 .../apache/pekko/stream/javadsl/GraphDslTest.java  | 15 ++++----
 .../pekko/stream/javadsl/JsonFramingTest.java      | 15 ++++----
 .../pekko/stream/javadsl/KillSwitchTest.java       | 13 ++++---
 .../stream/javadsl/LazyAndFutureFlowTest.java      | 13 ++++---
 .../stream/javadsl/LazyAndFutureSourcesTest.java   | 15 ++++----
 .../apache/pekko/stream/javadsl/RetryFlowTest.java |  9 +++--
 .../pekko/stream/javadsl/RunnableGraphTest.java    |  4 +--
 .../org/apache/pekko/stream/javadsl/SetupTest.java |  9 +++--
 .../org/apache/pekko/stream/javadsl/SinkTest.java  | 17 +++++----
 .../pekko/stream/javadsl/SourceRunWithTest.java    |  3 +-
 .../pekko/stream/javadsl/SourceUnfoldTest.java     |  3 +-
 .../javadsl/SourceWithContextThrottleTest.java     | 13 ++++---
 .../org/apache/pekko/stream/stage/StageTest.java   | 15 ++++----
 .../pekko/stream/typed/ActorSinkExample.java       |  1 +
 .../stream/typed/ActorSinkWithAckExample.java      |  1 +
 .../pekko/stream/typed/ActorSourceExample.java     |  2 +-
 .../typed/ActorSourceWithBackpressureExample.java  |  3 +-
 .../typed/javadsl/ActorSourceSinkCompileTest.java  |  3 +-
 .../javadsl/CustomGuardianAndMaterializerTest.java |  9 +++--
 .../testkit/PekkoJUnitActorSystemResource.java     |  3 +-
 .../pekko/testkit/javadsl/TestKitApiTest.java      |  5 ++-
 309 files changed, 1142 insertions(+), 1441 deletions(-)

diff --git a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5IntegrationExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5IntegrationExampleTest.java
index 7038d77952..afaea2825a 100644
--- a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5IntegrationExampleTest.java
+++ b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5IntegrationExampleTest.java
@@ -9,8 +9,11 @@
 
 package jdocs.org.apache.pekko.actor.testkit.typed.javadsl;
 
-import org.apache.pekko.actor.testkit.typed.annotations.JUnit5TestKit;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.pekko.actor.Address;
+import org.apache.pekko.actor.testkit.typed.annotations.JUnit5TestKit;
 import org.apache.pekko.actor.testkit.typed.javadsl.*;
 import org.apache.pekko.actor.testkit.typed.javadsl.JUnit5TestKitBuilder;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -18,9 +21,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 // #junit5-integration
 @DisplayName("JUnit5")
 @ExtendWith(TestKitJUnit5Extension.class)
diff --git a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtensionExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtensionExampleTest.java
index 1ff8676555..8da89caad1 100644
--- a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtensionExampleTest.java
+++ b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExtensionExampleTest.java
@@ -17,6 +17,8 @@
 
 package jdocs.org.apache.pekko.actor.testkit.typed.javadsl;
 
+import static jdocs.org.apache.pekko.actor.testkit.typed.javadsl.AsyncTestingExampleTest.Echo;
+
 import org.apache.pekko.actor.testkit.typed.annotations.JUnit5TestKit;
 import org.apache.pekko.actor.testkit.typed.javadsl.*;
 import org.apache.pekko.actor.testkit.typed.javadsl.JUnit5TestKitBuilder;
@@ -25,8 +27,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import static jdocs.org.apache.pekko.actor.testkit.typed.javadsl.AsyncTestingExampleTest.Echo;
-
 // test code copied from LogCapturingExampleTest.java
 
 @DisplayName("JUnit5 log capturing")
diff --git a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
index 107ddd5639..5f644ea89e 100644
--- a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
+++ b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
@@ -15,20 +15,17 @@ package jdocs.org.apache.pekko.actor.testkit.typed.javadsl;
 
 // #manual-scheduling-simple
 
+import java.time.Duration;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
-import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.testkit.typed.javadsl.ManualTime;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.scalatestplus.junit.JUnitSuite;
-import java.time.Duration;
-
-import org.apache.pekko.actor.typed.javadsl.Behaviors;
-
 import org.junit.Test;
-
-import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.scalatestplus.junit.JUnitSuite;
 
 public class ManualTimerExampleTest extends JUnitSuite {
 
diff --git a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java
index 5b6b51dcb2..f017307edf 100644
--- a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java
+++ b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java
@@ -13,14 +13,13 @@
 
 package org.apache.pekko.actor.testkit.typed.javadsl;
 
+import java.time.Duration;
+import java.util.List;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Props;
 import org.apache.pekko.actor.typed.Scheduler;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 
-import java.time.Duration;
-import java.util.List;
-
 public class ActorTestKitApiTest {
 
   public void compileOnlyTestCase() {
diff --git a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitJUnit5Test.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitJUnit5Test.java
index 4e03cc0bbc..c9b8669c57 100644
--- a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitJUnit5Test.java
+++ b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitJUnit5Test.java
@@ -9,23 +9,21 @@
 
 package org.apache.pekko.actor.testkit.typed.javadsl;
 
-import org.apache.pekko.actor.testkit.typed.annotations.JUnit5TestKit;
+import static org.apache.pekko.Done.done;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import java.util.HashMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
+import org.apache.pekko.actor.testkit.typed.annotations.JUnit5TestKit;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
-
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.HashMap;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.pekko.Done.done;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 @DisplayName("ActorTestKitTestJUnit5")
 @ExtendWith(TestKitJUnit5Extension.class)
 @ExtendWith(LogCapturingExtension.class)
diff --git a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java
index ec6209a06c..3100d08abd 100644
--- a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java
+++ b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java
@@ -13,6 +13,12 @@
 
 package org.apache.pekko.actor.testkit.typed.javadsl;
 
+import static org.apache.pekko.Done.done;
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.junit.ClassRule;
@@ -20,13 +26,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.HashMap;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.pekko.Done.done;
-import static org.junit.Assert.assertEquals;
-
 public class ActorTestKitTest extends JUnitSuite {
 
   @ClassRule public static TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
index 76f6f74aaf..549742b4a4 100644
--- a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
+++ b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.actor.testkit.typed.javadsl;
 
+import static org.junit.Assert.*;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.IntStream;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.CapturedLogEvent;
 import org.apache.pekko.actor.testkit.typed.Effect;
@@ -25,14 +32,6 @@ import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import org.slf4j.event.Level;
 
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.IntStream;
-
-import static org.junit.Assert.*;
-
 public class BehaviorTestKitTest extends JUnitSuite {
 
   public interface Command {}
diff --git a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java
index 83bb9bb7b6..ac48e4f24e 100644
--- a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java
+++ b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java
@@ -13,6 +13,11 @@
 
 package org.apache.pekko.actor.testkit.typed.javadsl;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.Optional;
 import org.apache.pekko.actor.testkit.typed.LoggingEvent;
 import org.apache.pekko.actor.testkit.typed.TestException;
 import org.junit.ClassRule;
@@ -21,12 +26,6 @@ import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import org.slf4j.event.Level;
 
-import java.util.Collections;
-import java.util.Optional;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 public class LoggingTestKitTest extends JUnitSuite {
 
   @ClassRule public static TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java
index e8cffba7d3..cb679b5b9d 100644
--- a/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java
+++ b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java
@@ -13,10 +13,11 @@
 
 package org.apache.pekko.actor.testkit.typed.javadsl;
 
+import static org.junit.Assert.*;
+
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.pekko.actor.testkit.typed.scaladsl.TestProbeSpec;
 import org.apache.pekko.actor.testkit.typed.scaladsl.TestProbeSpec.*;
 import org.junit.ClassRule;
@@ -24,8 +25,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static org.junit.Assert.*;
-
 public class TestProbeTest extends JUnitSuite {
 
   @ClassRule public static TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java
index b0fd05dd2a..b0729b054e 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java
@@ -13,15 +13,13 @@
 
 package org.apache.pekko.actor;
 
-import static org.junit.Assert.*;
 import static java.util.stream.Collectors.toCollection;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 import java.util.stream.IntStream;
-
 import org.junit.Assert;
 import org.junit.Test;
-
 import org.scalatestplus.junit.JUnitSuite;
 
 @SuppressWarnings("deprecation")
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java
index a2061009ed..ca210205b2 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java
@@ -13,19 +13,17 @@
 
 package org.apache.pekko.actor;
 
+import static org.junit.Assert.assertEquals;
+
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
-
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static org.junit.Assert.assertEquals;
-
 public class ActorSelectionTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java
index bf2ddd042b..1aff57e5c5 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java
@@ -13,17 +13,16 @@
 
 package org.apache.pekko.actor;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertFalse;
+
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.CompletionStage;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertFalse;
-
 public class ActorSystemTest extends JUnitSuite {
 
   @Rule
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java
index b2834c6527..6066be56d2 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java
@@ -13,12 +13,11 @@
 
 package org.apache.pekko.actor;
 
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.scalatestplus.junit.JUnitSuite;
 
 public class AddressTest extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java b/actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java
index b903c9e44a..c754d11640 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java
@@ -13,28 +13,26 @@
 
 package org.apache.pekko.actor;
 
+import static org.junit.Assert.*;
+
+import java.util.Optional;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.Logging.LoggerInitialized;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.japi.Util;
 import org.apache.pekko.japi.tuple.Tuple22;
 import org.apache.pekko.japi.tuple.Tuple4;
-import org.apache.pekko.routing.GetRoutees;
 import org.apache.pekko.routing.FromConfig;
+import org.apache.pekko.routing.GetRoutees;
 import org.apache.pekko.routing.NoRouter;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
 import org.apache.pekko.testkit.TestProbe;
-
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.Option;
 
-import java.util.Optional;
-
-import static org.junit.Assert.*;
-
 public class JavaAPI extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java b/actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java
index 5d11b551b5..4e58554598 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java
@@ -13,14 +13,14 @@
 
 package org.apache.pekko.actor;
 
+import static org.junit.Assert.*;
+
+import com.typesafe.config.ConfigFactory;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-import org.junit.*;
 import org.apache.pekko.testkit.PekkoSpec;
-import com.typesafe.config.ConfigFactory;
+import org.junit.*;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static org.junit.Assert.*;
-
 public class JavaExtension extends JUnitSuite {
 
   static class TestExtensionId extends AbstractExtensionId<TestExtension>
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java b/actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java
index 431d152990..8fe1927bd8 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java
@@ -15,7 +15,6 @@ package org.apache.pekko.actor;
 
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.TestProbe;
-
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
diff --git a/actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java
index 67a14d8c3b..f3351dd10f 100644
--- a/actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java
@@ -13,12 +13,11 @@
 
 package org.apache.pekko.actor.setup;
 
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import static org.junit.Assert.*;
 
 import java.util.Optional;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
+import org.scalatestplus.junit.JUnitSuite;
 
 public class ActorSystemSetupTest extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java b/actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java
index 8aa4dac72a..fca69a302f 100644
--- a/actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java
+++ b/actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.event;
 
-import org.apache.pekko.actor.AbstractActor;
-
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.apache.pekko.actor.AbstractActor;
 
 public class ActorWithMDC extends AbstractActor {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java b/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
index 3b7bc1c55b..013f76b25b 100644
--- a/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
@@ -13,30 +13,28 @@
 
 package org.apache.pekko.event;
 
+import static org.apache.pekko.event.Logging.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.time.Duration;
+import java.util.*;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-import org.apache.pekko.event.Logging.Error;
 import org.apache.pekko.event.ActorWithMDC.Log;
-import static org.apache.pekko.event.Logging.*;
-
+import org.apache.pekko.event.Logging.Error;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.*;
-import java.time.Duration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 public class LoggingAdapterTest extends JUnitSuite {
 
   private static final Config config = ConfigFactory.parseString("pekko.loglevel = DEBUG\n");
diff --git a/actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java b/actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java
index 1645f42eb4..0aa3f0ec6e 100644
--- a/actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java
+++ b/actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java
@@ -13,6 +13,9 @@
 
 package org.apache.pekko.japi;
 
+import static org.junit.Assert.*;
+
+import java.util.concurrent.Callable;
 import org.apache.pekko.actor.ExtendedActorSystem;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.event.NoLogging;
@@ -20,10 +23,6 @@ import org.apache.pekko.serialization.JavaSerializer;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.Callable;
-
-import static org.junit.Assert.*;
-
 @SuppressWarnings("deprecation")
 public class JavaAPITestBase extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java
index 6b2e2c5edb..48689c0470 100644
--- a/actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java
@@ -13,6 +13,8 @@
 
 package org.apache.pekko.japi;
 
+import static org.junit.Assert.*;
+
 import org.apache.pekko.japi.pf.FI;
 import org.apache.pekko.japi.pf.Match;
 import org.junit.Assert;
@@ -20,8 +22,6 @@ import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.MatchError;
 
-import static org.junit.Assert.*;
-
 @SuppressWarnings("deprecation")
 public class MatchBuilderTest extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java
index 9a34d916c0..32fd544062 100644
--- a/actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java
@@ -13,12 +13,12 @@
 
 package org.apache.pekko.japi.pf;
 
+import static org.junit.Assert.*;
+
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.PartialFunction;
 
-import static org.junit.Assert.*;
-
 @SuppressWarnings("serial")
 public class PFBuilderTest extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java
index fb5bfc0d71..caf1825139 100644
--- a/actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java
@@ -13,16 +13,15 @@
 
 package org.apache.pekko.japi.pf;
 
+import static org.junit.Assert.*;
+
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Test;
+import org.apache.pekko.actor.AbstractActor.Receive;
 import org.junit.Before;
+import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import org.apache.pekko.actor.AbstractActor.Receive;
-
-import static org.junit.Assert.*;
-
 @SuppressWarnings("serial")
 public class ReceiveBuilderTest extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java b/actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java
index 081bceb6b6..028d851575 100644
--- a/actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.pattern;
 
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiFunction;
 import org.apache.pekko.actor.*;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
@@ -23,14 +30,6 @@ import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.concurrent.Await;
 
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.BiFunction;
-import java.time.Duration;
-
-import static org.junit.Assert.assertEquals;
-
 public class CircuitBreakerTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java b/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
index 3b95d0190b..3add8038be 100644
--- a/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
@@ -13,13 +13,22 @@
 
 package org.apache.pekko.pattern;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.pekko.pattern.Patterns.ask;
+import static org.apache.pekko.pattern.Patterns.pipe;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pekko.actor.*;
 import org.apache.pekko.dispatch.Futures;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
 import org.apache.pekko.testkit.TestProbe;
 import org.apache.pekko.util.Timeout;
-import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
@@ -28,17 +37,6 @@ import scala.concurrent.ExecutionContext;
 import scala.concurrent.Future;
 import scala.concurrent.duration.FiniteDuration;
 
-import java.util.Arrays;
-import java.util.concurrent.*;
-import java.time.Duration;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.apache.pekko.pattern.Patterns.ask;
-import static org.apache.pekko.pattern.Patterns.pipe;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /** Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com> */
 public class PatternsTest extends JUnitSuite {
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java b/actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java
index 73e5191d95..c88f93a5f7 100644
--- a/actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.pattern;
 
+import static org.apache.pekko.pattern.Patterns.askWithStatus;
+import static org.junit.Assert.*;
+
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
@@ -23,15 +30,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.pekko.pattern.Patterns.askWithStatus;
-
-import static org.junit.Assert.*;
-
 public class StatusReplyTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java b/actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java
index a5e0be6416..c2cb770f82 100644
--- a/actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java
@@ -13,11 +13,11 @@
 
 package org.apache.pekko.util;
 
+import static junit.framework.TestCase.assertEquals;
+
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static junit.framework.TestCase.assertEquals;
-
 public class ByteStringTest extends JUnitSuite {
 
   @Test
diff --git a/actor-tests/src/test/java/org/apache/pekko/util/JavaConverterScala3InlineTest.java b/actor-tests/src/test/java/org/apache/pekko/util/JavaConverterScala3InlineTest.java
index 02e4cd9848..5af2cd6a6a 100644
--- a/actor-tests/src/test/java/org/apache/pekko/util/JavaConverterScala3InlineTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/util/JavaConverterScala3InlineTest.java
@@ -20,7 +20,6 @@ package org.apache.pekko.util;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-
 import scala.Option;
 import scala.concurrent.Future;
 
diff --git a/actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java b/actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java
index ec16a1a7ed..0f0f678e20 100644
--- a/actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java
+++ b/actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java
@@ -13,12 +13,12 @@
 
 package org.apache.pekko.util;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.concurrent.duration.Duration;
 
-import static org.junit.Assert.assertTrue;
-
 public class JavaDuration extends JUnitSuite {
 
   @Test
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java
index 3421855c79..309444fd5c 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java
@@ -14,6 +14,11 @@
 package jdocs.org.apache.pekko.typed;
 
 // #behavior
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
@@ -21,12 +26,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
 public class Aggregator<Reply, Aggregate> extends AbstractBehavior<Aggregator.Command> {
 
   interface Command {}
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
index 7cbe7ddf2a..d977c0cb71 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
@@ -13,6 +13,19 @@
 
 package jdocs.org.apache.pekko.typed;
 
+import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.Hotel1;
+import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.Hotel2;
+import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.HotelCustomer;
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -27,20 +40,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.math.BigDecimal;
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.HotelCustomer;
-import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.Hotel1;
-import static jdocs.org.apache.pekko.typed.AggregatorTest.IllustrateUsage.Hotel2;
-import static org.junit.Assert.assertEquals;
-
 public class AggregatorTest extends JUnitSuite {
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
 
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java
index 9154a2c03b..91ecfe832a 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java
@@ -13,6 +13,10 @@
 
 package jdocs.org.apache.pekko.typed;
 
+import static jdocs.org.apache.pekko.typed.BubblingSample.Boss;
+import static jdocs.org.apache.pekko.typed.BubblingSample.Protocol;
+
+import java.time.Duration;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -22,11 +26,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-
-import static jdocs.org.apache.pekko.typed.BubblingSample.Boss;
-import static jdocs.org.apache.pekko.typed.BubblingSample.Protocol;
-
 public class BubblingSampleTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java
index df8b672810..8cb3adfab0 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java
@@ -14,8 +14,8 @@
 package jdocs.org.apache.pekko.typed;
 
 import org.apache.pekko.actor.typed.Behavior;
-import org.apache.pekko.actor.typed.javadsl.*;
 import org.apache.pekko.actor.typed.DispatcherSelector;
+import org.apache.pekko.actor.typed.javadsl.*;
 
 public class DispatchersDocTest {
 
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java
index 37aa298de3..fa57ff5052 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java
@@ -13,15 +13,14 @@
 
 package jdocs.org.apache.pekko.typed;
 
-import org.apache.pekko.actor.typed.ActorRef;
-import org.apache.pekko.actor.typed.Behavior;
-import org.apache.pekko.actor.typed.javadsl.Behaviors;
-
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
 
 interface FSMDocTest {
 
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
index 6db6677fa5..c73eceeb77 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
@@ -13,29 +13,28 @@
 
 package jdocs.org.apache.pekko.typed;
 
+import static jdocs.org.apache.pekko.typed.InteractionPatternsTest.Samples.*;
+import static org.junit.Assert.assertEquals;
+
+import java.net.URI;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.*;
-import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.net.URI;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static jdocs.org.apache.pekko.typed.InteractionPatternsTest.Samples.*;
-import static org.junit.Assert.assertEquals;
-
 public class InteractionPatternsTest extends JUnitSuite {
 
   interface Samples {
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java
index 9d6b64c1e8..4906d0d045 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java
@@ -13,6 +13,7 @@
 
 package jdocs.org.apache.pekko.typed;
 
+import com.typesafe.config.ConfigFactory;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -22,7 +23,6 @@ import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.Dispatchers;
 import org.apache.pekko.actor.typed.MailboxSelector;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
index d52c1a7ab9..057bae5210 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
@@ -14,13 +14,13 @@
 package jdocs.org.apache.pekko.typed;
 
 // #import
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.StashBuffer;
-import java.util.concurrent.CompletionStage;
 
 // #import
 
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java
index 629de96884..e2d0b88c03 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java
@@ -13,6 +13,11 @@
 
 package jdocs.org.apache.pekko.typed;
 
+import static jdocs.org.apache.pekko.typed.StashDocSample.DB;
+import static jdocs.org.apache.pekko.typed.StashDocSample.DataAccess;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -23,12 +28,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-import static jdocs.org.apache.pekko.typed.StashDocSample.DB;
-import static jdocs.org.apache.pekko.typed.StashDocSample.DataAccess;
-
 public class StashDocTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java
index 816c2dda17..d6a2b56840 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java
@@ -14,6 +14,8 @@
 package jdocs.org.apache.pekko.typed;
 
 // #behavior
+import java.time.Duration;
+import java.util.function.BiFunction;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
@@ -22,9 +24,6 @@ import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
 
-import java.time.Duration;
-import java.util.function.BiFunction;
-
 public class TailChopping<Reply> extends AbstractBehavior<TailChopping.Command> {
 
   interface Command {}
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java
index 46b2b4840a..9ecfe34dd3 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java
@@ -13,14 +13,13 @@
 
 package jdocs.org.apache.pekko.typed.extensions;
 
+import docs.org.apache.pekko.typed.extensions.DatabasePool;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.Extension;
 import org.apache.pekko.actor.typed.ExtensionId;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
-import docs.org.apache.pekko.typed.extensions.DatabasePool;
-
-import java.util.concurrent.CompletionStage;
 
 interface ExtensionDocTest {
 
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java
index 2c9991d84a..cd911b3f82 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java
@@ -14,6 +14,8 @@
 package jdocs.org.apache.pekko.typed.fromclassic;
 
 // #hello-world-actor
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
@@ -21,9 +23,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.util.HashMap;
-import java.util.Map;
-
 // #hello-world-actor
 
 interface TypedSample {
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java
index cedfeefd19..90d0ac326e 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java
@@ -13,11 +13,10 @@
 
 package jdocs.org.apache.pekko.typed.supervision;
 
+import java.time.Duration;
 import org.apache.pekko.actor.typed.*;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 
-import java.time.Duration;
-
 public class SupervisionCompileOnlyTest {
   // #wrap
   public static class Counter {
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java
index 28e024a288..8460885881 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java
@@ -13,16 +13,15 @@
 
 package org.apache.pekko.actor.typed;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.Assert.assertFalse;
+
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.CompletionStage;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertFalse;
-
 public class ActorSystemTest extends JUnitSuite {
 
   @Test
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java
index 4303015d59..e3cf8e765e 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java
@@ -13,19 +13,18 @@
 
 package org.apache.pekko.actor.typed;
 
-import org.apache.pekko.actor.setup.ActorSystemSetup;
-import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import static junit.framework.TestCase.assertSame;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import java.util.function.Function;
+import org.apache.pekko.actor.setup.ActorSystemSetup;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.function.Function;
-
-import static junit.framework.TestCase.assertSame;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class ExtensionsTest extends JUnitSuite {
 
   public static class MyExtImpl implements Extension {}
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
index 847ed5aba5..24d3de15f6 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
@@ -13,15 +13,14 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
-import org.apache.pekko.actor.typed.*;
-import org.apache.pekko.actor.typed.TypedActorContext;
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
-
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.*;
+import org.apache.pekko.actor.typed.*;
+import org.apache.pekko.actor.typed.TypedActorContext;
 
 @SuppressWarnings("unused")
 public class ActorCompile {
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java
index a2778dca28..98a40ed362 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java
@@ -13,21 +13,20 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import java.time.Duration;
 import org.apache.pekko.actor.testkit.typed.TestException;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.pattern.StatusReply;
 import org.apache.pekko.testkit.PekkoSpec;
-import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
-import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-
 public class ActorContextAskTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java
index c9c2564434..d09777a0f8 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.junit.Assert.*;
+
+import com.typesafe.config.ConfigFactory;
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -20,19 +27,11 @@ import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.Props;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.*;
-
 public final class ActorContextPipeToSelfTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java
index 31324ce6d6..b5c3ff41a3 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java
@@ -13,6 +13,10 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import com.typesafe.config.ConfigFactory;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,17 +24,12 @@ import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.japi.pf.PFBuilder;
 import org.apache.pekko.testkit.CustomEventFilter;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.concurrent.duration.FiniteDuration;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 public class ActorLoggingTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
index 3e05294bab..cda5e2c179 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
@@ -13,27 +13,26 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
-import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
-import org.apache.pekko.actor.typed.internal.adapter.SchedulerAdapter;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.scalatestplus.junit.JUnitSuite;
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import java.time.Duration;
-
 import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-import org.apache.pekko.testkit.PekkoSpec;
+import org.apache.pekko.actor.SupervisorStrategy;
+import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.Signal;
 import org.apache.pekko.actor.typed.Terminated;
+import org.apache.pekko.actor.typed.internal.adapter.SchedulerAdapter;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.apache.pekko.testkit.PekkoSpec;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import org.apache.pekko.actor.SupervisorStrategy;
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.scalatestplus.junit.JUnitSuite;
 
 public class AdapterTest extends JUnitSuite {
 
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java
index 6e6d3ebf53..d6148fa3b2 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java
@@ -13,24 +13,22 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.same;
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.stopped;
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.Terminated;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import org.apache.pekko.actor.typed.Behavior;
-import org.apache.pekko.actor.typed.Terminated;
-import org.apache.pekko.actor.typed.ActorRef;
-
-import java.util.ArrayList;
-
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.same;
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.stopped;
-import static org.junit.Assert.assertEquals;
-
 /** Test creating [[Behavior]]s using [[BehaviorBuilder]] */
 public class BehaviorBuilderTest extends JUnitSuite {
 
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java
index 552598cf55..3ab3bc5b23 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java
@@ -13,20 +13,19 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.same;
+
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import org.apache.pekko.actor.typed.Behavior;
-
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.same;
-
 /** Test creating [[MutableActor]]s using [[ReceiveBuilder]] */
 public class ReceiveBuilderTest extends JUnitSuite {
 
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java
index 914f35a0bb..4f2d1e5988 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java
@@ -13,8 +13,10 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import java.util.List;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -27,9 +29,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class RoutersTest extends JUnitSuite {
 
   @ClassRule
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java
index c5d61a8839..87d5b195c2 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java
@@ -13,6 +13,10 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.function.Function;
 import org.apache.pekko.actor.testkit.typed.internal.StubbedActorContext;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.typed.internal.StashBufferImpl;
@@ -20,11 +24,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.function.Function;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class StashBufferTest extends JUnitSuite {
 
   @Rule public final LogCapturing logCapturing = new LogCapturing();
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java
index 07d9734f96..a2f16b989e 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java
@@ -13,23 +13,20 @@
 
 package org.apache.pekko.actor.typed.javadsl;
 
+import static org.apache.pekko.Done.done;
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.*;
+
+import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
+import org.apache.pekko.actor.typed.*;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.scalatestplus.junit.JUnitSuite;
 import org.junit.Test;
-
-import org.apache.pekko.actor.typed.*;
-
-import java.time.Duration;
-
-import static org.apache.pekko.Done.done;
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.*;
+import org.scalatestplus.junit.JUnitSuite;
 
 public class WatchTest extends JUnitSuite {
 
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java
index 237c78af41..0b3dc86e94 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java
@@ -13,15 +13,14 @@
 
 package org.apache.pekko.actor.typed.receptionist;
 
+import java.time.Duration;
+import java.util.Set;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.javadsl.AskPattern;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 
-import java.time.Duration;
-import java.util.Set;
-import java.util.concurrent.CompletionStage;
-
 public class ReceptionistApiTest {
 
   public void compileOnlyApiTest() {
diff --git a/actor/src/main/java/org/apache/pekko/io/ByteBufferCleaner.java b/actor/src/main/java/org/apache/pekko/io/ByteBufferCleaner.java
index c49394640b..729ff5a42e 100644
--- a/actor/src/main/java/org/apache/pekko/io/ByteBufferCleaner.java
+++ b/actor/src/main/java/org/apache/pekko/io/ByteBufferCleaner.java
@@ -17,14 +17,14 @@
 
 package org.apache.pekko.io;
 
+import static java.lang.invoke.MethodType.methodType;
+
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
-import static java.lang.invoke.MethodType.methodType;
-
 /**
  * Cleans a direct {@link ByteBuffer}. Without manual intervention, direct ByteBuffers will be
  * cleaned eventually upon garbage collection. However, this should not be relied upon since it may
diff --git a/actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
index 6a4a685925..3929e856e2 100644
--- a/actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
+++ b/actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
@@ -13,9 +13,9 @@
 
 package org.apache.pekko.japi.pf;
 
+import java.util.List;
 import org.apache.pekko.actor.FSM;
 import scala.PartialFunction;
-import java.util.List;
 
 /**
  * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#whenUnhandled}.
diff --git a/actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java
index 0bd831c643..4ad26aa570 100644
--- a/actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java
+++ b/actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java
@@ -14,8 +14,8 @@
 package org.apache.pekko.japi.pf;
 
 import scala.PartialFunction;
-import scala.runtime.BoxedUnit;
 import scala.Tuple2;
+import scala.runtime.BoxedUnit;
 
 /**
  * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#onTransition}.
diff --git a/actor/src/main/java/org/apache/pekko/util/Unsafe.java b/actor/src/main/java/org/apache/pekko/util/Unsafe.java
index c26ea4d9da..4479e7552d 100644
--- a/actor/src/main/java/org/apache/pekko/util/Unsafe.java
+++ b/actor/src/main/java/org/apache/pekko/util/Unsafe.java
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.util;
 
-import org.apache.pekko.annotation.InternalApi;
-
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import org.apache.pekko.annotation.InternalApi;
 
 /** INTERNAL API */
 @InternalApi
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
index 9c7be244d0..7bd054a44b 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
@@ -13,6 +13,18 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity;
+import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity.*;
+import static org.apache.pekko.Done.done;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -24,24 +36,11 @@ import org.apache.pekko.cluster.typed.Cluster;
 import org.apache.pekko.cluster.typed.Join;
 import org.apache.pekko.pattern.StatusReply;
 import org.apache.pekko.persistence.typed.PersistenceId;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.math.BigDecimal;
-import java.time.Duration;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.pekko.Done.done;
-import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity;
-import static jdocs.org.apache.pekko.cluster.sharding.typed.AccountExampleWithEventHandlersInState.AccountEntity.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class AccountExampleTest extends JUnitSuite {
 
   public static final Config config =
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
index dbc8eaf892..eae87f3278 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.math.BigDecimal;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
@@ -25,9 +27,6 @@ import org.apache.pekko.persistence.typed.javadsl.EventHandlerBuilder;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
 import org.apache.pekko.persistence.typed.javadsl.ReplyEffect;
 import org.apache.pekko.serialization.jackson.CborSerializable;
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-import java.math.BigDecimal;
 
 /**
  * Bank account example illustrating: - different state classes representing the lifecycle of the
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
index 92d34dbaf6..1e28f2e09c 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.math.BigDecimal;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
@@ -25,9 +27,6 @@ import org.apache.pekko.persistence.typed.javadsl.EventHandlerBuilder;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
 import org.apache.pekko.persistence.typed.javadsl.ReplyEffect;
 import org.apache.pekko.serialization.jackson.CborSerializable;
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-import java.math.BigDecimal;
 
 /**
  * Bank account example illustrating: - different state classes representing the lifecycle of the
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
index 7ee9f95527..97247e8d99 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.math.BigDecimal;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
@@ -23,9 +25,6 @@ import org.apache.pekko.persistence.typed.state.javadsl.CommandHandlerWithReplyB
 import org.apache.pekko.persistence.typed.state.javadsl.DurableStateBehaviorWithEnforcedReplies;
 import org.apache.pekko.persistence.typed.state.javadsl.ReplyEffect;
 import org.apache.pekko.serialization.jackson.CborSerializable;
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-import java.math.BigDecimal;
 
 /**
  * This bank account example illustrates the following: - different state classes representing the
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
index b8d8336601..5f6fe06c7f 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.math.BigDecimal;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
@@ -25,9 +27,6 @@ import org.apache.pekko.persistence.typed.javadsl.EventHandlerBuilder;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehaviorWithEnforcedReplies;
 import org.apache.pekko.persistence.typed.javadsl.ReplyEffect;
 import org.apache.pekko.serialization.jackson.CborSerializable;
-import com.fasterxml.jackson.annotation.JsonCreator;
-
-import java.math.BigDecimal;
 
 /**
  * Bank account example illustrating: - different state classes representing the lifecycle of the
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
index 2ae915835a..fd6947841b 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
@@ -13,6 +13,10 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import static jdocs.org.apache.pekko.cluster.sharding.typed.ShardingCompileOnlyTest.Counter;
+
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.Address;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -25,11 +29,6 @@ import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
 import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
 import org.apache.pekko.cluster.sharding.typed.javadsl.EntityTypeKey;
 
-import java.time.Duration;
-import java.util.concurrent.CompletionStage;
-
-import static jdocs.org.apache.pekko.cluster.sharding.typed.ShardingCompileOnlyTest.Counter;
-
 public class ExternalShardAllocationCompileOnlyTest {
 
   void example() {
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
index 1956740303..7c0c0b50ba 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
@@ -13,25 +13,25 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import static jdocs.org.apache.pekko.cluster.sharding.typed.HelloWorldPersistentEntityExample.*;
+import static org.junit.Assert.assertEquals;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.cluster.sharding.typed.javadsl.ClusterSharding;
-import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
 import org.apache.pekko.cluster.sharding.typed.javadsl.Entity;
+import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
 import org.apache.pekko.cluster.typed.Cluster;
 import org.apache.pekko.cluster.typed.Join;
 import org.apache.pekko.persistence.typed.PersistenceId;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static jdocs.org.apache.pekko.cluster.sharding.typed.HelloWorldPersistentEntityExample.*;
-import static org.junit.Assert.assertEquals;
-
 public class HelloWorldEventSourcedEntityExampleTest extends JUnitSuite {
 
   public static final Config config =
diff --git a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
index 823a67ba0f..9c28a27427 100644
--- a/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
+++ b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
@@ -13,6 +13,7 @@
 
 package jdocs.org.apache.pekko.cluster.sharding.typed;
 
+import java.util.*;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.cluster.sharding.typed.*;
@@ -21,8 +22,6 @@ import org.apache.pekko.cluster.sharding.typed.javadsl.EntityRef;
 import org.apache.pekko.persistence.typed.ReplicaId;
 import org.apache.pekko.persistence.typed.ReplicationId;
 
-import java.util.*;
-
 public class ReplicatedShardingCompileOnlySpec {
 
   private static ActorSystem<?> system = null;
diff --git a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
index 25599dd4d1..b7a5b4e779 100644
--- a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
+++ b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.cluster.sharding.typed;
 
+import static org.apache.pekko.cluster.sharding.typed.ReplicatedShardingTest.ProxyActor.ALL_REPLICAS;
+import static org.junit.Assert.assertEquals;
+
+import com.typesafe.config.ConfigFactory;
+import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -32,19 +39,11 @@ import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitRead
 import org.apache.pekko.persistence.typed.ReplicaId;
 import org.apache.pekko.persistence.typed.ReplicationId;
 import org.apache.pekko.persistence.typed.javadsl.*;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Collectors;
-
-import static org.apache.pekko.cluster.sharding.typed.ReplicatedShardingTest.ProxyActor.ALL_REPLICAS;
-import static org.junit.Assert.assertEquals;
-
 public class ReplicatedShardingTest extends JUnitSuite {
 
   static class MyReplicatedStringSet
diff --git a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
index 31b731b43a..12c9c82914 100644
--- a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
+++ b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
@@ -13,6 +13,9 @@
 
 package org.apache.pekko.cluster.sharding.typed.javadsl;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -25,15 +28,11 @@ import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
 import org.apache.pekko.persistence.typed.javadsl.Effect;
 import org.apache.pekko.persistence.typed.javadsl.EventHandler;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.CompletionStage;
-
 public class ClusterShardingPersistenceTest extends JUnitSuite {
 
   public static final Config config =
diff --git a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
index 37330db399..d8c952d048 100644
--- a/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
+++ b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
@@ -13,15 +13,14 @@
 
 package org.apache.pekko.cluster.sharding.typed.javadsl;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.cluster.sharding.typed.ShardedDaemonProcessSettings;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
 public class ShardedDaemonProcessCompileOnlyTest {
 
   interface Command {}
diff --git a/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
index 51ea1fd47d..4def9722fb 100644
--- a/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
+++ b/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
@@ -13,15 +13,14 @@
 
 package org.apache.pekko.cluster.client;
 
-import org.apache.pekko.actor.*;
 import com.typesafe.config.ConfigFactory;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.junit.ClassRule;
 import org.junit.Test;
-
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.scalatestplus.junit.JUnitSuite;
 
 public class ClusterClientTest extends JUnitSuite {
diff --git a/cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
index dafbe67098..20f752e86e 100644
--- a/cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
+++ b/cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
@@ -14,18 +14,15 @@
 package org.apache.pekko.cluster.pubsub;
 
 import com.typesafe.config.ConfigFactory;
-
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.junit.ClassRule;
+import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
 public class DistributedPubSubMediatorTest extends JUnitSuite {
diff --git a/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
index 6e085442af..f8f0be0af2 100644
--- a/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
+++ b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
@@ -13,9 +13,8 @@
 
 package org.apache.pekko.cluster.singleton;
 
-import org.apache.pekko.actor.ActorSystem;
-
 import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 
 public class ClusterSingletonManagerTest {
diff --git a/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
index c4488c1361..87f3d523ee 100644
--- a/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
+++ b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
@@ -15,9 +15,9 @@ package org.apache.pekko.cluster.singleton;
 
 import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.cluster.singleton.TestSingletonMessages.*;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
-import org.apache.pekko.cluster.singleton.TestSingletonMessages.*;
 
 public class Consumer extends AbstractActor {
 
diff --git a/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
index 51b57039f8..d703c1781a 100644
--- a/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
+++ b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
@@ -13,6 +13,12 @@
 
 package jdocs.org.apache.pekko.cluster.ddata.typed.javadsl;
 
+import static jdocs.org.apache.pekko.cluster.ddata.typed.javadsl.ReplicatorDocSample.Counter;
+import static org.junit.Assert.assertEquals;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.time.Duration;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -22,18 +28,11 @@ import org.apache.pekko.cluster.ddata.GCounterKey;
 import org.apache.pekko.cluster.ddata.Key;
 import org.apache.pekko.cluster.ddata.typed.javadsl.DistributedData;
 import org.apache.pekko.cluster.ddata.typed.javadsl.Replicator;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-
-import static jdocs.org.apache.pekko.cluster.ddata.typed.javadsl.ReplicatorDocSample.Counter;
-import static org.junit.Assert.assertEquals;
-
 public class ReplicatorDocTest extends JUnitSuite {
 
   static Config config =
diff --git a/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
index c31de4e1e6..49c45871c0 100644
--- a/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
+++ b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
@@ -13,14 +13,13 @@
 
 package jdocs.org.apache.pekko.cluster.typed;
 
+import java.nio.charset.StandardCharsets;
 import org.apache.pekko.actor.ExtendedActorSystem;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorRefResolver;
 import org.apache.pekko.actor.typed.javadsl.Adapter;
 import org.apache.pekko.serialization.SerializerWithStringManifest;
 
-import java.nio.charset.StandardCharsets;
-
 public class PingSerializerExampleTest {
 
   public class Pong {}
diff --git a/cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java b/cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
index 76f0c7d268..47cb24450f 100644
--- a/cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
+++ b/cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
@@ -13,16 +13,15 @@
 
 package org.apache.pekko.cluster.typed;
 
-import org.apache.pekko.cluster.ClusterEvent;
-import org.apache.pekko.actor.typed.ActorSystem;
-import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import java.util.concurrent.TimeUnit;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.cluster.ClusterEvent;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.TimeUnit;
-
 public class ClusterApiTest extends JUnitSuite {
 
   @Test
diff --git a/cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java b/cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
index 61ff311d69..a0322f6525 100644
--- a/cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
+++ b/cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.cluster;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.actor.Address;
-
 import java.util.Collections;
 import java.util.List;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Address;
 
 // Doc code, compile only
 @SuppressWarnings("ConstantConditions")
diff --git a/coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java b/coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
index af2a9b2778..c12f843d97 100644
--- a/coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
+++ b/coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
@@ -13,6 +13,8 @@
 
 package org.apache.pekko.coordination.lease.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.coordination.lease.scaladsl.LeaseProviderSpec;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
@@ -20,8 +22,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-
 public class LeaseProviderTest {
   @Rule
   public PekkoJUnitActorSystemResource actorSystemResource =
diff --git a/discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java b/discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
index c2c8c7d19f..02a28643dd 100644
--- a/discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
+++ b/discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
@@ -13,14 +13,13 @@
 
 package jdoc.org.apache.pekko.discovery;
 
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.discovery.Lookup;
 import org.apache.pekko.discovery.Discovery;
+import org.apache.pekko.discovery.Lookup;
 import org.apache.pekko.discovery.ServiceDiscovery;
 
-import java.time.Duration;
-import java.util.concurrent.CompletionStage;
-
 public class CompileOnlyTest {
   public static void example() {
     // #loading
diff --git a/docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java b/docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
index cb00bc7a2b..366767d38d 100644
--- a/docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
+++ b/docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
@@ -15,32 +15,29 @@ package jdocs.actor;
 
 // #all
 // #imports
+import static jdocs.actor.FaultHandlingDocSample.CounterApi.*;
+import static jdocs.actor.FaultHandlingDocSample.CounterServiceApi.*;
+import static jdocs.actor.FaultHandlingDocSample.StorageApi.*;
+import static jdocs.actor.FaultHandlingDocSample.WorkerApi.*;
+import static org.apache.pekko.actor.SupervisorStrategy.escalate;
+import static org.apache.pekko.actor.SupervisorStrategy.restart;
+import static org.apache.pekko.actor.SupervisorStrategy.stop;
+import static org.apache.pekko.japi.Util.classTag;
+import static org.apache.pekko.pattern.Patterns.pipe;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.time.Duration;
-
 import org.apache.pekko.actor.*;
 import org.apache.pekko.dispatch.Mapper;
 import org.apache.pekko.event.LoggingReceive;
 import org.apache.pekko.japi.pf.DeciderBuilder;
 import org.apache.pekko.pattern.Patterns;
 import org.apache.pekko.util.Timeout;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-
-import static org.apache.pekko.japi.Util.classTag;
-import static org.apache.pekko.actor.SupervisorStrategy.restart;
-import static org.apache.pekko.actor.SupervisorStrategy.stop;
-import static org.apache.pekko.actor.SupervisorStrategy.escalate;
-
-import static org.apache.pekko.pattern.Patterns.pipe;
-
-import static jdocs.actor.FaultHandlingDocSample.WorkerApi.*;
-import static jdocs.actor.FaultHandlingDocSample.CounterServiceApi.*;
-import static jdocs.actor.FaultHandlingDocSample.CounterApi.*;
-import static jdocs.actor.FaultHandlingDocSample.StorageApi.*;
 
 // #imports
 
diff --git a/docs/src/test/java/jdocs/actor/InitializationDocTest.java b/docs/src/test/java/jdocs/actor/InitializationDocTest.java
index 259c3d75c4..94cd27d4a1 100644
--- a/docs/src/test/java/jdocs/actor/InitializationDocTest.java
+++ b/docs/src/test/java/jdocs/actor/InitializationDocTest.java
@@ -13,20 +13,19 @@
 
 package jdocs.actor;
 
+import java.time.Duration;
+import java.util.Optional;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.japi.pf.FI;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.Optional;
-
 public class InitializationDocTest extends AbstractJavaTest {
 
   static ActorSystem system = null;
diff --git a/docs/src/test/java/jdocs/actor/MyStoppingActor.java b/docs/src/test/java/jdocs/actor/MyStoppingActor.java
index 5587054829..8f9247c524 100644
--- a/docs/src/test/java/jdocs/actor/MyStoppingActor.java
+++ b/docs/src/test/java/jdocs/actor/MyStoppingActor.java
@@ -14,8 +14,8 @@
 package jdocs.actor;
 
 // #my-stopping-actor
-import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
 
 public class MyStoppingActor extends AbstractActor {
 
diff --git a/docs/src/test/java/jdocs/actor/SampleActorTest.java b/docs/src/test/java/jdocs/actor/SampleActorTest.java
index 6a163e8802..127c2c136c 100644
--- a/docs/src/test/java/jdocs/actor/SampleActorTest.java
+++ b/docs/src/test/java/jdocs/actor/SampleActorTest.java
@@ -13,17 +13,17 @@
 
 package jdocs.actor;
 
+import static org.junit.Assert.*;
+
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class SampleActorTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/actor/fsm/BuncherTest.java b/docs/src/test/java/jdocs/actor/fsm/BuncherTest.java
index 62087f3ab6..c0f021cb5d 100644
--- a/docs/src/test/java/jdocs/actor/fsm/BuncherTest.java
+++ b/docs/src/test/java/jdocs/actor/fsm/BuncherTest.java
@@ -13,20 +13,20 @@
 
 package jdocs.actor.fsm;
 
+import static jdocs.actor.fsm.Events.Batch;
+import static jdocs.actor.fsm.Events.Flush.Flush;
+import static jdocs.actor.fsm.Events.Queue;
+import static jdocs.actor.fsm.Events.SetTarget;
+
+import java.util.LinkedList;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import java.util.LinkedList;
-
-import static jdocs.actor.fsm.Events.Batch;
-import static jdocs.actor.fsm.Events.Queue;
-import static jdocs.actor.fsm.Events.SetTarget;
-import static jdocs.actor.fsm.Events.Flush.Flush;
 
 // #test-code
 public class BuncherTest extends AbstractJavaTest {
diff --git a/docs/src/test/java/jdocs/actor/fsm/Events.java b/docs/src/test/java/jdocs/actor/fsm/Events.java
index eda3989b43..13a52081c4 100644
--- a/docs/src/test/java/jdocs/actor/fsm/Events.java
+++ b/docs/src/test/java/jdocs/actor/fsm/Events.java
@@ -13,8 +13,8 @@
 
 package jdocs.actor.fsm;
 
-import org.apache.pekko.actor.ActorRef;
 import java.util.List;
+import org.apache.pekko.actor.ActorRef;
 
 public class Events {
 
diff --git a/docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java b/docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
index c076e95c1e..cc1959eccd 100644
--- a/docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
+++ b/docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
@@ -13,20 +13,18 @@
 
 package jdocs.actor.fsm;
 
-import org.apache.pekko.actor.*;
+import static jdocs.actor.fsm.FSMDocTest.Messages.*;
+import static jdocs.actor.fsm.FSMDocTest.StateType.*;
+import static org.junit.Assert.*;
+
+import java.time.Duration;
 import jdocs.AbstractJavaTest;
+import org.apache.pekko.actor.*;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
-import static jdocs.actor.fsm.FSMDocTest.StateType.*;
-import static jdocs.actor.fsm.FSMDocTest.Messages.*;
-
-import java.time.Duration;
-
 public class FSMDocTest extends AbstractJavaTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java b/docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
index 1fba21c128..c72111e184 100644
--- a/docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
+++ b/docs/src/test/java/jdocs/actor/io/dns/DnsCompileOnlyDocTest.java
@@ -13,18 +13,16 @@
 
 package jdocs.actor.io.dns;
 
+import static org.apache.pekko.pattern.Patterns.ask;
+
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.io.Dns;
 import org.apache.pekko.io.dns.DnsProtocol;
-
-import static org.apache.pekko.pattern.Patterns.ask;
-
 import scala.Option;
 
-import java.time.Duration;
-import java.util.concurrent.CompletionStage;
-
 public class DnsCompileOnlyDocTest {
   public static void example() {
     ActorSystem system = ActorSystem.create();
diff --git a/docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java b/docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java
index 5fccb6f0ed..a2a049b7d7 100644
--- a/docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java
+++ b/docs/src/test/java/jdocs/actor/typed/DispatcherDocTest.java
@@ -13,10 +13,9 @@
 
 package jdocs.actor.typed;
 
-import scala.concurrent.ExecutionContextExecutor;
-
 import org.apache.pekko.actor.typed.*;
 import org.apache.pekko.actor.typed.javadsl.*;
+import scala.concurrent.ExecutionContextExecutor;
 
 @SuppressWarnings("unused")
 public class DispatcherDocTest {
diff --git a/docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java b/docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java
index db3ce16453..d9586137cd 100644
--- a/docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java
+++ b/docs/src/test/java/jdocs/actor/typed/SeparateDispatcherCompletionStageActor.java
@@ -15,7 +15,6 @@ package jdocs.actor.typed;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
-
 import org.apache.pekko.actor.typed.*;
 import org.apache.pekko.actor.typed.javadsl.*;
 
diff --git a/docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java b/docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java
index fdaceea957..427776810a 100644
--- a/docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java
+++ b/docs/src/test/java/jdocs/actor/typed/SharedMutableStateDocTest.java
@@ -13,18 +13,17 @@
 
 package jdocs.actor.typed;
 
-import org.apache.pekko.actor.typed.ActorRef;
-import org.apache.pekko.actor.typed.Behavior;
-import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
-import org.apache.pekko.actor.typed.javadsl.ActorContext;
-import org.apache.pekko.actor.typed.javadsl.Receive;
-import org.apache.pekko.actor.typed.javadsl.AskPattern;
-
 import java.time.Duration;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
+import org.apache.pekko.actor.typed.javadsl.Receive;
 
 interface SharedMutableStateDocTest {
 
diff --git a/docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java b/docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
index c7a3521883..578fe2ec65 100644
--- a/docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
+++ b/docs/src/test/java/jdocs/circuitbreaker/DangerousJavaActor.java
@@ -15,15 +15,14 @@ package jdocs.circuitbreaker;
 
 // #imports1
 
-import org.apache.pekko.actor.AbstractActor;
-import org.apache.pekko.event.LoggingAdapter;
-import java.time.Duration;
-import org.apache.pekko.pattern.CircuitBreaker;
-import org.apache.pekko.event.Logging;
-
 import static org.apache.pekko.pattern.Patterns.pipe;
 
+import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.pattern.CircuitBreaker;
 
 // #imports1
 
diff --git a/docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java b/docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java
index 9312a543a1..ce5f56521a 100644
--- a/docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java
+++ b/docs/src/test/java/jdocs/circuitbreaker/EvenNoFailureJavaExample.java
@@ -13,12 +13,11 @@
 
 package jdocs.circuitbreaker;
 
-import org.apache.pekko.actor.AbstractActor;
-import org.apache.pekko.pattern.CircuitBreaker;
 import java.time.Duration;
-
 import java.util.Optional;
 import java.util.function.BiFunction;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.pattern.CircuitBreaker;
 
 public class EvenNoFailureJavaExample extends AbstractActor {
   // #even-no-as-failure
diff --git a/docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java b/docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java
index 7ccf70ed54..d1a7238fd1 100644
--- a/docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java
+++ b/docs/src/test/java/jdocs/circuitbreaker/TellPatternJavaActor.java
@@ -13,13 +13,13 @@
 
 package jdocs.circuitbreaker;
 
+import java.time.Duration;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ReceiveTimeout;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.pattern.CircuitBreaker;
-import java.time.Duration;
 
 public class TellPatternJavaActor extends AbstractActor {
 
diff --git a/docs/src/test/java/jdocs/cluster/FactorialBackend.java b/docs/src/test/java/jdocs/cluster/FactorialBackend.java
index ab3ac7864b..ab69b774a3 100644
--- a/docs/src/test/java/jdocs/cluster/FactorialBackend.java
+++ b/docs/src/test/java/jdocs/cluster/FactorialBackend.java
@@ -13,11 +13,11 @@
 
 package jdocs.cluster;
 
+import static org.apache.pekko.pattern.Patterns.pipe;
+
 import java.math.BigInteger;
 import java.util.concurrent.CompletableFuture;
-
 import org.apache.pekko.actor.AbstractActor;
-import static org.apache.pekko.pattern.Patterns.pipe;
 
 // #backend
 public class FactorialBackend extends AbstractActor {
diff --git a/docs/src/test/java/jdocs/cluster/FactorialFrontend.java b/docs/src/test/java/jdocs/cluster/FactorialFrontend.java
index 3c4b98710e..7489d91ced 100644
--- a/docs/src/test/java/jdocs/cluster/FactorialFrontend.java
+++ b/docs/src/test/java/jdocs/cluster/FactorialFrontend.java
@@ -13,13 +13,15 @@
 
 package jdocs.cluster;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
-import java.time.Duration;
-
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Props;
+import org.apache.pekko.actor.ReceiveTimeout;
 import org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingGroup;
 import org.apache.pekko.cluster.metrics.AdaptiveLoadBalancingPool;
 import org.apache.pekko.cluster.metrics.HeapMetricsSelector;
@@ -28,9 +30,6 @@ import org.apache.pekko.cluster.routing.ClusterRouterGroup;
 import org.apache.pekko.cluster.routing.ClusterRouterGroupSettings;
 import org.apache.pekko.cluster.routing.ClusterRouterPool;
 import org.apache.pekko.cluster.routing.ClusterRouterPoolSettings;
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.actor.ReceiveTimeout;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.routing.FromConfig;
diff --git a/docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java b/docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
index bc7612375d..19298faa75 100644
--- a/docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
+++ b/docs/src/test/java/jdocs/cluster/FactorialFrontendMain.java
@@ -13,10 +13,9 @@
 
 package jdocs.cluster;
 
-import java.util.concurrent.TimeUnit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.cluster.Cluster;
diff --git a/docs/src/test/java/jdocs/cluster/FactorialResult.java b/docs/src/test/java/jdocs/cluster/FactorialResult.java
index 3b2f06108e..eec012e604 100644
--- a/docs/src/test/java/jdocs/cluster/FactorialResult.java
+++ b/docs/src/test/java/jdocs/cluster/FactorialResult.java
@@ -13,8 +13,8 @@
 
 package jdocs.cluster;
 
-import java.math.BigInteger;
 import java.io.Serializable;
+import java.math.BigInteger;
 
 public class FactorialResult implements Serializable {
   private static final long serialVersionUID = 1L;
diff --git a/docs/src/test/java/jdocs/cluster/MetricsListener.java b/docs/src/test/java/jdocs/cluster/MetricsListener.java
index b3b5f55c53..71b3c41fa2 100644
--- a/docs/src/test/java/jdocs/cluster/MetricsListener.java
+++ b/docs/src/test/java/jdocs/cluster/MetricsListener.java
@@ -18,11 +18,11 @@ import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.cluster.Cluster;
 import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
 import org.apache.pekko.cluster.metrics.ClusterMetricsChanged;
+import org.apache.pekko.cluster.metrics.ClusterMetricsExtension;
 import org.apache.pekko.cluster.metrics.NodeMetrics;
 import org.apache.pekko.cluster.metrics.StandardMetrics;
-import org.apache.pekko.cluster.metrics.StandardMetrics.HeapMemory;
 import org.apache.pekko.cluster.metrics.StandardMetrics.Cpu;
-import org.apache.pekko.cluster.metrics.ClusterMetricsExtension;
+import org.apache.pekko.cluster.metrics.StandardMetrics.HeapMemory;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 
diff --git a/docs/src/test/java/jdocs/cluster/SimpleClusterListener.java b/docs/src/test/java/jdocs/cluster/SimpleClusterListener.java
index ff5cf3f26b..5b3133c5ca 100644
--- a/docs/src/test/java/jdocs/cluster/SimpleClusterListener.java
+++ b/docs/src/test/java/jdocs/cluster/SimpleClusterListener.java
@@ -17,8 +17,8 @@ import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.cluster.Cluster;
 import org.apache.pekko.cluster.ClusterEvent;
 import org.apache.pekko.cluster.ClusterEvent.MemberEvent;
-import org.apache.pekko.cluster.ClusterEvent.MemberUp;
 import org.apache.pekko.cluster.ClusterEvent.MemberRemoved;
+import org.apache.pekko.cluster.ClusterEvent.MemberUp;
 import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
diff --git a/docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java b/docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java
index fcc7327e76..53d7cd25d7 100644
--- a/docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java
+++ b/docs/src/test/java/jdocs/cluster/SimpleClusterListener2.java
@@ -17,8 +17,8 @@ import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.cluster.Cluster;
 import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
 import org.apache.pekko.cluster.ClusterEvent.MemberEvent;
-import org.apache.pekko.cluster.ClusterEvent.MemberUp;
 import org.apache.pekko.cluster.ClusterEvent.MemberRemoved;
+import org.apache.pekko.cluster.ClusterEvent.MemberUp;
 import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
diff --git a/docs/src/test/java/jdocs/cluster/StatsAggregator.java b/docs/src/test/java/jdocs/cluster/StatsAggregator.java
index c5f26b5298..2456697c6c 100644
--- a/docs/src/test/java/jdocs/cluster/StatsAggregator.java
+++ b/docs/src/test/java/jdocs/cluster/StatsAggregator.java
@@ -13,15 +13,14 @@
 
 package jdocs.cluster;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.time.Duration;
-
 import jdocs.cluster.StatsMessages.JobFailed;
 import jdocs.cluster.StatsMessages.StatsResult;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ReceiveTimeout;
-import org.apache.pekko.actor.AbstractActor;
 
 // #aggregator
 public class StatsAggregator extends AbstractActor {
diff --git a/docs/src/test/java/jdocs/cluster/StatsSampleClient.java b/docs/src/test/java/jdocs/cluster/StatsSampleClient.java
index 5a6733fd50..83715f1931 100644
--- a/docs/src/test/java/jdocs/cluster/StatsSampleClient.java
+++ b/docs/src/test/java/jdocs/cluster/StatsSampleClient.java
@@ -13,27 +13,26 @@
 
 package jdocs.cluster;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
+import java.util.concurrent.ThreadLocalRandom;
 import jdocs.cluster.StatsMessages.JobFailed;
 import jdocs.cluster.StatsMessages.StatsJob;
 import jdocs.cluster.StatsMessages.StatsResult;
-import java.util.concurrent.ThreadLocalRandom;
-import java.time.Duration;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorSelection;
 import org.apache.pekko.actor.Address;
 import org.apache.pekko.actor.Cancellable;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.cluster.Cluster;
-import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
-import org.apache.pekko.cluster.ClusterEvent.ReachableMember;
 import org.apache.pekko.cluster.ClusterEvent.CurrentClusterState;
 import org.apache.pekko.cluster.ClusterEvent.MemberEvent;
 import org.apache.pekko.cluster.ClusterEvent.MemberUp;
 import org.apache.pekko.cluster.ClusterEvent.ReachabilityEvent;
+import org.apache.pekko.cluster.ClusterEvent.ReachableMember;
+import org.apache.pekko.cluster.ClusterEvent.UnreachableMember;
 import org.apache.pekko.cluster.Member;
 import org.apache.pekko.cluster.MemberStatus;
 
diff --git a/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java b/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java
index 0ef6765ffb..bce5286615 100644
--- a/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java
+++ b/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterClientMain.java
@@ -14,7 +14,6 @@
 package jdocs.cluster;
 
 import com.typesafe.config.ConfigFactory;
-
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 
diff --git a/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java b/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java
index b0956ada96..276577e179 100644
--- a/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java
+++ b/docs/src/test/java/jdocs/cluster/StatsSampleOneMasterMain.java
@@ -15,7 +15,6 @@ package jdocs.cluster;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.PoisonPill;
 import org.apache.pekko.actor.Props;
diff --git a/docs/src/test/java/jdocs/cluster/StatsService.java b/docs/src/test/java/jdocs/cluster/StatsService.java
index f211d8a81d..909f4a2b89 100644
--- a/docs/src/test/java/jdocs/cluster/StatsService.java
+++ b/docs/src/test/java/jdocs/cluster/StatsService.java
@@ -13,24 +13,23 @@
 
 package jdocs.cluster;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import jdocs.cluster.StatsMessages.StatsJob;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Props;
 import org.apache.pekko.cluster.routing.ClusterRouterGroup;
 import org.apache.pekko.cluster.routing.ClusterRouterGroupSettings;
 import org.apache.pekko.cluster.routing.ClusterRouterPool;
 import org.apache.pekko.cluster.routing.ClusterRouterPoolSettings;
 import org.apache.pekko.routing.ConsistentHashingGroup;
 import org.apache.pekko.routing.ConsistentHashingPool;
-import jdocs.cluster.StatsMessages.StatsJob;
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.actor.Props;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.routing.ConsistentHashingRouter.ConsistentHashableEnvelope;
 import org.apache.pekko.routing.FromConfig;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 // #service
 public class StatsService extends AbstractActor {
 
diff --git a/docs/src/test/java/jdocs/cluster/StatsWorker.java b/docs/src/test/java/jdocs/cluster/StatsWorker.java
index 498eb2f658..7f6ec5cfe7 100644
--- a/docs/src/test/java/jdocs/cluster/StatsWorker.java
+++ b/docs/src/test/java/jdocs/cluster/StatsWorker.java
@@ -15,7 +15,6 @@ package jdocs.cluster;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.pekko.actor.AbstractActor;
 
 // #worker
diff --git a/docs/src/test/java/jdocs/cluster/TransformationBackend.java b/docs/src/test/java/jdocs/cluster/TransformationBackend.java
index dc1d50f3cb..f9fe8b18b7 100644
--- a/docs/src/test/java/jdocs/cluster/TransformationBackend.java
+++ b/docs/src/test/java/jdocs/cluster/TransformationBackend.java
@@ -14,6 +14,7 @@
 package jdocs.cluster;
 
 import static jdocs.cluster.TransformationMessages.BACKEND_REGISTRATION;
+
 import jdocs.cluster.TransformationMessages.TransformationJob;
 import jdocs.cluster.TransformationMessages.TransformationResult;
 import org.apache.pekko.actor.AbstractActor;
diff --git a/docs/src/test/java/jdocs/cluster/TransformationFrontend.java b/docs/src/test/java/jdocs/cluster/TransformationFrontend.java
index f36ddcaca0..6da0a3b740 100644
--- a/docs/src/test/java/jdocs/cluster/TransformationFrontend.java
+++ b/docs/src/test/java/jdocs/cluster/TransformationFrontend.java
@@ -17,12 +17,11 @@ import static jdocs.cluster.TransformationMessages.BACKEND_REGISTRATION;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import jdocs.cluster.TransformationMessages.JobFailed;
 import jdocs.cluster.TransformationMessages.TransformationJob;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Terminated;
-import org.apache.pekko.actor.AbstractActor;
 
 // #frontend
 public class TransformationFrontend extends AbstractActor {
diff --git a/docs/src/test/java/jdocs/coordination/LeaseDocTest.java b/docs/src/test/java/jdocs/coordination/LeaseDocTest.java
index b460c09e0b..4a853104da 100644
--- a/docs/src/test/java/jdocs/coordination/LeaseDocTest.java
+++ b/docs/src/test/java/jdocs/coordination/LeaseDocTest.java
@@ -13,22 +13,21 @@
 
 package jdocs.coordination;
 
+import docs.coordination.LeaseDocSpec;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.function.Consumer;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.coordination.lease.LeaseSettings;
 import org.apache.pekko.coordination.lease.javadsl.Lease;
 import org.apache.pekko.coordination.lease.javadsl.LeaseProvider;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import docs.coordination.LeaseDocSpec;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Consumer;
-
 @SuppressWarnings("unused")
 public class LeaseDocTest extends JUnitSuite {
   // #lease-example
diff --git a/docs/src/test/java/jdocs/ddata/DataBot.java b/docs/src/test/java/jdocs/ddata/DataBot.java
index 3456ddda9b..67a0ec952c 100644
--- a/docs/src/test/java/jdocs/ddata/DataBot.java
+++ b/docs/src/test/java/jdocs/ddata/DataBot.java
@@ -16,11 +16,9 @@ package jdocs.ddata;
 // #data-bot
 import java.time.Duration;
 import java.util.concurrent.ThreadLocalRandom;
-
 import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Cancellable;
-import org.apache.pekko.cluster.Cluster;
 import org.apache.pekko.cluster.ddata.DistributedData;
 import org.apache.pekko.cluster.ddata.Key;
 import org.apache.pekko.cluster.ddata.ORSet;
diff --git a/docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java b/docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java
index b21da8c69f..d2a50ecaa2 100644
--- a/docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java
+++ b/docs/src/test/java/jdocs/ddata/DistributedDataDocTest.java
@@ -13,29 +13,25 @@
 
 package jdocs.ddata;
 
-import java.util.HashSet;
-import java.util.Arrays;
-import java.util.Set;
-import java.math.BigInteger;
-import java.util.Optional;
+import static org.apache.pekko.cluster.ddata.Replicator.*;
+import static org.junit.Assert.assertEquals;
 
-import org.apache.pekko.actor.*;
-import org.apache.pekko.testkit.javadsl.TestKit;
 import com.typesafe.config.ConfigFactory;
 import docs.ddata.DistributedDataDocSpec;
-import jdocs.AbstractJavaTest;
+import java.math.BigInteger;
 import java.time.Duration;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import jdocs.AbstractJavaTest;
+import org.apache.pekko.actor.*;
 import org.apache.pekko.cluster.ddata.*;
 import org.apache.pekko.japi.pf.ReceiveBuilder;
-
-import static org.apache.pekko.cluster.ddata.Replicator.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 @SuppressWarnings({"unchecked", "unused"})
 public class DistributedDataDocTest extends AbstractJavaTest {
diff --git a/docs/src/test/java/jdocs/ddata/ShoppingCart.java b/docs/src/test/java/jdocs/ddata/ShoppingCart.java
index 0c204ed827..aa7ddec9d8 100644
--- a/docs/src/test/java/jdocs/ddata/ShoppingCart.java
+++ b/docs/src/test/java/jdocs/ddata/ShoppingCart.java
@@ -14,11 +14,10 @@
 package jdocs.ddata;
 
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
-import java.time.Duration;
-
 import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Props;
diff --git a/docs/src/test/java/jdocs/ddata/TwoPhaseSet.java b/docs/src/test/java/jdocs/ddata/TwoPhaseSet.java
index 3bc89f3fb7..ae23dd8460 100644
--- a/docs/src/test/java/jdocs/ddata/TwoPhaseSet.java
+++ b/docs/src/test/java/jdocs/ddata/TwoPhaseSet.java
@@ -14,9 +14,7 @@
 package jdocs.ddata;
 
 import java.util.HashSet;
-
 import java.util.Set;
-
 import org.apache.pekko.cluster.ddata.AbstractReplicatedData;
 import org.apache.pekko.cluster.ddata.GSet;
 
diff --git a/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java b/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java
index 8ebd99e69c..d9b167f2fc 100644
--- a/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java
+++ b/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer.java
@@ -14,12 +14,11 @@
 package jdocs.ddata.protobuf;
 
 // #serializer
-import jdocs.ddata.TwoPhaseSet;
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages;
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet.Builder;
 import java.util.ArrayList;
 import java.util.Collections;
-
+import jdocs.ddata.TwoPhaseSet;
 import org.apache.pekko.actor.ExtendedActorSystem;
 import org.apache.pekko.cluster.ddata.GSet;
 import org.apache.pekko.cluster.ddata.protobuf.AbstractSerializationSupport;
diff --git a/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java b/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java
index d39d1355d3..43380969fb 100644
--- a/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java
+++ b/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializer2.java
@@ -14,10 +14,9 @@
 package jdocs.ddata.protobuf;
 
 // #serializer
-import jdocs.ddata.TwoPhaseSet;
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages;
 import docs.ddata.protobuf.msg.TwoPhaseSetMessages.TwoPhaseSet2.Builder;
-
+import jdocs.ddata.TwoPhaseSet;
 import org.apache.pekko.actor.ExtendedActorSystem;
 import org.apache.pekko.cluster.ddata.GSet;
 import org.apache.pekko.cluster.ddata.protobuf.AbstractSerializationSupport;
diff --git a/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java b/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java
index 25f7aa7d36..dfb57f7978 100644
--- a/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java
+++ b/docs/src/test/java/jdocs/ddata/protobuf/TwoPhaseSetSerializerWithCompression.java
@@ -14,7 +14,6 @@
 package jdocs.ddata.protobuf;
 
 import jdocs.ddata.TwoPhaseSet;
-
 import org.apache.pekko.actor.ExtendedActorSystem;
 
 public class TwoPhaseSetSerializerWithCompression extends TwoPhaseSetSerializer {
diff --git a/docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java b/docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
index 964eb820fa..f8f517e96d 100644
--- a/docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
+++ b/docs/src/test/java/jdocs/dispatcher/MyUnboundedMailbox.java
@@ -14,15 +14,15 @@
 package jdocs.dispatcher;
 
 // #mailbox-implementation-example
+import com.typesafe.config.Config;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.dispatch.Envelope;
 import org.apache.pekko.dispatch.MailboxType;
 import org.apache.pekko.dispatch.MessageQueue;
 import org.apache.pekko.dispatch.ProducesMessageQueue;
-import com.typesafe.config.Config;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.Queue;
 import scala.Option;
 
 public class MyUnboundedMailbox
diff --git a/docs/src/test/java/jdocs/duration/Java.java b/docs/src/test/java/jdocs/duration/Java.java
index 30aa221d49..bb8ee3b83c 100644
--- a/docs/src/test/java/jdocs/duration/Java.java
+++ b/docs/src/test/java/jdocs/duration/Java.java
@@ -14,10 +14,11 @@
 package jdocs.duration;
 
 // #import
-import scala.concurrent.duration.Duration;
+import static org.junit.Assert.assertTrue;
+
 import scala.concurrent.duration.Deadline;
+import scala.concurrent.duration.Duration;
 
-import static org.junit.Assert.assertTrue;
 // #import
 
 class Java {
diff --git a/docs/src/test/java/jdocs/io/JavaReadBackPressure.java b/docs/src/test/java/jdocs/io/JavaReadBackPressure.java
index a24d96288b..38625d6436 100644
--- a/docs/src/test/java/jdocs/io/JavaReadBackPressure.java
+++ b/docs/src/test/java/jdocs/io/JavaReadBackPressure.java
@@ -13,18 +13,17 @@
 
 package jdocs.io;
 
+import java.net.InetSocketAddress;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Props;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.io.Inet;
 import org.apache.pekko.io.Tcp;
 import org.apache.pekko.io.TcpMessage;
 import org.apache.pekko.util.ByteString;
-import java.time.Duration;
-
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.List;
 
 /** Copyright (C) 2009-2018 Lightbend Inc. <https://www.lightbend.com> */
 public class JavaReadBackPressure {
diff --git a/docs/src/test/java/jdocs/io/JavaUdpMulticast.java b/docs/src/test/java/jdocs/io/JavaUdpMulticast.java
index 83942ac5e1..f4d8433d4a 100644
--- a/docs/src/test/java/jdocs/io/JavaUdpMulticast.java
+++ b/docs/src/test/java/jdocs/io/JavaUdpMulticast.java
@@ -14,8 +14,16 @@
 package jdocs.io;
 
 // #imports
-import org.apache.pekko.actor.ActorRef;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NetworkInterface;
+import java.net.StandardProtocolFamily;
+import java.nio.channels.DatagramChannel;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.io.Inet;
@@ -23,14 +31,6 @@ import org.apache.pekko.io.Udp;
 import org.apache.pekko.io.UdpMessage;
 import org.apache.pekko.util.ByteString;
 
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.StandardProtocolFamily;
-import java.net.DatagramSocket;
-import java.nio.channels.DatagramChannel;
-import java.util.ArrayList;
-import java.util.List;
 // #imports
 
 public class JavaUdpMulticast {
diff --git a/docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java b/docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
index 8cf515e554..336b25d1c3 100644
--- a/docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
+++ b/docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
@@ -13,23 +13,21 @@
 
 package jdocs.io;
 
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.*;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.io.Udp;
 import org.apache.pekko.testkit.SocketUtil;
-
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.util.*;
-
 public class JavaUdpMulticastTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/io/UdpDocTest.java b/docs/src/test/java/jdocs/io/UdpDocTest.java
index 454d27dc3f..96c42ba6d2 100644
--- a/docs/src/test/java/jdocs/io/UdpDocTest.java
+++ b/docs/src/test/java/jdocs/io/UdpDocTest.java
@@ -14,16 +14,16 @@
 package jdocs.io;
 
 // #imports
+import java.net.InetSocketAddress;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.PoisonPill;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.io.Udp;
 import org.apache.pekko.io.UdpConnected;
 import org.apache.pekko.io.UdpConnectedMessage;
 import org.apache.pekko.io.UdpMessage;
 import org.apache.pekko.util.ByteString;
 
-import java.net.InetSocketAddress;
 // #imports
 
 public class UdpDocTest {
diff --git a/docs/src/test/java/jdocs/io/japi/EchoHandler.java b/docs/src/test/java/jdocs/io/japi/EchoHandler.java
index 9e94759eab..288b79797e 100644
--- a/docs/src/test/java/jdocs/io/japi/EchoHandler.java
+++ b/docs/src/test/java/jdocs/io/japi/EchoHandler.java
@@ -13,12 +13,14 @@
 
 package jdocs.io.japi;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import java.net.InetSocketAddress;
 import java.util.LinkedList;
 import java.util.Queue;
-
-import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.io.Tcp.CommandFailed;
@@ -30,9 +32,6 @@ import org.apache.pekko.io.Tcp.WritingResumed;
 import org.apache.pekko.io.TcpMessage;
 import org.apache.pekko.util.ByteString;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
 // #echo-handler
 public class EchoHandler extends AbstractActor {
 
diff --git a/docs/src/test/java/jdocs/io/japi/EchoManager.java b/docs/src/test/java/jdocs/io/japi/EchoManager.java
index ce24a810fe..b50ccab27b 100644
--- a/docs/src/test/java/jdocs/io/japi/EchoManager.java
+++ b/docs/src/test/java/jdocs/io/japi/EchoManager.java
@@ -14,11 +14,10 @@
 package jdocs.io.japi;
 
 import java.net.InetSocketAddress;
-
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.actor.SupervisorStrategy;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.io.Tcp;
diff --git a/docs/src/test/java/jdocs/io/japi/EchoServer.java b/docs/src/test/java/jdocs/io/japi/EchoServer.java
index 368bbcc07b..e5fb3347d6 100644
--- a/docs/src/test/java/jdocs/io/japi/EchoServer.java
+++ b/docs/src/test/java/jdocs/io/japi/EchoServer.java
@@ -13,16 +13,14 @@
 
 package jdocs.io.japi;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-
 public class EchoServer {
 
   public static void main(String[] args) throws InterruptedException {
diff --git a/docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java b/docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java
index ba15949b8b..d8f8613c49 100644
--- a/docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java
+++ b/docs/src/test/java/jdocs/io/japi/SimpleEchoHandler.java
@@ -16,9 +16,8 @@ package jdocs.io.japi;
 import java.net.InetSocketAddress;
 import java.util.LinkedList;
 import java.util.Queue;
-
-import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.event.Logging;
 import org.apache.pekko.event.LoggingAdapter;
 import org.apache.pekko.io.Tcp.ConnectionClosed;
diff --git a/docs/src/test/java/jdocs/io/japi/Watcher.java b/docs/src/test/java/jdocs/io/japi/Watcher.java
index 8655c3da57..c6f19f50f1 100644
--- a/docs/src/test/java/jdocs/io/japi/Watcher.java
+++ b/docs/src/test/java/jdocs/io/japi/Watcher.java
@@ -14,10 +14,9 @@
 package jdocs.io.japi;
 
 import java.util.concurrent.CountDownLatch;
-
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.Terminated;
-import org.apache.pekko.actor.AbstractActor;
 
 public class Watcher extends AbstractActor {
 
diff --git a/docs/src/test/java/jdocs/pattern/SupervisedAsk.java b/docs/src/test/java/jdocs/pattern/SupervisedAsk.java
index 994d613c2d..ec85a5265c 100644
--- a/docs/src/test/java/jdocs/pattern/SupervisedAsk.java
+++ b/docs/src/test/java/jdocs/pattern/SupervisedAsk.java
@@ -13,10 +13,10 @@
 
 package jdocs.pattern;
 
+import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeoutException;
-import java.time.Duration;
-
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorKilledException;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorRefFactory;
@@ -27,7 +27,6 @@ import org.apache.pekko.actor.Scheduler;
 import org.apache.pekko.actor.Status;
 import org.apache.pekko.actor.SupervisorStrategy;
 import org.apache.pekko.actor.Terminated;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.pattern.Patterns;
 
 public class SupervisedAsk {
diff --git a/docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java b/docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
index 8f4978b898..0e3222e049 100644
--- a/docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
+++ b/docs/src/test/java/jdocs/pattern/SupervisedAskSpec.java
@@ -13,14 +13,13 @@
 
 package jdocs.pattern;
 
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.actor.ActorRefFactory;
-import org.apache.pekko.actor.Props;
-import org.apache.pekko.actor.AbstractActor;
-
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorRefFactory;
+import org.apache.pekko.actor.Props;
 
 public class SupervisedAskSpec {
 
diff --git a/docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java b/docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java
index 619968e95b..e7e6c13032 100644
--- a/docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java
+++ b/docs/src/test/java/jdocs/persistence/LambdaPersistenceDocTest.java
@@ -13,16 +13,15 @@
 
 package jdocs.persistence;
 
+import java.io.Serializable;
+import java.time.Duration;
+import java.util.Optional;
 import org.apache.pekko.actor.*;
 import org.apache.pekko.japi.Procedure;
 import org.apache.pekko.pattern.BackoffOpts;
 import org.apache.pekko.pattern.BackoffSupervisor;
 import org.apache.pekko.persistence.*;
 
-import java.io.Serializable;
-import java.time.Duration;
-import java.util.Optional;
-
 public class LambdaPersistenceDocTest {
 
   public interface SomeOtherMessage {}
diff --git a/docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java b/docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
index f337b9da94..3e52ec0ab7 100644
--- a/docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
+++ b/docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
@@ -13,10 +13,10 @@
 
 package jdocs.persistence;
 
-import org.apache.pekko.persistence.AbstractPersistentActor;
-import org.apache.pekko.persistence.RuntimePluginConfig;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
+import org.apache.pekko.persistence.AbstractPersistentActor;
+import org.apache.pekko.persistence.RuntimePluginConfig;
 
 public class PersistenceMultiDocTest {
 
diff --git a/docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java b/docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
index 5d016b3ade..a785815aad 100644
--- a/docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
+++ b/docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
@@ -13,28 +13,24 @@
 
 package jdocs.persistence;
 
+import com.typesafe.config.Config;
 import java.sql.Connection;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
-
+import java.util.concurrent.CompletionStage;
+import jdocs.persistence.query.MyEventsByTagSource;
 import org.apache.pekko.NotUsed;
-import org.apache.pekko.persistence.query.Sequence;
-import org.apache.pekko.persistence.query.Offset;
-import com.typesafe.config.Config;
-
 import org.apache.pekko.actor.*;
 import org.apache.pekko.persistence.query.*;
+import org.apache.pekko.persistence.query.Offset;
+import org.apache.pekko.persistence.query.Sequence;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
-
-import jdocs.persistence.query.MyEventsByTagSource;
 import org.reactivestreams.Subscriber;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-
 public class PersistenceQueryDocTest {
 
   final ActorSystem system = ActorSystem.create();
diff --git a/docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java b/docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
index 756e51cff3..fd594720a7 100644
--- a/docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
+++ b/docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
@@ -15,17 +15,14 @@ package jdocs.persistence;
 
 import docs.persistence.ExampleJsonMarshaller;
 import docs.persistence.proto.FlightAppModels;
-
 import java.io.NotSerializableException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-
-import spray.json.JsObject;
-
 import org.apache.pekko.persistence.journal.EventAdapter;
 import org.apache.pekko.persistence.journal.EventSeq;
 import org.apache.pekko.protobufv3.internal.InvalidProtocolBufferException;
 import org.apache.pekko.serialization.SerializerWithStringManifest;
+import spray.json.JsObject;
 
 public class PersistenceSchemaEvolutionDocTest {
 
diff --git a/docs/src/test/java/jdocs/persistence/PersistentActorExample.java b/docs/src/test/java/jdocs/persistence/PersistentActorExample.java
index b20eff3ff9..bd2b7968e6 100644
--- a/docs/src/test/java/jdocs/persistence/PersistentActorExample.java
+++ b/docs/src/test/java/jdocs/persistence/PersistentActorExample.java
@@ -15,15 +15,14 @@ package jdocs.persistence;
 
 // #persistent-actor-example
 
+import java.io.Serializable;
+import java.util.ArrayList;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.persistence.AbstractPersistentActor;
 import org.apache.pekko.persistence.SnapshotOffer;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-
 class Cmd implements Serializable {
   private static final long serialVersionUID = 1L;
   private final String data;
diff --git a/docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java b/docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java
index 2c8813bf75..d6b78b0aba 100644
--- a/docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java
+++ b/docs/src/test/java/jdocs/persistence/query/LeveldbPersistenceQueryDocTest.java
@@ -15,14 +15,13 @@ package jdocs.persistence.query;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.persistence.journal.WriteEventAdapter;
 import org.apache.pekko.persistence.journal.Tagged;
+import org.apache.pekko.persistence.journal.WriteEventAdapter;
 import org.apache.pekko.persistence.query.EventEnvelope;
-import org.apache.pekko.persistence.query.Sequence;
 import org.apache.pekko.persistence.query.PersistenceQuery;
+import org.apache.pekko.persistence.query.Sequence;
 import org.apache.pekko.persistence.query.journal.leveldb.javadsl.LeveldbReadJournal;
 import org.apache.pekko.stream.javadsl.Source;
 
diff --git a/docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java b/docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java
index c12597daa1..a262737cd2 100644
--- a/docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java
+++ b/docs/src/test/java/jdocs/persistence/query/MyEventsByTagSource.java
@@ -13,14 +13,6 @@
 
 package jdocs.persistence.query;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.persistence.query.EventEnvelope;
-import org.apache.pekko.persistence.query.Offset;
-import org.apache.pekko.serialization.Serialization;
-import org.apache.pekko.serialization.SerializationExtension;
-import org.apache.pekko.stream.*;
-import org.apache.pekko.stream.stage.*;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -28,6 +20,13 @@ import java.time.Duration;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.persistence.query.EventEnvelope;
+import org.apache.pekko.persistence.query.Offset;
+import org.apache.pekko.serialization.Serialization;
+import org.apache.pekko.serialization.SerializationExtension;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.stage.*;
 
 // #events-by-tag-publisher
 public class MyEventsByTagSource extends GraphStage<SourceShape<EventEnvelope>> {
diff --git a/docs/src/test/java/jdocs/persistence/testkit/Configuration.java b/docs/src/test/java/jdocs/persistence/testkit/Configuration.java
index db3722cdf1..5858614b76 100644
--- a/docs/src/test/java/jdocs/persistence/testkit/Configuration.java
+++ b/docs/src/test/java/jdocs/persistence/testkit/Configuration.java
@@ -13,14 +13,14 @@
 
 package jdocs.persistence.testkit;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
 import org.apache.pekko.persistence.testkit.PersistenceTestKitSnapshotPlugin;
 import org.apache.pekko.persistence.testkit.javadsl.PersistenceTestKit;
 import org.apache.pekko.persistence.testkit.javadsl.SnapshotTestKit;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 
 public class Configuration {
 
diff --git a/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java b/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
index 866db91d55..aa4c883c09 100644
--- a/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
+++ b/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitPolicySampleTest.java
@@ -13,6 +13,8 @@
 
 package jdocs.persistence.testkit;
 
+import com.typesafe.config.ConfigFactory;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.persistence.testkit.JournalOperation;
@@ -24,8 +26,6 @@ import org.apache.pekko.persistence.testkit.StorageFailure;
 import org.apache.pekko.persistence.testkit.WriteEvents;
 import org.apache.pekko.persistence.testkit.javadsl.PersistenceTestKit;
 import org.apache.pekko.persistence.typed.PersistenceId;
-import com.typesafe.config.ConfigFactory;
-import jdocs.AbstractJavaTest;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java b/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java
index fbd26f1082..1e13c51cb5 100644
--- a/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java
+++ b/docs/src/test/java/jdocs/persistence/testkit/PersistenceTestKitSampleTest.java
@@ -13,6 +13,9 @@
 
 package jdocs.persistence.testkit;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.typesafe.config.ConfigFactory;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
@@ -24,9 +27,6 @@ import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
 import org.apache.pekko.persistence.typed.javadsl.EventHandler;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
 import org.apache.pekko.serialization.jackson.CborSerializable;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.typesafe.config.ConfigFactory;
-import jdocs.AbstractJavaTest;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/docs/src/test/java/jdocs/routing/RedundancyGroup.java b/docs/src/test/java/jdocs/routing/RedundancyGroup.java
index 4cd7b22c24..3395327f91 100644
--- a/docs/src/test/java/jdocs/routing/RedundancyGroup.java
+++ b/docs/src/test/java/jdocs/routing/RedundancyGroup.java
@@ -14,16 +14,14 @@
 package jdocs.routing;
 
 // #group
-import java.util.List;
+import static jdocs.routing.CustomRouterDocTest.RedundancyRoutingLogic;
 
+import com.typesafe.config.Config;
+import java.util.List;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.dispatch.Dispatchers;
-import org.apache.pekko.routing.Router;
-
-import com.typesafe.config.Config;
-
 import org.apache.pekko.routing.GroupBase;
-import static jdocs.routing.CustomRouterDocTest.RedundancyRoutingLogic;
+import org.apache.pekko.routing.Router;
 
 public class RedundancyGroup extends GroupBase {
   private final List<String> paths;
diff --git a/docs/src/test/java/jdocs/stream/BidiFlowDocTest.java b/docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
index cf2602eee7..c7a2675d1c 100644
--- a/docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
+++ b/docs/src/test/java/jdocs/stream/BidiFlowDocTest.java
@@ -13,30 +13,29 @@
 
 package jdocs.stream;
 
+import static org.apache.pekko.util.ByteString.emptyByteString;
+import static org.junit.Assert.assertArrayEquals;
+
 import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
-
-import org.apache.pekko.NotUsed;
-import org.apache.pekko.stream.javadsl.GraphDSL;
 import jdocs.AbstractJavaTest;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.pf.PFBuilder;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.javadsl.GraphDSL;
 import org.apache.pekko.stream.stage.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteIterator;
 import org.apache.pekko.util.ByteString;
-import static org.apache.pekko.util.ByteString.emptyByteString;
 import org.apache.pekko.util.ByteStringBuilder;
-import static org.junit.Assert.assertArrayEquals;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class BidiFlowDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/stream/CompositionDocTest.java b/docs/src/test/java/jdocs/stream/CompositionDocTest.java
index 0a00c66d11..09b351cb6a 100644
--- a/docs/src/test/java/jdocs/stream/CompositionDocTest.java
+++ b/docs/src/test/java/jdocs/stream/CompositionDocTest.java
@@ -17,21 +17,19 @@ import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
-
-import org.apache.pekko.NotUsed;
-import org.apache.pekko.stream.ClosedShape;
 import jdocs.AbstractJavaTest;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.ClosedShape;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.stream.javadsl.Tcp.OutgoingConnection;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteString;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class CompositionDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/stream/FlowDocTest.java b/docs/src/test/java/jdocs/stream/FlowDocTest.java
index 82f04a08ba..88d056fd6e 100644
--- a/docs/src/test/java/jdocs/stream/FlowDocTest.java
+++ b/docs/src/test/java/jdocs/stream/FlowDocTest.java
@@ -13,6 +13,17 @@
 
 package jdocs.stream;
 
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.AbstractActor;
@@ -24,22 +35,10 @@ import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class FlowDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/FlowErrorDocTest.java b/docs/src/test/java/jdocs/stream/FlowErrorDocTest.java
index 68504e70dc..541ef837d2 100644
--- a/docs/src/test/java/jdocs/stream/FlowErrorDocTest.java
+++ b/docs/src/test/java/jdocs/stream/FlowErrorDocTest.java
@@ -14,26 +14,25 @@
 package jdocs.stream;
 
 import static org.junit.Assert.assertEquals;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.function.Function;
 import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.ActorAttributes;
+import org.apache.pekko.stream.Supervision;
 import org.apache.pekko.stream.javadsl.*;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.stream.Supervision;
-import org.apache.pekko.stream.ActorAttributes;
-import org.apache.pekko.japi.function.Function;
-
 public class FlowErrorDocTest extends AbstractJavaTest {
 
   private static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java b/docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java
index b1fb3d6584..5b219be6aa 100644
--- a/docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java
+++ b/docs/src/test/java/jdocs/stream/FlowParallelismDocTest.java
@@ -13,15 +13,15 @@
 
 package jdocs.stream;
 
-import org.apache.pekko.NotUsed;
 import jdocs.AbstractJavaTest;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.stream.*;
-import org.apache.pekko.stream.javadsl.*;
 
 public class FlowParallelismDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java b/docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
index 7044f11b1a..b1517a2d59 100644
--- a/docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
+++ b/docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
@@ -13,6 +13,8 @@
 
 package jdocs.stream;
 
+import java.util.concurrent.TimeUnit;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
@@ -21,12 +23,9 @@ import org.apache.pekko.actor.Props;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
 
-import java.util.concurrent.TimeUnit;
-
 public class FlowStreamRefsDocTest extends AbstractJavaTest {
 
   static ActorSystem system = null;
diff --git a/docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java b/docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java
index ae2303541c..c126458815 100644
--- a/docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java
+++ b/docs/src/test/java/jdocs/stream/GraphCyclesDocTest.java
@@ -14,18 +14,16 @@
 package jdocs.stream;
 
 import java.util.Arrays;
-
-import org.apache.pekko.NotUsed;
 import jdocs.AbstractJavaTest;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.stream.scaladsl.MergePreferred.MergePreferredShape;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class GraphCyclesDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/stream/HubDocTest.java b/docs/src/test/java/jdocs/stream/HubDocTest.java
index 6eae45c60e..3478ebe0a9 100644
--- a/docs/src/test/java/jdocs/stream/HubDocTest.java
+++ b/docs/src/test/java/jdocs/stream/HubDocTest.java
@@ -13,6 +13,11 @@
 
 package jdocs.stream;
 
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.function.ToLongBiFunction;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
@@ -22,16 +27,10 @@ import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.stream.javadsl.PartitionHub.ConsumerInfo;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.function.ToLongBiFunction;
-
 public class HubDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/IntegrationDocTest.java b/docs/src/test/java/jdocs/stream/IntegrationDocTest.java
index d7baa5da60..839b7bee97 100644
--- a/docs/src/test/java/jdocs/stream/IntegrationDocTest.java
+++ b/docs/src/test/java/jdocs/stream/IntegrationDocTest.java
@@ -13,24 +13,13 @@
 
 package jdocs.stream;
 
-import org.apache.pekko.Done;
-import org.apache.pekko.NotUsed;
-import org.apache.pekko.actor.*;
-import org.apache.pekko.stream.*;
-import org.apache.pekko.stream.javadsl.*;
-import org.apache.pekko.testkit.TestProbe;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.apache.pekko.util.Timeout;
+import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.PEKKO;
+import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.tweets;
+import static junit.framework.TestCase.assertTrue;
+import static org.apache.pekko.pattern.Patterns.ask;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
-import jdocs.AbstractJavaTest;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -42,10 +31,20 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.pekko.pattern.Patterns.ask;
-import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.PEKKO;
-import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.tweets;
-import static junit.framework.TestCase.assertTrue;
+import jdocs.AbstractJavaTest;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.stream.*;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.Timeout;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 @SuppressWarnings("ALL")
 public class IntegrationDocTest extends AbstractJavaTest {
diff --git a/docs/src/test/java/jdocs/stream/KillSwitchDocTest.java b/docs/src/test/java/jdocs/stream/KillSwitchDocTest.java
index ce360a721f..75dd9755d9 100644
--- a/docs/src/test/java/jdocs/stream/KillSwitchDocTest.java
+++ b/docs/src/test/java/jdocs/stream/KillSwitchDocTest.java
@@ -13,6 +13,14 @@
 
 package jdocs.stream;
 
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -20,21 +28,11 @@ import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.Keep;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 class KillSwitchDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/RateTransformationDocTest.java b/docs/src/test/java/jdocs/stream/RateTransformationDocTest.java
index 4465647226..02e4593cd8 100644
--- a/docs/src/test/java/jdocs/stream/RateTransformationDocTest.java
+++ b/docs/src/test/java/jdocs/stream/RateTransformationDocTest.java
@@ -13,6 +13,17 @@
 
 package jdocs.stream;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.DoubleStream;
+import java.util.stream.Stream;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -27,7 +38,6 @@ import org.apache.pekko.stream.testkit.javadsl.TestSink;
 import org.apache.pekko.stream.testkit.javadsl.TestSource;
 import org.apache.pekko.testkit.TestLatch;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -35,17 +45,6 @@ import scala.concurrent.Await;
 import scala.concurrent.duration.Duration;
 import scala.util.Random;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.stream.DoubleStream;
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-
 public class RateTransformationDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/RestartDocTest.java b/docs/src/test/java/jdocs/stream/RestartDocTest.java
index 14350fb983..319c9978f1 100644
--- a/docs/src/test/java/jdocs/stream/RestartDocTest.java
+++ b/docs/src/test/java/jdocs/stream/RestartDocTest.java
@@ -13,6 +13,9 @@
 
 package jdocs.stream;
 
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.KillSwitch;
@@ -24,10 +27,6 @@ import org.apache.pekko.stream.javadsl.RestartSource;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.time.Duration;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
 public class RestartDocTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/SilenceSystemOut.java b/docs/src/test/java/jdocs/stream/SilenceSystemOut.java
index 7f18c7bc14..a3de4132dc 100644
--- a/docs/src/test/java/jdocs/stream/SilenceSystemOut.java
+++ b/docs/src/test/java/jdocs/stream/SilenceSystemOut.java
@@ -13,9 +13,8 @@
 
 package jdocs.stream;
 
-import org.apache.pekko.actor.ActorRef;
-
 import java.util.function.Predicate;
+import org.apache.pekko.actor.ActorRef;
 
 /**
  * Acts as if `System.out.println()` yet swallows all messages. Useful for putting printlines in
diff --git a/docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java b/docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java
index f2b80a0cde..ddbea7ea74 100644
--- a/docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java
+++ b/docs/src/test/java/jdocs/stream/SinkRecipeDocTest.java
@@ -13,18 +13,17 @@
 
 package jdocs.stream;
 
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.function.Function;
-import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.Sink;
-import jdocs.AbstractJavaTest;
+import org.apache.pekko.stream.javadsl.Source;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
 public class SinkRecipeDocTest extends AbstractJavaTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java b/docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java
index 55bb1559f3..edb1106211 100644
--- a/docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java
+++ b/docs/src/test/java/jdocs/stream/StreamBuffersRateDocTest.java
@@ -13,20 +13,19 @@
 
 package jdocs.stream;
 
+import java.time.Duration;
+import java.util.Arrays;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Cancellable;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.Arrays;
-
 public class StreamBuffersRateDocTest extends AbstractJavaTest {
 
   static class Job {}
diff --git a/docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java b/docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java
index fd5c0b8d7d..91c7f84932 100644
--- a/docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java
+++ b/docs/src/test/java/jdocs/stream/StreamPartialGraphDSLDocTest.java
@@ -13,6 +13,14 @@
 
 package jdocs.stream;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorRef;
@@ -20,20 +28,11 @@ import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class StreamPartialGraphDSLDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java b/docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
index 7ea78c2731..e22e05289d 100644
--- a/docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
+++ b/docs/src/test/java/jdocs/stream/StreamTestKitDocTest.java
@@ -13,6 +13,9 @@
 
 package jdocs.stream;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
@@ -22,21 +25,17 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
-import jdocs.AbstractJavaTest;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import org.apache.pekko.actor.*;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.stream.testkit.*;
 import org.apache.pekko.stream.testkit.javadsl.*;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.junit.*;
 
 public class StreamTestKitDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/stream/SubstreamDocTest.java b/docs/src/test/java/jdocs/stream/SubstreamDocTest.java
index c08750dfe6..3f69ca2efc 100644
--- a/docs/src/test/java/jdocs/stream/SubstreamDocTest.java
+++ b/docs/src/test/java/jdocs/stream/SubstreamDocTest.java
@@ -13,17 +13,16 @@
 
 package jdocs.stream;
 
+import java.util.Arrays;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Arrays;
-
 public class SubstreamDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java b/docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java
index 844d483666..35d42f8857 100644
--- a/docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java
+++ b/docs/src/test/java/jdocs/stream/io/StreamFileDocTest.java
@@ -13,29 +13,27 @@
 
 package jdocs.stream.io;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.io.IOException;
 import java.util.concurrent.CompletionStage;
-
+import jdocs.AbstractJavaTest;
+import jdocs.stream.SilenceSystemOut;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.ActorAttributes;
-import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.FileIO;
+import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
-import jdocs.AbstractJavaTest;
-import jdocs.stream.SilenceSystemOut;
 import org.apache.pekko.testkit.javadsl.TestKit;
+import org.apache.pekko.util.ByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.pekko.stream.*;
-import org.apache.pekko.util.ByteString;
-
 public class StreamFileDocTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java b/docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
index 692f15efda..993f9660d7 100644
--- a/docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
+++ b/docs/src/test/java/jdocs/stream/io/StreamTcpDocTest.java
@@ -13,27 +13,24 @@
 
 package jdocs.stream.io;
 
+import java.net.InetSocketAddress;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.apache.pekko.NotUsed;
-import org.apache.pekko.stream.javadsl.Framing;
+import java.util.concurrent.TimeUnit;
 import jdocs.AbstractJavaTest;
 import jdocs.stream.SilenceSystemOut;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import java.net.InetSocketAddress;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
+import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.stream.javadsl.Framing;
 import org.apache.pekko.stream.javadsl.Tcp.*;
 import org.apache.pekko.testkit.SocketUtil;
 import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteString;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class StreamTcpDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
index d0cc6f1c2e..ee4505b98c 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeAdhocSourceTest.java
@@ -13,6 +13,12 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
@@ -31,13 +37,6 @@ import org.junit.Test;
 import scala.concurrent.Await;
 import scala.concurrent.Promise;
 
-import java.time.Duration;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.assertEquals;
-
 public class RecipeAdhocSourceTest extends RecipeTest {
   static ActorSystem system;
   Duration duration200mills = Duration.ofMillis(200);
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
index d21d3afa25..d35303e86a 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeByteStrings.java
@@ -13,6 +13,15 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static org.apache.pekko.util.ByteString.emptyByteString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.*;
@@ -22,21 +31,11 @@ import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.stage.*;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteString;
-import static org.apache.pekko.util.ByteString.emptyByteString;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import scala.Tuple2;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class RecipeByteStrings extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
index bb05e8b55a..eec9f47456 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDecompress.java
@@ -13,20 +13,20 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static org.apache.pekko.util.ByteString.emptyByteString;
+
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Compression;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteString;
-import static org.apache.pekko.util.ByteString.emptyByteString;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.concurrent.TimeUnit;
-
 public class RecipeDecompress extends RecipeTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java
index a54a60ed47..2b21a76caf 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDigest.java
@@ -13,6 +13,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static org.junit.Assert.assertEquals;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.*;
@@ -25,12 +30,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class RecipeDigest extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java
index e67819caec..a50cff0dcf 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeDroppyBroadcast.java
@@ -13,6 +13,9 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
@@ -23,10 +26,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-
 public class RecipeDroppyBroadcast extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java
index 180697d40a..bc7b691cc3 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeFlattenList.java
@@ -13,6 +13,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
@@ -22,12 +27,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class RecipeFlattenList extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
index 1a61b86337..fa39cf00d4 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeGlobalRateLimit.java
@@ -13,6 +13,11 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static junit.framework.TestCase.assertTrue;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.*;
 import org.apache.pekko.pattern.Patterns;
@@ -25,12 +30,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.CompletionStage;
-
-import static junit.framework.TestCase.assertTrue;
-
 public class RecipeGlobalRateLimit extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java
index 06224429b7..0d0b85028b 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeHold.java
@@ -13,6 +13,7 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.time.Duration;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.Attributes;
@@ -35,8 +36,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-
 public class RecipeHold extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java
index a75ab1d390..dd2c66fe0c 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeKeepAlive.java
@@ -13,6 +13,7 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.time.Duration;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Flow;
@@ -22,8 +23,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-
 public class RecipeKeepAlive extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java
index afaaf1b16f..bc12519de8 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeLoggingElements.java
@@ -13,6 +13,9 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import com.typesafe.config.ConfigFactory;
+import java.util.Arrays;
+import jdocs.stream.SilenceSystemOut;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.event.Logging;
@@ -22,15 +25,11 @@ import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.testkit.DebugFilter;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import com.typesafe.config.ConfigFactory;
-import jdocs.stream.SilenceSystemOut;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import scala.runtime.AbstractFunction0;
 
-import java.util.Arrays;
-
 public class RecipeLoggingElements extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java
index c76460c9b6..d01ff42179 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeManualTrigger.java
@@ -13,6 +13,8 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.time.Duration;
+import java.util.Arrays;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.ClosedShape;
@@ -29,9 +31,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.Arrays;
-
 public class RecipeManualTrigger extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java
index fbdc3438a5..df73f2f391 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMissedTicks.java
@@ -13,6 +13,8 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -31,9 +33,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import scala.concurrent.Await;
 
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-
 public class RecipeMissedTicks extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java
index 43223d0f87..72504a1bcc 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeMultiGroupByTest.java
@@ -13,6 +13,14 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static java.util.stream.Collectors.toList;
+import static junit.framework.TestCase.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Function;
@@ -25,15 +33,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static java.util.stream.Collectors.toList;
-import static junit.framework.TestCase.assertTrue;
-
 public class RecipeMultiGroupByTest extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java
index d1010ade76..8d2e8ef674 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeParseLines.java
@@ -13,6 +13,8 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Framing;
@@ -25,9 +27,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
 public class RecipeParseLines extends RecipeTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java
index 3b75baf1a6..3071a46b71 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeReduceByKeyTest.java
@@ -13,6 +13,13 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -27,14 +34,6 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 public class RecipeReduceByKeyTest extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java
index a8496b914f..296167c672 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSeq.java
@@ -13,6 +13,10 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
@@ -22,11 +26,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
 public class RecipeSeq extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java
index daafa25058..bfee05296a 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSimpleDrop.java
@@ -13,6 +13,7 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -29,8 +30,6 @@ import org.junit.Test;
 import scala.concurrent.Await;
 import scala.concurrent.duration.Duration;
 
-import java.util.concurrent.TimeUnit;
-
 public class RecipeSimpleDrop extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java
index fc8d8ff4c2..0c50156b46 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSourceFromFunction.java
@@ -13,21 +13,20 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import com.typesafe.config.ConfigFactory;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import com.typesafe.config.ConfigFactory;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
 public class RecipeSourceFromFunction extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java
index 9b5bec97b7..1a3ae3c507 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeSplitter.java
@@ -13,6 +13,10 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
@@ -22,11 +26,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-
 public class RecipeSplitter {
   private static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java
index fb0e806cb5..c22cb8c4cf 100644
--- a/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java
+++ b/docs/src/test/java/jdocs/stream/javadsl/cookbook/RecipeWorkerPool.java
@@ -13,6 +13,12 @@
 
 package jdocs.stream.javadsl.cookbook;
 
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.*;
@@ -23,13 +29,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertTrue;
-
 public class RecipeWorkerPool extends RecipeTest {
   static ActorSystem system;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java b/docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java
index d81d8265f6..bd6d94c331 100644
--- a/docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java
+++ b/docs/src/test/java/jdocs/stream/operators/converters/ToFromJavaIOStreams.java
@@ -13,6 +13,20 @@
 
 package jdocs.stream.operators.converters;
 
+import static org.apache.pekko.util.ByteString.emptyByteString;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -24,25 +38,10 @@ import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.StreamConverters;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteString;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.Charset;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import static org.apache.pekko.util.ByteString.emptyByteString;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
 public class ToFromJavaIOStreams extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/operators/flow/DiMap.java b/docs/src/test/java/jdocs/stream/operators/flow/DiMap.java
index 6c82e910c7..1bc585f3a1 100644
--- a/docs/src/test/java/jdocs/stream/operators/flow/DiMap.java
+++ b/docs/src/test/java/jdocs/stream/operators/flow/DiMap.java
@@ -18,12 +18,12 @@
 package jdocs.stream.operators.flow;
 
 // #imports
+import java.util.Arrays;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
 // #imports
 
 public class DiMap {
diff --git a/docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java b/docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java
index 2ef8e33530..28a2c7e7cf 100644
--- a/docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java
+++ b/docs/src/test/java/jdocs/stream/operators/flow/FromSinkAndSource.java
@@ -13,6 +13,10 @@
 
 package jdocs.stream.operators.flow;
 
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Cancellable;
@@ -22,11 +26,6 @@ import org.apache.pekko.stream.testkit.TestPublisher;
 import org.apache.pekko.stream.testkit.TestSubscriber;
 import org.apache.pekko.util.ByteString;
 
-import java.time.Duration;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-
 public class FromSinkAndSource {
 
   void halfClosedTcpServer() {
diff --git a/docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java b/docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java
index 74bc9e7c6b..e1a43a6725 100644
--- a/docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java
+++ b/docs/src/test/java/jdocs/stream/operators/flow/FutureFlow.java
@@ -13,15 +13,14 @@
 
 package jdocs.stream.operators.flow;
 
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
 public class FutureFlow {
 
   private ActorSystem system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/flow/Lazy.java b/docs/src/test/java/jdocs/stream/operators/flow/Lazy.java
index bca8b5e209..fe6d5ee5c4 100644
--- a/docs/src/test/java/jdocs/stream/operators/flow/Lazy.java
+++ b/docs/src/test/java/jdocs/stream/operators/flow/Lazy.java
@@ -13,6 +13,10 @@
 
 package jdocs.stream.operators.flow;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -21,11 +25,6 @@ import org.apache.pekko.stream.javadsl.RunnableGraph;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-
 public class Lazy {
   private ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java b/docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java
index 7bb736918f..52fceaa115 100644
--- a/docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java
+++ b/docs/src/test/java/jdocs/stream/operators/flow/StatefulMap.java
@@ -13,14 +13,13 @@
 
 package jdocs.stream.operators.flow;
 
+import java.util.*;
+import java.util.stream.IntStream;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.*;
-import java.util.stream.IntStream;
-
 public class StatefulMap {
   static final ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java b/docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java
index 364e525491..aa2bd1cfd6 100644
--- a/docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java
+++ b/docs/src/test/java/jdocs/stream/operators/flow/StatefulMapConcat.java
@@ -13,14 +13,13 @@
 
 package jdocs.stream.operators.flow;
 
+import java.util.*;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.*;
-
 public class StatefulMapConcat {
 
   static final ActorSystem<?> system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/sink/Exists.java b/docs/src/test/java/jdocs/stream/operators/sink/Exists.java
index 0b1513cdd0..62101d9f96 100644
--- a/docs/src/test/java/jdocs/stream/operators/sink/Exists.java
+++ b/docs/src/test/java/jdocs/stream/operators/sink/Exists.java
@@ -19,11 +19,11 @@ package jdocs.stream.operators.sink;
 
 // #imports
 
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.concurrent.TimeUnit;
 // #imports
 
 public class Exists {
diff --git a/docs/src/test/java/jdocs/stream/operators/sink/ForAll.java b/docs/src/test/java/jdocs/stream/operators/sink/ForAll.java
index b9d2c65662..5ed5989a4d 100644
--- a/docs/src/test/java/jdocs/stream/operators/sink/ForAll.java
+++ b/docs/src/test/java/jdocs/stream/operators/sink/ForAll.java
@@ -17,12 +17,11 @@
 
 package jdocs.stream.operators.sink;
 
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.concurrent.TimeUnit;
-
 public class ForAll {
   private ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/sink/Lazy.java b/docs/src/test/java/jdocs/stream/operators/sink/Lazy.java
index 7f5ececdeb..5f363955ac 100644
--- a/docs/src/test/java/jdocs/stream/operators/sink/Lazy.java
+++ b/docs/src/test/java/jdocs/stream/operators/sink/Lazy.java
@@ -13,14 +13,13 @@
 
 package jdocs.stream.operators.sink;
 
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Keep;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-
 public class Lazy {
 
   private ActorSystem system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/sink/NoneMatch.java b/docs/src/test/java/jdocs/stream/operators/sink/NoneMatch.java
index 2a2952d8e5..2d9d3d55f3 100644
--- a/docs/src/test/java/jdocs/stream/operators/sink/NoneMatch.java
+++ b/docs/src/test/java/jdocs/stream/operators/sink/NoneMatch.java
@@ -17,12 +17,11 @@
 
 package jdocs.stream.operators.sink;
 
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.concurrent.TimeUnit;
-
 public class NoneMatch {
   private ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java b/docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java
index d583a2da0b..a88ba4f814 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/CompletionStageSource.java
@@ -14,11 +14,10 @@
 package jdocs.stream.operators.source;
 
 // #sourceCompletionStageSource
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.concurrent.CompletionStage;
-
 public class CompletionStageSource {
 
   public static void sourceCompletionStageSource() {
diff --git a/docs/src/test/java/jdocs/stream/operators/source/From.java b/docs/src/test/java/jdocs/stream/operators/source/From.java
index 441dc38c7b..52c62720f3 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/From.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/From.java
@@ -13,11 +13,10 @@
 
 package jdocs.stream.operators.source;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.stream.javadsl.Source;
-
 import java.util.Arrays;
 import java.util.stream.IntStream;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 public class From {
 
diff --git a/docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java b/docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java
index e4a45c4b24..1eb016e5d6 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/FromCompletionStage.java
@@ -14,11 +14,10 @@
 package jdocs.stream.operators.source;
 
 // #sourceFromCompletionStage
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.CompletableFuture;
-
-import org.apache.pekko.NotUsed;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.*;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/source/Lazy.java b/docs/src/test/java/jdocs/stream/operators/source/Lazy.java
index 78ac44047a..1fdb0a3d56 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/Lazy.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/Lazy.java
@@ -13,6 +13,8 @@
 
 package jdocs.stream.operators.source;
 
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -21,9 +23,6 @@ import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.SinkQueueWithCancel;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
-
 public class Lazy {
 
   private ActorSystem system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/source/Restart.java b/docs/src/test/java/jdocs/stream/operators/source/Restart.java
index 042c07511a..55844b5c95 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/Restart.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/Restart.java
@@ -13,6 +13,8 @@
 
 package jdocs.stream.operators.source;
 
+import java.time.Duration;
+import java.util.Arrays;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.Cancellable;
 import org.apache.pekko.japi.Creator;
@@ -24,9 +26,6 @@ import org.apache.pekko.stream.javadsl.RestartSource;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.time.Duration;
-import java.util.Arrays;
-
 public class Restart {
   static org.apache.pekko.actor.ActorSystem system = org.apache.pekko.actor.ActorSystem.create();
 
diff --git a/docs/src/test/java/jdocs/stream/operators/source/Tick.java b/docs/src/test/java/jdocs/stream/operators/source/Tick.java
index dfaca654a5..a128d30e00 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/Tick.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/Tick.java
@@ -13,14 +13,13 @@
 
 package jdocs.stream.operators.source;
 
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.Cancellable;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.javadsl.AskPattern;
-import java.util.concurrent.CompletionStage;
-import java.time.Duration;
-
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Source;
diff --git a/docs/src/test/java/jdocs/stream/operators/source/Unfold.java b/docs/src/test/java/jdocs/stream/operators/source/Unfold.java
index 1f508c0919..db58b7d421 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/Unfold.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/Unfold.java
@@ -13,13 +13,12 @@
 
 package jdocs.stream.operators.source;
 
+import java.math.BigInteger;
+import java.util.Optional;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.math.BigInteger;
-import java.util.Optional;
-
 interface Unfold {
 
   // #countdown
diff --git a/docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java b/docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java
index d678768576..e982896a6b 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/UnfoldAsync.java
@@ -13,17 +13,16 @@
 
 package jdocs.stream.operators.source;
 
+import java.time.Duration;
+import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import org.apache.pekko.actor.typed.javadsl.AskPattern;
-
-import java.time.Duration;
-import java.util.Optional;
-import java.util.concurrent.CompletionStage;
 
 interface UnfoldAsync {
 
diff --git a/docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java b/docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java
index 325bea4238..45038b5d60 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/UnfoldResource.java
@@ -13,12 +13,11 @@
 
 package jdocs.stream.operators.source;
 
+import java.util.Optional;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Optional;
-
 interface UnfoldResource {
   // imaginary blocking API we need to use
   // #unfoldResource-blocking-api
diff --git a/docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java b/docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java
index 9935ce8186..88b0f71f33 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/UnfoldResourceAsync.java
@@ -13,15 +13,14 @@
 
 package jdocs.stream.operators.source;
 
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
 public class UnfoldResourceAsync {
   // imaginary async API we need to use
   // #unfoldResource-async-api
diff --git a/docs/src/test/java/jdocs/stream/operators/source/Zip.java b/docs/src/test/java/jdocs/stream/operators/source/Zip.java
index 8f8b65352e..75ec5886ba 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/Zip.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/Zip.java
@@ -13,13 +13,12 @@
 
 package jdocs.stream.operators.source;
 
+import java.util.Arrays;
+import java.util.List;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-import java.util.List;
-
 public class Zip {
 
   void zipNSample() {
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java
index 93b13767c6..58977d5a09 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/ExtrapolateAndExpand.java
@@ -13,6 +13,10 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import docs.stream.operators.sourceorflow.ExtrapolateAndExpandCommon;
+import docs.stream.operators.sourceorflow.ExtrapolateAndExpandCommon.Frame;
+import java.time.Duration;
+import java.util.stream.Stream;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Cancellable;
@@ -22,11 +26,6 @@ import org.apache.pekko.stream.javadsl.Flow;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
-import docs.stream.operators.sourceorflow.ExtrapolateAndExpandCommon;
-import docs.stream.operators.sourceorflow.ExtrapolateAndExpandCommon.Frame;
-
-import java.time.Duration;
-import java.util.stream.Stream;
 
 /** */
 public class ExtrapolateAndExpand {
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java
index c6697c7039..b153b354e6 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapConcat.java
@@ -13,12 +13,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class FlatMapConcat {
   private static ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java
index adea90bdec..a0e26c11d6 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/FlatMapMerge.java
@@ -13,12 +13,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class FlatMapMerge {
   private static ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java
index ffd5f8653f..cb28807bb0 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Intersperse.java
@@ -13,11 +13,10 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class Intersperse {
   public static void main(String[] args) {
     ActorSystem system = ActorSystem.create();
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java
index 6a389c18e8..793439af27 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Limit.java
@@ -13,14 +13,13 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.List;
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-
 public class Limit {
   public void simple() {
     ActorSystem<?> system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java
index ab026c2aa3..0e01066b86 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/LimitWeighted.java
@@ -13,13 +13,12 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.concurrent.CompletionStage;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.util.ByteString;
 
-import java.util.concurrent.CompletionStage;
-
 public class LimitWeighted {
   public void simple() {
     ActorSystem<?> system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java
index ecf6d65f02..b1667ce4ba 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapAsyncs.java
@@ -13,17 +13,16 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import org.apache.pekko.NotUsed;
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.pattern.Patterns;
-import org.apache.pekko.stream.javadsl.Sink;
-import org.apache.pekko.stream.javadsl.Source;
-
 import java.time.Duration;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.stream.Stream;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.pattern.Patterns;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 public class MapAsyncs {
 
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java
index 0509a49fcc..54250da9cb 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapConcat.java
@@ -13,11 +13,10 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class MapConcat {
   private static ActorSystem system = null;
 
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java
index d275b03f27..2f68ee18d6 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapError.java
@@ -13,12 +13,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class MapError {
 
   public static void main(String[] args) {
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapWithResource.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapWithResource.java
index 02c9ba8594..a20c762737 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapWithResource.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MapWithResource.java
@@ -17,13 +17,12 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.stream.javadsl.Source;
-
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.stream.javadsl.Source;
 
 public interface MapWithResource {
   // #mapWithResource-blocking-api
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java
index 769e13583d..7fcedd59c0 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/MergeLatest.java
@@ -13,12 +13,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class MergeLatest {
 
   private static final ActorSystem<Void> system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java
index 2c45e66e8a..c9769a4f06 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Monitor.java
@@ -13,6 +13,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.Pair;
@@ -22,12 +27,6 @@ import org.apache.pekko.stream.javadsl.Keep;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
 /** */
 public class Monitor {
 
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java
index a48656e390..3375545806 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Sliding.java
@@ -13,12 +13,11 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import java.util.Arrays;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Arrays;
-
 public class Sliding {
 
   private final ActorSystem<Void> system = null;
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java
index 5fd868dc05..124e9a074d 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Split.java
@@ -13,17 +13,16 @@
 
 package jdocs.stream.operators.sourceorflow;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.japi.Pair;
-import org.apache.pekko.japi.function.Function;
-import org.apache.pekko.stream.javadsl.Sink;
-import org.apache.pekko.stream.javadsl.Source;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Collections;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 public class Split {
   public static void splitWhenExample(String[] args) {
diff --git a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java
index 62ab13732e..dadd7106c0 100644
--- a/docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java
+++ b/docs/src/test/java/jdocs/stream/operators/sourceorflow/Throttle.java
@@ -13,6 +13,9 @@
 
 package jdocs.stream.operators.sourceorflow;
 
+import docs.stream.operators.sourceorflow.ThrottleCommon.Frame;
+import java.time.Duration;
+import java.util.stream.Stream;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.Materializer;
@@ -20,10 +23,6 @@ import org.apache.pekko.stream.ThrottleMode;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.time.Duration;
-import java.util.stream.Stream;
-import docs.stream.operators.sourceorflow.ThrottleCommon.Frame;
-
 /** */
 public class Throttle {
 
diff --git a/docs/src/test/java/jdocs/testkit/ParentChildTest.java b/docs/src/test/java/jdocs/testkit/ParentChildTest.java
index fb6bc8ad04..df4be0a2bc 100644
--- a/docs/src/test/java/jdocs/testkit/ParentChildTest.java
+++ b/docs/src/test/java/jdocs/testkit/ParentChildTest.java
@@ -13,15 +13,15 @@
 
 package jdocs.testkit;
 
+import com.typesafe.config.ConfigFactory;
+import docs.testkit.MockedChild;
+import jdocs.AbstractJavaTest;
 import org.apache.pekko.actor.*;
 import org.apache.pekko.japi.Creator;
 import org.apache.pekko.japi.Function;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.TestProbe;
 import org.apache.pekko.testkit.javadsl.TestKit;
-import com.typesafe.config.ConfigFactory;
-import docs.testkit.MockedChild;
-import jdocs.AbstractJavaTest;
 import org.junit.ClassRule;
 import org.junit.Test;
 
diff --git a/docs/src/test/java/jdocs/testkit/TestKitDocTest.java b/docs/src/test/java/jdocs/testkit/TestKitDocTest.java
index c753a57361..d79955d281 100644
--- a/docs/src/test/java/jdocs/testkit/TestKitDocTest.java
+++ b/docs/src/test/java/jdocs/testkit/TestKitDocTest.java
@@ -15,22 +15,12 @@ package jdocs.testkit;
 
 import static org.junit.Assert.*;
 
-import org.apache.pekko.pattern.Patterns;
-import jdocs.AbstractJavaTest;
-import org.junit.Assert;
-import org.apache.pekko.japi.JavaPartialFunction;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-import org.apache.pekko.testkit.CallingThreadDispatcher;
-import org.apache.pekko.testkit.TestActor;
-import org.apache.pekko.testkit.TestActorRef;
-import org.apache.pekko.testkit.TestProbe;
-import org.apache.pekko.testkit.javadsl.EventFilter;
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import com.typesafe.config.ConfigFactory;
-
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import jdocs.AbstractJavaTest;
+import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.AbstractActorWithTimers;
 import org.apache.pekko.actor.ActorKilledException;
 import org.apache.pekko.actor.ActorRef;
@@ -39,14 +29,20 @@ import org.apache.pekko.actor.Kill;
 import org.apache.pekko.actor.PoisonPill;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.actor.Terminated;
-import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.UntypedAbstractActorWithTimers;
+import org.apache.pekko.japi.JavaPartialFunction;
+import org.apache.pekko.pattern.Patterns;
+import org.apache.pekko.testkit.CallingThreadDispatcher;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.apache.pekko.testkit.TestActor;
 import org.apache.pekko.testkit.TestActor.AutoPilot;
-
-import java.util.List;
-
-import java.util.concurrent.CompletableFuture;
-import java.time.Duration;
+import org.apache.pekko.testkit.TestActorRef;
+import org.apache.pekko.testkit.TestProbe;
+import org.apache.pekko.testkit.javadsl.EventFilter;
+import org.apache.pekko.testkit.javadsl.TestKit;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class TestKitDocTest extends AbstractJavaTest {
 
diff --git a/docs/src/test/java/jdocs/testkit/TestKitSampleTest.java b/docs/src/test/java/jdocs/testkit/TestKitSampleTest.java
index 0670a485c2..52e45a80c9 100644
--- a/docs/src/test/java/jdocs/testkit/TestKitSampleTest.java
+++ b/docs/src/test/java/jdocs/testkit/TestKitSampleTest.java
@@ -14,20 +14,18 @@
 package jdocs.testkit;
 
 // #fullsample
+import java.time.Duration;
 import jdocs.AbstractJavaTest;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.Props;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.actor.Props;
-import org.apache.pekko.actor.AbstractActor;
-
-import java.time.Duration;
-
 public class TestKitSampleTest extends AbstractJavaTest {
 
   public static class SomeActor extends AbstractActor {
diff --git a/docs/src/test/java/jdocs/typed/tutorial_3/Device.java b/docs/src/test/java/jdocs/typed/tutorial_3/Device.java
index dcc4031f9c..653cdab330 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_3/Device.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_3/Device.java
@@ -16,7 +16,6 @@ package jdocs.typed.tutorial_3;
 // #full-device
 
 import java.util.Optional;
-
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
diff --git a/docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java b/docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java
index 1121e80ee1..59f272899e 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_3/DeviceTest.java
@@ -14,14 +14,14 @@
 package jdocs.typed.tutorial_3;
 
 // #device-read-test
+import static org.junit.Assert.assertEquals;
+
+import java.util.Optional;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.junit.ClassRule;
 import org.junit.Test;
-import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
 
 // #device-read-test
 /*
diff --git a/docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java b/docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
index 0c66a9cdd6..5967dde2e7 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_3/inprogress1/Device.java
@@ -21,8 +21,8 @@ package com.example;
 */
 
 // #read-protocol-1
-import org.apache.pekko.actor.typed.ActorRef;
 import java.util.Optional;
+import org.apache.pekko.actor.typed.ActorRef;
 
 public class Device {
 
diff --git a/docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java b/docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java
index 408ebe7353..7af6fc8013 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_3/inprogress2/Device.java
@@ -15,6 +15,7 @@ package jdocs.typed.tutorial_3.inprogress2;
 
 // #device-with-read
 
+import java.util.Optional;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
@@ -23,8 +24,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.util.Optional;
-
 // #read-protocol-2
 public class Device extends AbstractBehavior<Device.Command> {
   public interface Command {}
diff --git a/docs/src/test/java/jdocs/typed/tutorial_4/Device.java b/docs/src/test/java/jdocs/typed/tutorial_4/Device.java
index 0b208f2787..1e22ab055e 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_4/Device.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_4/Device.java
@@ -16,7 +16,6 @@ package jdocs.typed.tutorial_4;
 // #device-with-passivate
 
 import java.util.Optional;
-
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
diff --git a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java
index 73f9e83fb0..672d877a62 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroup.java
@@ -13,6 +13,8 @@
 
 package jdocs.typed.tutorial_4;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
@@ -21,9 +23,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.util.HashMap;
-import java.util.Map;
-
 // #device-group-full
 // #device-group-remove
 // #device-group-register
diff --git a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java
index b794142f4c..5ad71bf48a 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceGroupTest.java
@@ -13,6 +13,15 @@
 
 package jdocs.typed.tutorial_4;
 
+import static jdocs.typed.tutorial_4.DeviceManager.DeviceRegistered;
+import static jdocs.typed.tutorial_4.DeviceManager.ReplyDeviceList;
+import static jdocs.typed.tutorial_4.DeviceManager.RequestDeviceList;
+import static jdocs.typed.tutorial_4.DeviceManager.RequestTrackDevice;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,17 +29,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-import static jdocs.typed.tutorial_4.DeviceManager.DeviceRegistered;
-import static jdocs.typed.tutorial_4.DeviceManager.RequestTrackDevice;
-import static jdocs.typed.tutorial_4.DeviceManager.ReplyDeviceList;
-import static jdocs.typed.tutorial_4.DeviceManager.RequestDeviceList;
-
 public class DeviceGroupTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java
index 782f92ee5f..206252de58 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManager.java
@@ -13,6 +13,10 @@
 
 package jdocs.typed.tutorial_4;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
@@ -21,11 +25,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 // #device-manager-full
 // #device-registration-msgs
 public class DeviceManager extends AbstractBehavior<DeviceManager.Command> {
diff --git a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java
index 9103980fbd..fec799eb91 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceManagerTest.java
@@ -13,6 +13,10 @@
 
 package jdocs.typed.tutorial_4;
 
+import static jdocs.typed.tutorial_4.DeviceManager.DeviceRegistered;
+import static jdocs.typed.tutorial_4.DeviceManager.RequestTrackDevice;
+import static org.junit.Assert.assertNotEquals;
+
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,11 +24,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static org.junit.Assert.assertNotEquals;
-
-import static jdocs.typed.tutorial_4.DeviceManager.DeviceRegistered;
-import static jdocs.typed.tutorial_4.DeviceManager.RequestTrackDevice;
-
 public class DeviceManagerTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java
index 198c99d843..a16c12fbeb 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_4/DeviceTest.java
@@ -13,6 +13,9 @@
 
 package jdocs.typed.tutorial_4;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Optional;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,10 +23,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
-
 public class DeviceTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/Device.java b/docs/src/test/java/jdocs/typed/tutorial_5/Device.java
index fa97690981..0d6d0f56af 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/Device.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/Device.java
@@ -14,7 +14,6 @@
 package jdocs.typed.tutorial_5;
 
 import java.util.Optional;
-
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java
index 3003e555fc..b396731c36 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroup.java
@@ -13,6 +13,9 @@
 
 package jdocs.typed.tutorial_5;
 
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
@@ -21,10 +24,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-
 // #query-added
 public class DeviceGroup extends AbstractBehavior<DeviceGroup.Command> {
 
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java
index 826071bffe..3ed8b2e35a 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQuery.java
@@ -13,6 +13,11 @@
 
 package jdocs.typed.tutorial_5;
 
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
@@ -21,12 +26,6 @@ import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
 
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 // #query-full
 // #query-outline
 public class DeviceGroupQuery extends AbstractBehavior<DeviceGroupQuery.Command> {
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java
index 2e342f9d5c..0e8f4d9c93 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupQueryTest.java
@@ -13,6 +13,18 @@
 
 package jdocs.typed.tutorial_5;
 
+import static jdocs.typed.tutorial_5.DeviceManager.DeviceNotAvailable;
+import static jdocs.typed.tutorial_5.DeviceManager.DeviceTimedOut;
+import static jdocs.typed.tutorial_5.DeviceManager.RespondAllTemperatures;
+import static jdocs.typed.tutorial_5.DeviceManager.Temperature;
+import static jdocs.typed.tutorial_5.DeviceManager.TemperatureNotAvailable;
+import static jdocs.typed.tutorial_5.DeviceManager.TemperatureReading;
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,20 +32,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
-
-import static jdocs.typed.tutorial_5.DeviceManager.RespondAllTemperatures;
-import static jdocs.typed.tutorial_5.DeviceManager.TemperatureReading;
-import static jdocs.typed.tutorial_5.DeviceManager.Temperature;
-import static jdocs.typed.tutorial_5.DeviceManager.TemperatureNotAvailable;
-import static jdocs.typed.tutorial_5.DeviceManager.DeviceTimedOut;
-import static jdocs.typed.tutorial_5.DeviceManager.DeviceNotAvailable;
-
 public class DeviceGroupQueryTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java
index 4785c24241..7d25731862 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceGroupTest.java
@@ -13,6 +13,22 @@
 
 package jdocs.typed.tutorial_5;
 
+import static jdocs.typed.tutorial_5.DeviceManager.DeviceRegistered;
+import static jdocs.typed.tutorial_5.DeviceManager.ReplyDeviceList;
+import static jdocs.typed.tutorial_5.DeviceManager.RequestAllTemperatures;
+import static jdocs.typed.tutorial_5.DeviceManager.RequestDeviceList;
+import static jdocs.typed.tutorial_5.DeviceManager.RequestTrackDevice;
+import static jdocs.typed.tutorial_5.DeviceManager.RespondAllTemperatures;
+import static jdocs.typed.tutorial_5.DeviceManager.Temperature;
+import static jdocs.typed.tutorial_5.DeviceManager.TemperatureNotAvailable;
+import static jdocs.typed.tutorial_5.DeviceManager.TemperatureReading;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,24 +36,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-import static jdocs.typed.tutorial_5.DeviceManager.RespondAllTemperatures;
-import static jdocs.typed.tutorial_5.DeviceManager.TemperatureReading;
-import static jdocs.typed.tutorial_5.DeviceManager.Temperature;
-import static jdocs.typed.tutorial_5.DeviceManager.TemperatureNotAvailable;
-import static jdocs.typed.tutorial_5.DeviceManager.DeviceRegistered;
-import static jdocs.typed.tutorial_5.DeviceManager.RequestTrackDevice;
-import static jdocs.typed.tutorial_5.DeviceManager.ReplyDeviceList;
-import static jdocs.typed.tutorial_5.DeviceManager.RequestDeviceList;
-import static jdocs.typed.tutorial_5.DeviceManager.RequestAllTemperatures;
-
 public class DeviceGroupTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java
index 582ffe2379..e28fb5282e 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManager.java
@@ -13,6 +13,10 @@
 
 package jdocs.typed.tutorial_5;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.PostStop;
@@ -21,11 +25,6 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 public class DeviceManager extends AbstractBehavior<DeviceManager.Command> {
 
   public interface Command {}
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java
index f3b91d3beb..084b30da6f 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceManagerTest.java
@@ -13,6 +13,10 @@
 
 package jdocs.typed.tutorial_5;
 
+import static jdocs.typed.tutorial_5.DeviceManager.DeviceRegistered;
+import static jdocs.typed.tutorial_5.DeviceManager.RequestTrackDevice;
+import static org.junit.Assert.assertNotEquals;
+
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,11 +24,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import static org.junit.Assert.assertNotEquals;
-
-import static jdocs.typed.tutorial_5.DeviceManager.DeviceRegistered;
-import static jdocs.typed.tutorial_5.DeviceManager.RequestTrackDevice;
-
 public class DeviceManagerTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java
index c9603524ca..92461dc6ec 100644
--- a/docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java
+++ b/docs/src/test/java/jdocs/typed/tutorial_5/DeviceTest.java
@@ -13,6 +13,9 @@
 
 package jdocs.typed.tutorial_5;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Optional;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
 import org.apache.pekko.actor.typed.ActorRef;
@@ -20,10 +23,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
-
 public class DeviceTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java b/persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java
index 8371534dba..1509b4d0a5 100644
--- a/persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java
+++ b/persistence-query/src/test/java/org/apache/pekko/persistence/query/DummyJavaReadJournal.java
@@ -14,7 +14,6 @@
 package org.apache.pekko.persistence.query;
 
 import java.util.Iterator;
-
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.persistence.query.javadsl.PersistenceIdsQuery;
 import org.apache.pekko.persistence.query.javadsl.ReadJournal;
diff --git a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java
index d3cc07b5b0..51d2e70038 100644
--- a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java
+++ b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/MyReplicatedBehavior.java
@@ -13,13 +13,12 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.*;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.typed.ReplicaId;
 import org.apache.pekko.persistence.typed.ReplicationId;
 import org.apache.pekko.persistence.typed.javadsl.*;
 
-import java.util.*;
-
 // #factory
 public class MyReplicatedBehavior
     extends ReplicatedEventSourcedBehavior<
diff --git a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java
index 0b39f4ee05..f1fa4c18cf 100644
--- a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java
+++ b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedAuctionExampleTest.java
@@ -13,6 +13,18 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import static jdocs.org.apache.pekko.persistence.typed.AuctionEntity.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -34,24 +46,11 @@ import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
 import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 import org.apache.pekko.persistence.typed.javadsl.SignalHandler;
 import org.apache.pekko.serialization.jackson.CborSerializable;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static jdocs.org.apache.pekko.persistence.typed.AuctionEntity.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class ReplicatedAuctionExampleTest extends JUnitSuite {
   @ClassRule
   public static final TestKitJunitResource testKit =
diff --git a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java
index 24f6d1f436..d7db831c9f 100644
--- a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java
+++ b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedBlogExample.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.Optional;
+import java.util.Set;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
@@ -29,9 +31,6 @@ import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior
 import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
 import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 
-import java.util.Optional;
-import java.util.Set;
-
 interface ReplicatedBlogExample {
 
   public final class BlogEntity
diff --git a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java
index 3a1e5332bd..ea86f30791 100644
--- a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java
+++ b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedMovieExample.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.Collections;
+import java.util.Set;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
@@ -25,9 +27,6 @@ import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior
 import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
 import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 
-import java.util.Collections;
-import java.util.Set;
-
 interface ReplicatedMovieExample {
 
   // #movie-entity
diff --git a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java
index ae1d0e3829..45b607489e 100644
--- a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java
+++ b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedShoppingCartExample.java
@@ -13,6 +13,10 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
@@ -26,11 +30,6 @@ import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcedBehavior
 import org.apache.pekko.persistence.typed.javadsl.ReplicatedEventSourcing;
 import org.apache.pekko.persistence.typed.javadsl.ReplicationContext;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
 interface ReplicatedShoppingCartExample {
 
   // #shopping-cart
diff --git a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java
index acd189f265..c001156ff6 100644
--- a/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java
+++ b/persistence-typed-tests/src/test/java/jdocs/org/apache/pekko/persistence/typed/ReplicatedStringSet.java
@@ -13,15 +13,14 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.HashSet;
+import java.util.Set;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
 import org.apache.pekko.persistence.typed.ReplicaId;
 import org.apache.pekko.persistence.typed.ReplicationId;
 import org.apache.pekko.persistence.typed.javadsl.*;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public final class ReplicatedStringSet
     extends ReplicatedEventSourcedBehavior<ReplicatedStringSet.Command, String, Set<String>> {
   interface Command {}
diff --git a/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java b/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java
index 282b33c648..eed41e9289 100644
--- a/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java
+++ b/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/ReplicatedEventSourcingTest.java
@@ -13,6 +13,11 @@
 
 package org.apache.pekko.persistence.typed;
 
+import static org.apache.pekko.Done.done;
+import static org.junit.Assert.assertEquals;
+
+import com.typesafe.config.ConfigFactory;
+import java.util.*;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -22,17 +27,11 @@ import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.testkit.PersistenceTestKitPlugin;
 import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitReadJournal;
 import org.apache.pekko.persistence.typed.javadsl.*;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.*;
-
-import static org.apache.pekko.Done.done;
-import static org.junit.Assert.assertEquals;
-
 public class ReplicatedEventSourcingTest extends JUnitSuite {
 
   static final class TestBehavior
diff --git a/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java b/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java
index cbc28ba550..cfe79209f5 100644
--- a/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java
+++ b/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedActorFailureTest.java
@@ -13,6 +13,11 @@
 
 package org.apache.pekko.persistence.typed.javadsl;
 
+import static org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehaviorFailureSpec.conf;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.time.Duration;
 import org.apache.pekko.actor.testkit.typed.TestException;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -23,17 +28,11 @@ import org.apache.pekko.actor.typed.SupervisorStrategy;
 import org.apache.pekko.persistence.typed.PersistenceId;
 import org.apache.pekko.persistence.typed.RecoveryCompleted;
 import org.apache.pekko.persistence.typed.RecoveryFailed;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-
-import static org.apache.pekko.persistence.typed.scaladsl.EventSourcedBehaviorFailureSpec.conf;
-
 class FailingEventSourcedActor extends EventSourcedBehavior<String, String, String> {
 
   private final ActorRef<String> probe;
diff --git a/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java b/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
index bb75d62b40..9fc2a3dadd 100644
--- a/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
+++ b/persistence-typed-tests/src/test/java/org/apache/pekko/persistence/typed/javadsl/EventSourcedBehaviorJavaDslTest.java
@@ -13,6 +13,17 @@
 
 package org.apache.pekko.persistence.typed.javadsl;
 
+import static java.util.Collections.singletonList;
+import static org.apache.pekko.Done.done;
+import static org.junit.Assert.assertEquals;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.google.common.collect.Sets;
+import com.typesafe.config.ConfigFactory;
+import java.time.Duration;
+import java.util.*;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit;
@@ -33,24 +44,12 @@ import org.apache.pekko.persistence.testkit.query.javadsl.PersistenceTestKitRead
 import org.apache.pekko.persistence.typed.*;
 import org.apache.pekko.serialization.jackson.CborSerializable;
 import org.apache.pekko.stream.javadsl.Sink;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.google.common.collect.Sets;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import org.slf4j.event.Level;
 
-import java.time.Duration;
-import java.util.*;
-
-import static org.apache.pekko.Done.done;
-import static java.util.Collections.singletonList;
-import static org.junit.Assert.assertEquals;
-
 public class EventSourcedBehaviorJavaDslTest extends JUnitSuite {
 
   @ClassRule
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java
index eec5085a72..6db887b12a 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/MovieWatchList.java
@@ -13,6 +13,9 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.persistence.typed.PersistenceId;
@@ -20,10 +23,6 @@ import org.apache.pekko.persistence.typed.javadsl.CommandHandler;
 import org.apache.pekko.persistence.typed.javadsl.EventHandler;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 public class MovieWatchList
     extends EventSourcedBehavior<
         MovieWatchList.Command, MovieWatchList.Event, MovieWatchList.MovieList> {
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java
index 542af06b0e..71f1326b88 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/OptionalBlogState.java
@@ -13,13 +13,12 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.util.Optional;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.persistence.typed.PersistenceId;
 import org.apache.pekko.persistence.typed.javadsl.*;
 
-import java.util.Optional;
-
 public class OptionalBlogState {
 
   interface BlogEvent {}
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
index 50c9d49c64..83d945b273 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/PersistentFsmToTypedMigrationCompileOnlyTest.java
@@ -13,15 +13,14 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import static jdocs.org.apache.pekko.persistence.typed.WebStoreCustomerFSM.*;
+
+import java.time.Duration;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
 import org.apache.pekko.persistence.typed.*;
 import org.apache.pekko.persistence.typed.javadsl.*;
 
-import java.time.Duration;
-
-import static jdocs.org.apache.pekko.persistence.typed.WebStoreCustomerFSM.*;
-
 @Deprecated
 public class PersistentFsmToTypedMigrationCompileOnlyTest {
 
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java
index 9ca05bd0c9..3ac21b3318 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/StashingExample.java
@@ -13,6 +13,8 @@
 
 package jdocs.org.apache.pekko.persistence.typed;
 
+import java.time.Duration;
+import java.util.Optional;
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.SupervisorStrategy;
 import org.apache.pekko.persistence.typed.PersistenceId;
@@ -21,9 +23,6 @@ import org.apache.pekko.persistence.typed.javadsl.Effect;
 import org.apache.pekko.persistence.typed.javadsl.EventHandler;
 import org.apache.pekko.persistence.typed.javadsl.EventSourcedBehavior;
 
-import java.time.Duration;
-import java.util.Optional;
-
 public interface StashingExample {
 
   // #stashing
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java
index 857bfb3494..14fa0d3d5a 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/WebStoreCustomerFSM.java
@@ -14,10 +14,9 @@
 package jdocs.org.apache.pekko.persistence.typed;
 
 import java.io.Serializable;
-
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * The model from org.apache.pekko.persistence.fsm.AbstractPersistentFSMTest.WebStoreCustomerFSM
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java
index e6c6ff2959..87c1becdfc 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionCommand.java
@@ -13,11 +13,10 @@
 
 package jdocs.org.apache.pekko.persistence.typed.auction;
 
+import java.util.UUID;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
 
-import java.util.UUID;
-
 /** An auction command. */
 public interface AuctionCommand {
 
diff --git a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java
index c70d454104..f910c44b42 100644
--- a/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java
+++ b/persistence-typed/src/test/java/jdocs/org/apache/pekko/persistence/typed/auction/AuctionEntity.java
@@ -13,10 +13,6 @@
 
 package jdocs.org.apache.pekko.persistence.typed.auction;
 
-import org.apache.pekko.Done;
-import org.apache.pekko.persistence.typed.PersistenceId;
-import org.apache.pekko.persistence.typed.javadsl.*;
-
 import static jdocs.org.apache.pekko.persistence.typed.auction.AuctionCommand.*;
 import static jdocs.org.apache.pekko.persistence.typed.auction.AuctionEvent.*;
 
@@ -24,7 +20,10 @@ import java.time.Instant;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.UUID;
+import org.apache.pekko.Done;
 import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.persistence.typed.PersistenceId;
+import org.apache.pekko.persistence.typed.javadsl.*;
 
 /**
  * Based on
diff --git a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java
index a6fab5a611..85a62042d5 100644
--- a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java
+++ b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/LoggerSourceTest.java
@@ -13,6 +13,11 @@
 
 package org.apache.pekko.persistence.typed.javadsl;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.LoggingTestKit;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
@@ -23,17 +28,11 @@ import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.persistence.typed.PersistenceId;
 import org.apache.pekko.persistence.typed.RecoveryCompleted;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
 public class LoggerSourceTest extends JUnitSuite {
 
   private static final Config config =
diff --git a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java
index c0a3401b28..6e3fffdab1 100644
--- a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java
+++ b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/NullEmptyStateTest.java
@@ -13,6 +13,8 @@
 
 package org.apache.pekko.persistence.typed.javadsl;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -21,8 +23,6 @@ import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.persistence.typed.PersistenceId;
 import org.apache.pekko.persistence.typed.RecoveryCompleted;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
index 8613bba7a4..78c3ccc040 100644
--- a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
+++ b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PersistentActorCompileOnlyTest.java
@@ -13,20 +13,19 @@
 
 package org.apache.pekko.persistence.typed.javadsl;
 
-import org.apache.pekko.actor.typed.Behavior;
-import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import static org.apache.pekko.actor.typed.javadsl.AskPattern.ask;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletionStage;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestInbox;
 import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.Scheduler;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.japi.function.Procedure;
 import org.apache.pekko.persistence.typed.*;
-import org.apache.pekko.actor.testkit.typed.javadsl.TestInbox;
-
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.CompletionStage;
-
-import static org.apache.pekko.actor.typed.javadsl.AskPattern.ask;
 
 public class PersistentActorCompileOnlyTest {
 
diff --git a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java
index 2ad5fd4bea..a496878f18 100644
--- a/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java
+++ b/persistence-typed/src/test/java/org/apache/pekko/persistence/typed/javadsl/PrimitiveStateTest.java
@@ -13,6 +13,8 @@
 
 package org.apache.pekko.persistence.typed.javadsl;
 
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import org.apache.pekko.actor.testkit.typed.javadsl.LogCapturing;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -21,8 +23,6 @@ import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.persistence.typed.PersistenceId;
 import org.apache.pekko.persistence.typed.RecoveryCompleted;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java b/persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
index 5613936493..4c308bb727 100644
--- a/persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
+++ b/persistence/src/main/java/org/apache/pekko/persistence/fsm/japi/pf/FSMStateFunctionBuilder.java
@@ -13,12 +13,11 @@
 
 package org.apache.pekko.persistence.fsm.japi.pf;
 
+import java.util.List;
 import org.apache.pekko.japi.pf.FI;
 import org.apache.pekko.japi.pf.PFBuilder;
 import scala.PartialFunction;
 
-import java.util.List;
-
 /**
  * Builder used to create a partial function for {@link org.apache.pekko.actor.FSM#whenUnhandled}.
  *
diff --git a/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java b/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java
index 11200ce999..fa644386a2 100644
--- a/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java
+++ b/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncRecoveryPlugin.java
@@ -14,10 +14,8 @@
 package org.apache.pekko.persistence.journal.japi;
 
 import java.util.function.Consumer;
-
-import scala.concurrent.Future;
-
 import org.apache.pekko.persistence.PersistentRepr;
+import scala.concurrent.Future;
 
 interface AsyncRecoveryPlugin {
   // #async-replay-plugin-api
diff --git a/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java b/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java
index 3eba7b5cde..cfa533a3cb 100644
--- a/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java
+++ b/persistence/src/main/java/org/apache/pekko/persistence/journal/japi/AsyncWritePlugin.java
@@ -14,10 +14,8 @@
 package org.apache.pekko.persistence.journal.japi;
 
 import java.util.Optional;
-
-import scala.concurrent.Future;
-
 import org.apache.pekko.persistence.*;
+import scala.concurrent.Future;
 
 interface AsyncWritePlugin {
   // #async-write-plugin-api
diff --git a/persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java b/persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java
index 20313bb318..91872a327a 100644
--- a/persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java
+++ b/persistence/src/main/java/org/apache/pekko/persistence/snapshot/japi/SnapshotStorePlugin.java
@@ -13,13 +13,12 @@
 
 package org.apache.pekko.persistence.snapshot.japi;
 
+import java.util.Optional;
 import org.apache.pekko.persistence.SelectedSnapshot;
 import org.apache.pekko.persistence.SnapshotMetadata;
 import org.apache.pekko.persistence.SnapshotSelectionCriteria;
 import scala.concurrent.Future;
 
-import java.util.Optional;
-
 interface SnapshotStorePlugin {
   // #snapshot-store-plugin-api
   /**
diff --git a/persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java b/persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
index fe910a88e8..a9965c8409 100644
--- a/persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
+++ b/persistence/src/test/java/org/apache/pekko/persistence/fsm/AbstractPersistentFSMTest.java
@@ -13,13 +13,12 @@
 
 package org.apache.pekko.persistence.fsm;
 
-import org.apache.pekko.actor.*;
-
 import java.io.Serializable;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.time.Duration;
+import org.apache.pekko.actor.*;
 
 @Deprecated
 public class AbstractPersistentFSMTest {
diff --git a/project/JavaFormatter.scala b/project/JavaFormatter.scala
index 6c37e78f1b..f842266dee 100644
--- a/project/JavaFormatter.scala
+++ b/project/JavaFormatter.scala
@@ -11,7 +11,7 @@
  * Copyright (C) 2019-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
-import com.lightbend.sbt.JavaFormatterPlugin
+import com.github.sbt.JavaFormatterPlugin
 import sbt.{ AutoPlugin, PluginTrigger, Plugins }
 
 object JavaFormatter extends AutoPlugin {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 4d0e602066..e32fefcd21 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -9,7 +9,7 @@
 
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
 
-addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
+addSbtPlugin("com.github.sbt" % "sbt-java-formatter" % "0.9.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-bill-of-materials" % "1.0.2")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.5")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3")
diff --git a/remote/src/main/java/org/apache/pekko/remote/artery/aeron/AeronErrorLog.java b/remote/src/main/java/org/apache/pekko/remote/artery/aeron/AeronErrorLog.java
index 21c32a3a6c..9fdc27c7be 100644
--- a/remote/src/main/java/org/apache/pekko/remote/artery/aeron/AeronErrorLog.java
+++ b/remote/src/main/java/org/apache/pekko/remote/artery/aeron/AeronErrorLog.java
@@ -16,20 +16,18 @@
 
 package org.apache.pekko.remote.artery.aeron;
 
-import org.apache.pekko.event.NoLogging;
 import io.aeron.CncFileDescriptor;
+import java.io.File;
+import java.nio.MappedByteBuffer;
+import java.util.concurrent.atomic.AtomicLong;
 import org.agrona.DirectBuffer;
 import org.agrona.IoUtil;
 import org.agrona.concurrent.AtomicBuffer;
 import org.agrona.concurrent.errors.ErrorLogReader;
-
 import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.event.NoLogging;
 import org.apache.pekko.util.Helpers;
 
-import java.io.File;
-import java.nio.MappedByteBuffer;
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
  * INTERNAL API
  *
diff --git a/remote/src/test/java/org/apache/pekko/remote/artery/aeron/AeronStat.java b/remote/src/test/java/org/apache/pekko/remote/artery/aeron/AeronStat.java
index b7a3b76d94..cf12053888 100644
--- a/remote/src/test/java/org/apache/pekko/remote/artery/aeron/AeronStat.java
+++ b/remote/src/test/java/org/apache/pekko/remote/artery/aeron/AeronStat.java
@@ -16,6 +16,18 @@
 
 package org.apache.pekko.remote.artery.aeron;
 
+import static io.aeron.CncFileDescriptor.*;
+import static io.aeron.driver.status.PerImageIndicator.PER_IMAGE_TYPE_ID;
+import static io.aeron.driver.status.PublisherLimit.PUBLISHER_LIMIT_TYPE_ID;
+import static io.aeron.driver.status.ReceiveChannelStatus.RECEIVE_CHANNEL_STATUS_TYPE_ID;
+import static io.aeron.driver.status.ReceiverPos.RECEIVER_POS_TYPE_ID;
+import static io.aeron.driver.status.SendChannelStatus.SEND_CHANNEL_STATUS_TYPE_ID;
+import static io.aeron.driver.status.StreamCounter.*;
+import static io.aeron.driver.status.SystemCounterDescriptor.SYSTEM_COUNTER_TYPE_ID;
+
+import io.aeron.CncFileDescriptor;
+import io.aeron.CommonContext;
+import io.aeron.status.ChannelEndpointStatus;
 import java.io.File;
 import java.io.PrintStream;
 import java.nio.MappedByteBuffer;
@@ -23,23 +35,10 @@ import java.util.Date;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
-
-import io.aeron.CncFileDescriptor;
-import io.aeron.CommonContext;
-import io.aeron.status.ChannelEndpointStatus;
 import org.agrona.DirectBuffer;
 import org.agrona.IoUtil;
-import org.agrona.concurrent.status.CountersReader;
 import org.agrona.concurrent.SigInt;
-
-import static io.aeron.CncFileDescriptor.*;
-import static io.aeron.driver.status.PerImageIndicator.PER_IMAGE_TYPE_ID;
-import static io.aeron.driver.status.PublisherLimit.PUBLISHER_LIMIT_TYPE_ID;
-import static io.aeron.driver.status.ReceiveChannelStatus.RECEIVE_CHANNEL_STATUS_TYPE_ID;
-import static io.aeron.driver.status.ReceiverPos.RECEIVER_POS_TYPE_ID;
-import static io.aeron.driver.status.SendChannelStatus.SEND_CHANNEL_STATUS_TYPE_ID;
-import static io.aeron.driver.status.StreamCounter.*;
-import static io.aeron.driver.status.SystemCounterDescriptor.SYSTEM_COUNTER_TYPE_ID;
+import org.agrona.concurrent.status.CountersReader;
 
 /**
  * Tool for printing out Aeron counters. A command-and-control (cnc) file is maintained by media
diff --git a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1withv2/ItemAddedMigration.java b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1withv2/ItemAddedMigration.java
index 02dbfa35c6..45dfe55aa7 100644
--- a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1withv2/ItemAddedMigration.java
+++ b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v1withv2/ItemAddedMigration.java
@@ -15,9 +15,9 @@ package jdoc.org.apache.pekko.serialization.jackson.v1withv2;
 
 // #forward-one-rename
 
-import org.apache.pekko.serialization.jackson.JacksonMigration;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.pekko.serialization.jackson.JacksonMigration;
 
 public class ItemAddedMigration extends JacksonMigration {
 
diff --git a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/Customer.java b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/Customer.java
index bada788f98..2eb2241303 100644
--- a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/Customer.java
+++ b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/Customer.java
@@ -13,9 +13,8 @@
 
 package jdoc.org.apache.pekko.serialization.jackson.v2a;
 
-import jdoc.org.apache.pekko.serialization.jackson.MySerializable;
-
 import java.util.Optional;
+import jdoc.org.apache.pekko.serialization.jackson.MySerializable;
 
 // #structural
 public class Customer implements MySerializable {
diff --git a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/CustomerMigration.java b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/CustomerMigration.java
index 4867d2dde2..3ce42d6e77 100644
--- a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/CustomerMigration.java
+++ b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/CustomerMigration.java
@@ -14,9 +14,9 @@
 package jdoc.org.apache.pekko.serialization.jackson.v2a;
 
 // #structural
-import org.apache.pekko.serialization.jackson.JacksonMigration;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.pekko.serialization.jackson.JacksonMigration;
 
 public class CustomerMigration extends JacksonMigration {
 
diff --git a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/ItemAdded.java b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/ItemAdded.java
index 875f1e89e4..4f2b4b8ca8 100644
--- a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/ItemAdded.java
+++ b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/ItemAdded.java
@@ -14,9 +14,8 @@
 package jdoc.org.apache.pekko.serialization.jackson.v2a;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import jdoc.org.apache.pekko.serialization.jackson.MySerializable;
-
 import java.util.Optional;
+import jdoc.org.apache.pekko.serialization.jackson.MySerializable;
 
 // #add-optional
 public class ItemAdded implements MySerializable {
diff --git a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/OrderPlacedMigration.java b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/OrderPlacedMigration.java
index 754af8cfe0..81f106e036 100644
--- a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/OrderPlacedMigration.java
+++ b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2a/OrderPlacedMigration.java
@@ -13,8 +13,8 @@
 
 package jdoc.org.apache.pekko.serialization.jackson.v2a;
 
-import org.apache.pekko.serialization.jackson.JacksonMigration;
 import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.pekko.serialization.jackson.JacksonMigration;
 
 // #rename-class
 public class OrderPlacedMigration extends JacksonMigration {
diff --git a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.java b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.java
index 01ff271a5c..91c81eec75 100644
--- a/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.java
+++ b/serialization-jackson/src/test/java/jdoc/org/apache/pekko/serialization/jackson/v2c/ItemAddedMigration.java
@@ -15,9 +15,9 @@ package jdoc.org.apache.pekko.serialization.jackson.v2c;
 
 // #rename
 
-import org.apache.pekko.serialization.jackson.JacksonMigration;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.pekko.serialization.jackson.JacksonMigration;
 
 public class ItemAddedMigration extends JacksonMigration {
 
diff --git a/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestEventMigrationV2.java b/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestEventMigrationV2.java
index e52d3bd146..1938c6c323 100644
--- a/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestEventMigrationV2.java
+++ b/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestEventMigrationV2.java
@@ -13,10 +13,9 @@
 
 package org.apache.pekko.serialization.jackson;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.IntNode;
-
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.JsonNode;
 
 public class JavaTestEventMigrationV2 extends JacksonMigration {
 
diff --git a/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestMessages.java b/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestMessages.java
index 870ff07cfa..507a240f2b 100644
--- a/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestMessages.java
+++ b/serialization-jackson/src/test/java/org/apache/pekko/serialization/jackson/JavaTestMessages.java
@@ -13,18 +13,17 @@
 
 package org.apache.pekko.serialization.jackson;
 
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.actor.Address;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.actor.Address;
 
 public interface JavaTestMessages {
 
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/StreamAttributeDocTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/StreamAttributeDocTest.java
index 851fada7f8..a83809e62d 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/StreamAttributeDocTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/StreamAttributeDocTest.java
@@ -13,6 +13,11 @@
 
 package org.apache.pekko.stream;
 
+import com.typesafe.config.ConfigFactory;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.stream.javadsl.Keep;
 import org.apache.pekko.stream.javadsl.RunnableGraph;
@@ -21,15 +26,9 @@ import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.scaladsl.TcpAttributes;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
-import com.typesafe.config.ConfigFactory;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
 public class StreamAttributeDocTest extends StreamTest {
 
   public StreamAttributeDocTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/io/InputStreamSinkTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/io/InputStreamSinkTest.java
index 6f06f205c2..beafd668d9 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/io/InputStreamSinkTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/io/InputStreamSinkTest.java
@@ -13,24 +13,23 @@
 
 package org.apache.pekko.stream.io;
 
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.StreamConverters;
 import org.apache.pekko.stream.testkit.Utils;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.util.ByteString;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.io.InputStream;
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertTrue;
-
 public class InputStreamSinkTest extends StreamTest {
   public InputStreamSinkTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSinkTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSinkTest.java
index fc3d973a16..d683ab675b 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSinkTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSinkTest.java
@@ -13,25 +13,24 @@
 
 package org.apache.pekko.stream.io;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.OutputStream;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.stream.IOOperationIncompleteException;
 import org.apache.pekko.stream.IOResult;
 import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.StreamConverters;
 import org.apache.pekko.stream.testkit.Utils;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.util.ByteString;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.io.OutputStream;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class OutputStreamSinkTest extends StreamTest {
   public OutputStreamSinkTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSourceTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSourceTest.java
index 18a6f74605..632bd2034d 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSourceTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/io/OutputStreamSourceTest.java
@@ -17,20 +17,18 @@ import static org.junit.Assert.assertEquals;
 
 import java.io.OutputStream;
 import java.time.Duration;
-
-import org.apache.pekko.testkit.javadsl.TestKit;
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.japi.function.Procedure;
 import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.StreamConverters;
 import org.apache.pekko.stream.testkit.Utils;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.apache.pekko.util.ByteString;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class OutputStreamSourceTest extends StreamTest {
   public OutputStreamSourceTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/io/SinkAsJavaSourceTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/io/SinkAsJavaSourceTest.java
index ddde1724a2..054e33a6c4 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/io/SinkAsJavaSourceTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/io/SinkAsJavaSourceTest.java
@@ -13,22 +13,21 @@
 
 package org.apache.pekko.stream.io;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.StreamConverters;
 import org.apache.pekko.stream.testkit.Utils;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.junit.Assert.assertEquals;
-
 public class SinkAsJavaSourceTest extends StreamTest {
   public SinkAsJavaSourceTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/AttributesTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/AttributesTest.java
index 858f67a9f4..01497b6c0c 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/AttributesTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/AttributesTest.java
@@ -18,14 +18,12 @@ import static org.junit.Assert.assertEquals;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Optional;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-
 import org.apache.pekko.stream.Attributes;
 import org.apache.pekko.stream.StreamTest;
 import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class AttributesTest extends StreamTest {
 
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
index c2603a8c4d..a590eac908 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
@@ -13,8 +13,24 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.apache.pekko.Done.done;
+import static org.apache.pekko.stream.testkit.StreamTestKit.PublisherProbeSubscription;
+import static org.junit.Assert.*;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorRef;
@@ -23,35 +39,18 @@ import org.apache.pekko.japi.Pair;
 import org.apache.pekko.japi.function.*;
 import org.apache.pekko.japi.pf.PFBuilder;
 import org.apache.pekko.stream.*;
-import org.apache.pekko.stream.scaladsl.FlowSpec;
-import org.apache.pekko.stream.testkit.javadsl.TestSink;
 import org.apache.pekko.stream.javadsl.GraphDSL.Builder;
+import org.apache.pekko.stream.scaladsl.FlowSpec;
 import org.apache.pekko.stream.stage.*;
-import org.apache.pekko.testkit.PekkoSpec;
 import org.apache.pekko.stream.testkit.TestPublisher;
+import org.apache.pekko.stream.testkit.javadsl.TestSink;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.apache.pekko.testkit.PekkoSpec;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-
-import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.time.Duration;
-
-import static org.apache.pekko.Done.done;
-import static org.apache.pekko.stream.testkit.StreamTestKit.PublisherProbeSubscription;
-import static org.junit.Assert.*;
 
 @SuppressWarnings("serial")
 public class FlowTest extends StreamTest {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowThrottleTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowThrottleTest.java
index e090acc0a3..c420406c57 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowThrottleTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowThrottleTest.java
@@ -13,6 +13,12 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.stream.StreamTest;
 import org.apache.pekko.stream.ThrottleMode;
@@ -21,13 +27,6 @@ import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class FlowThrottleTest extends StreamTest {
   public FlowThrottleTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextTest.java
index 1e25f14d82..ef8e605050 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextTest.java
@@ -13,6 +13,12 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.apache.pekko.NotUsed.notUsed;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.StreamTest;
@@ -21,13 +27,6 @@ import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.pekko.NotUsed.notUsed;
-import static org.junit.Assert.assertEquals;
-
 public class FlowWithContextTest extends StreamTest {
 
   public FlowWithContextTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextThrottleTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextThrottleTest.java
index deb3b5ccf6..c12e55252e 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextThrottleTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowWithContextThrottleTest.java
@@ -13,6 +13,11 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.StreamTest;
@@ -22,12 +27,6 @@ import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class FlowWithContextThrottleTest extends StreamTest {
 
   public FlowWithContextThrottleTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FramingTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FramingTest.java
index d975c98227..23b2256d31 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FramingTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FramingTest.java
@@ -15,11 +15,11 @@ package org.apache.pekko.stream.javadsl;
 
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.stream.StreamTest;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
 import org.apache.pekko.util.ByteString;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 
 public class FramingTest extends StreamTest {
   public FramingTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java
index 8f0dc3b4c4..06005ca697 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/GraphDslTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
@@ -23,14 +30,6 @@ import org.junit.Assert;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.*;
-
 public class GraphDslTest extends StreamTest {
   public GraphDslTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/JsonFramingTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/JsonFramingTest.java
index 9d5109ceef..4e5d1a9a69 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/JsonFramingTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/JsonFramingTest.java
@@ -13,12 +13,7 @@
 
 package org.apache.pekko.stream.javadsl;
 
-import org.apache.pekko.util.ByteString;
-import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-import org.apache.pekko.testkit.PekkoSpec;
-import org.junit.ClassRule;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,8 +21,12 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-
-import static org.junit.Assert.assertEquals;
+import org.apache.pekko.stream.StreamTest;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.apache.pekko.testkit.PekkoSpec;
+import org.apache.pekko.util.ByteString;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class JsonFramingTest extends StreamTest {
   public JsonFramingTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/KillSwitchTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/KillSwitchTest.java
index 705353e59b..0d3279d122 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/KillSwitchTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/KillSwitchTest.java
@@ -13,22 +13,21 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.apache.pekko.Done.done;
+import static org.junit.Assert.*;
+
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.testkit.TestPublisher;
 import org.apache.pekko.stream.testkit.TestSubscriber;
 import org.apache.pekko.stream.testkit.Utils;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-
-import static org.apache.pekko.Done.done;
-import static org.junit.Assert.*;
-
 public class KillSwitchTest extends StreamTest {
   public KillSwitchTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureFlowTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureFlowTest.java
index 943c169e47..a5f7a50d58 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureFlowTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureFlowTest.java
@@ -13,19 +13,18 @@
 
 package org.apache.pekko.stream.javadsl;
 
-import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
-import org.apache.pekko.testkit.PekkoSpec;
-import org.junit.ClassRule;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
+import org.apache.pekko.stream.StreamTest;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
+import org.apache.pekko.testkit.PekkoSpec;
+import org.junit.ClassRule;
+import org.junit.Test;
 
 public class LazyAndFutureFlowTest extends StreamTest {
 
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureSourcesTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureSourcesTest.java
index f379b49ce0..ea98d6eef6 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureSourcesTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/LazyAndFutureSourcesTest.java
@@ -13,6 +13,13 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.StreamTest;
@@ -22,14 +29,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import scala.concurrent.Future;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class LazyAndFutureSourcesTest extends StreamTest {
 
   @ClassRule
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RetryFlowTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RetryFlowTest.java
index 284e961baf..8d4a1ffe62 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RetryFlowTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RetryFlowTest.java
@@ -13,6 +13,10 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.Optional;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.StreamTest;
@@ -28,11 +32,6 @@ import scala.util.Failure;
 import scala.util.Success;
 import scala.util.Try;
 
-import java.time.Duration;
-import java.util.Optional;
-
-import static org.junit.Assert.assertEquals;
-
 public class RetryFlowTest extends StreamTest {
   public RetryFlowTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RunnableGraphTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RunnableGraphTest.java
index 08575c752f..ba9b94e78a 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RunnableGraphTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/RunnableGraphTest.java
@@ -13,6 +13,8 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.*;
+
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.stream.StreamTest;
 import org.apache.pekko.stream.SystemMaterializer;
@@ -21,8 +23,6 @@ import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class RunnableGraphTest extends StreamTest {
   public RunnableGraphTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SetupTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SetupTest.java
index 5ad04f6dd2..c41f05c119 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SetupTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SetupTest.java
@@ -13,6 +13,10 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.StreamTest;
@@ -21,11 +25,6 @@ import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class SetupTest extends StreamTest {
   public SetupTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SinkTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SinkTest.java
index 5f934ed55c..c912e734aa 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SinkTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SinkTest.java
@@ -13,6 +13,14 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
@@ -32,15 +40,6 @@ import org.junit.Test;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscription;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.*;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.*;
-
 public class SinkTest extends StreamTest {
   public SinkTest() {
     super(actorSystemResource);
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceRunWithTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceRunWithTest.java
index 8b1fae8911..adb1e7cd9a 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceRunWithTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceRunWithTest.java
@@ -13,11 +13,10 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import java.util.concurrent.CompletableFuture;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.stream.Materializer;
 
-import java.util.concurrent.CompletableFuture;
-
 public class SourceRunWithTest {
 
   public void sourceRunWithCompileOnlyTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceUnfoldTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceUnfoldTest.java
index a778d894ec..fb3c6fbf94 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceUnfoldTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceUnfoldTest.java
@@ -13,12 +13,11 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import java.util.Optional;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.japi.function.Function;
 
-import java.util.Optional;
-
 public class SourceUnfoldTest {
 
   public static // #signature
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceWithContextThrottleTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceWithContextThrottleTest.java
index b44a390db6..54f0592de9 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceWithContextThrottleTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/SourceWithContextThrottleTest.java
@@ -13,6 +13,12 @@
 
 package org.apache.pekko.stream.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.StreamTest;
 import org.apache.pekko.stream.ThrottleMode;
@@ -21,13 +27,6 @@ import org.apache.pekko.testkit.PekkoSpec;
 import org.junit.ClassRule;
 import org.junit.Test;
 
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class SourceWithContextThrottleTest extends StreamTest {
 
   public SourceWithContextThrottleTest() {
diff --git a/stream-tests/src/test/java/org/apache/pekko/stream/stage/StageTest.java b/stream-tests/src/test/java/org/apache/pekko/stream/stage/StageTest.java
index 1b0333127a..5c3ab420c1 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/stage/StageTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/stage/StageTest.java
@@ -13,21 +13,20 @@
 
 package org.apache.pekko.stream.stage;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.stream.StreamTest;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.PekkoSpec;
-
 import org.junit.ClassRule;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
 
 public class StageTest extends StreamTest {
   public StageTest() {
diff --git a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkExample.java b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkExample.java
index 199eca7f05..9d50e23d2f 100644
--- a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkExample.java
+++ b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkExample.java
@@ -20,6 +20,7 @@ import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.typed.javadsl.ActorSink;
+
 // #actor-sink-ref
 
 public class ActorSinkExample {
diff --git a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkWithAckExample.java b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkWithAckExample.java
index 3c858b897a..7c4bb1df38 100644
--- a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkWithAckExample.java
+++ b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSinkWithAckExample.java
@@ -20,6 +20,7 @@ import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.typed.javadsl.ActorSink;
+
 // #actor-sink-ref-with-backpressure
 
 public class ActorSinkWithAckExample {
diff --git a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceExample.java b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceExample.java
index 632444a349..18cd73cc38 100644
--- a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceExample.java
+++ b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceExample.java
@@ -14,6 +14,7 @@
 package docs.org.apache.pekko.stream.typed;
 
 // #actor-source-ref
+import java.util.Optional;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.japi.JavaPartialFunction;
@@ -22,7 +23,6 @@ import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.typed.javadsl.ActorSource;
 
-import java.util.Optional;
 // #actor-source-ref
 
 public class ActorSourceExample {
diff --git a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceWithBackpressureExample.java b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceWithBackpressureExample.java
index 1dece774ad..d0810ac345 100644
--- a/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceWithBackpressureExample.java
+++ b/stream-typed/src/test/java/docs/org/apache/pekko/stream/typed/ActorSourceWithBackpressureExample.java
@@ -14,6 +14,7 @@
 package docs.org.apache.pekko.stream.typed;
 
 // #sample
+import java.util.Optional;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.actor.typed.Behavior;
@@ -26,8 +27,6 @@ import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.typed.javadsl.ActorSource;
 
-import java.util.Optional;
-
 class StreamFeeder extends AbstractBehavior<StreamFeeder.Emitted> {
   /** Signals that the latest element is emitted into the stream */
   public enum Emitted {
diff --git a/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/ActorSourceSinkCompileTest.java b/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/ActorSourceSinkCompileTest.java
index 83e6e98e75..32b57f6e8e 100644
--- a/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/ActorSourceSinkCompileTest.java
+++ b/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/ActorSourceSinkCompileTest.java
@@ -13,14 +13,13 @@
 
 package org.apache.pekko.stream.typed.javadsl;
 
+import java.util.Optional;
 import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.ActorSystem;
 import org.apache.pekko.stream.OverflowStrategy;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 
-import java.util.Optional;
-
 public class ActorSourceSinkCompileTest {
 
   interface Protocol {}
diff --git a/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/CustomGuardianAndMaterializerTest.java b/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/CustomGuardianAndMaterializerTest.java
index 0fe48c045a..6ddc8213ae 100644
--- a/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/CustomGuardianAndMaterializerTest.java
+++ b/stream-typed/src/test/java/org/apache/pekko/stream/typed/javadsl/CustomGuardianAndMaterializerTest.java
@@ -13,6 +13,10 @@
 
 package org.apache.pekko.stream.typed.javadsl;
 
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestKitJunitResource;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
@@ -27,11 +31,6 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class CustomGuardianAndMaterializerTest extends JUnitSuite {
 
   @ClassRule public static final TestKitJunitResource testKit = new TestKitJunitResource();
diff --git a/testkit/src/test/java/org/apache/pekko/testkit/PekkoJUnitActorSystemResource.java b/testkit/src/test/java/org/apache/pekko/testkit/PekkoJUnitActorSystemResource.java
index 682cda8c08..d043b5aed8 100644
--- a/testkit/src/test/java/org/apache/pekko/testkit/PekkoJUnitActorSystemResource.java
+++ b/testkit/src/test/java/org/apache/pekko/testkit/PekkoJUnitActorSystemResource.java
@@ -13,10 +13,9 @@
 
 package org.apache.pekko.testkit;
 
+import com.typesafe.config.Config;
 import org.apache.pekko.actor.ActorSystem;
-
 import org.apache.pekko.testkit.javadsl.TestKit;
-import com.typesafe.config.Config;
 import org.junit.rules.ExternalResource;
 
 /**
diff --git a/testkit/src/test/java/org/apache/pekko/testkit/javadsl/TestKitApiTest.java b/testkit/src/test/java/org/apache/pekko/testkit/javadsl/TestKitApiTest.java
index 17716ce3f8..d4dc27a481 100644
--- a/testkit/src/test/java/org/apache/pekko/testkit/javadsl/TestKitApiTest.java
+++ b/testkit/src/test/java/org/apache/pekko/testkit/javadsl/TestKitApiTest.java
@@ -13,15 +13,14 @@
 
 package org.apache.pekko.testkit.javadsl;
 
+import java.time.Duration;
+import java.util.List;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.actor.Props;
 import org.apache.pekko.actor.SupervisorStrategy;
 import org.apache.pekko.testkit.TestActor;
 
-import java.time.Duration;
-import java.util.List;
-
 public class TestKitApiTest {
 
   public void compileOnlyTestCase() {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org