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/08/24 11:34:52 UTC

(pekko) 01/01: chore: format with javafmt

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

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

commit f813633717ad8bc16aa028c80497a79aa197fe36
Author: He-Pin <he...@gmail.com>
AuthorDate: Sun Aug 24 18:40:10 2025 +0800

    chore: format with javafmt
---
 .../javadsl/JUnit5IntegrationExampleTest.java      |   8 +-
 .../javadsl/LogCapturingExtensionExampleTest.java  |   4 +-
 .../typed/javadsl/ManualTimerExampleTest.java      |  13 +-
 .../typed/javadsl/SyncTestingExampleTest.java      |  19 +-
 .../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  |  10 +-
 .../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  |  12 +-
 .../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     |   8 +-
 .../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   |   9 +-
 .../pekko/typed/InteractionPatternsTest.java       |  30 +-
 .../org/apache/pekko/typed/MailboxDocTest.java     |   2 +-
 .../jdocs/org/apache/pekko/typed/RouterTest.java   |  11 +-
 .../org/apache/pekko/typed/StashDocSample.java     |   3 +-
 .../jdocs/org/apache/pekko/typed/StashDocTest.java |  11 +-
 .../apache/pekko/typed/StyleGuideDocExamples.java  |  16 +-
 .../jdocs/org/apache/pekko/typed/TailChopping.java |   5 +-
 .../coexistence/ClassicWatchingTypedTest.java      |  10 +-
 .../coexistence/TypedWatchingClassicTest.java      |   6 +-
 .../pekko/typed/extensions/ExtensionDocTest.java   |   8 +-
 .../pekko/typed/fromclassic/TypedSample.java       |   7 +-
 .../supervision/SupervisionCompileOnlyTest.java    |   7 +-
 .../apache/pekko/actor/typed/ActorSystemTest.java  |   9 +-
 .../apache/pekko/actor/typed/ExtensionsTest.java   |  18 +-
 .../typed/eventstream/EventStreamDocTest.java      |   9 +-
 .../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     |  28 +-
 .../actor/typed/javadsl/BehaviorBuilderTest.java   |  30 +-
 .../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/actor/AbstractActorRef.java   |   2 -
 .../pekko/actor/dungeon/AbstractActorCell.java     |   1 -
 .../org/apache/pekko/io/ByteBufferCleaner.java     |  10 +-
 .../org/apache/pekko/japi/pf/DeciderBuilder.java   |   4 +-
 .../pekko/japi/pf/FSMStateFunctionBuilder.java     |   2 +-
 .../pekko/japi/pf/FSMTransitionHandlerBuilder.java |   2 +-
 .../pekko/pattern/AbstractCircuitBreaker.java      |   4 +-
 .../main/java/org/apache/pekko/util/Unsafe.java    |   3 +-
 .../cluster/sharding/typed/AccountExampleTest.java |  25 +-
 .../AccountExampleWithEventHandlersInState.java    |   7 +-
 .../typed/AccountExampleWithMutableState.java      |   5 +-
 .../typed/AccountExampleWithNullDurableState.java  |   7 +-
 .../typed/AccountExampleWithNullState.java         |   5 +-
 .../ExternalShardAllocationCompileOnlyTest.java    |   9 +-
 .../HelloWorldEventSourcedEntityExampleTest.java   |  12 +-
 .../typed/ReplicatedShardingCompileOnlySpec.java   |   3 +-
 .../sharding/typed/ReplicatedShardingTest.java     |  18 +-
 .../javadsl/ClusterShardingPersistenceTest.java    |   7 +-
 .../ShardedDaemonProcessCompileOnlyTest.java       |   7 +-
 .../pekko/cluster/client/ClusterClientTest.java    |   7 +-
 .../pubsub/DistributedPubSubMediatorTest.java      |  12 +-
 .../singleton/ClusterSingletonManagerTest.java     |   3 +-
 .../apache/pekko/cluster/singleton/Consumer.java   |   2 +-
 .../ddata/typed/javadsl/ReplicatorDocTest.java     |  13 +-
 .../cluster/typed/PingSerializerExampleTest.java   |   3 +-
 .../pekko/cluster/typed/ReceptionistExample.java   |   7 +-
 .../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   |  27 +-
 .../java/jdocs/actor/InitializationDocTest.java    |   7 +-
 docs/src/test/java/jdocs/actor/Messages.java       |   1 +
 .../src/test/java/jdocs/actor/MyStoppingActor.java |   2 +-
 .../src/test/java/jdocs/actor/SampleActorTest.java |   6 +-
 docs/src/test/java/jdocs/actor/fsm/Buncher.java    |  22 +-
 .../src/test/java/jdocs/actor/fsm/BuncherTest.java |  14 +-
 docs/src/test/java/jdocs/actor/fsm/Events.java     |   5 +-
 docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java |  20 +-
 .../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   |  12 +-
 .../circuitbreaker/EvenNoFailureJavaExample.java   |   5 +-
 .../jdocs/circuitbreaker/TellPatternJavaActor.java |   4 +-
 .../test/java/jdocs/cluster/FactorialBackend.java  |   4 +-
 .../test/java/jdocs/cluster/FactorialFrontend.java |  10 +-
 .../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 |   3 +-
 .../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 |  18 +-
 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 |  12 +-
 docs/src/test/java/jdocs/ddata/DataBot.java        |   2 -
 .../java/jdocs/ddata/DistributedDataDocTest.java   |  36 +-
 docs/src/test/java/jdocs/ddata/ShoppingCart.java   |   5 +-
 docs/src/test/java/jdocs/ddata/TwoPhaseSet.java    |   2 -
 .../ddata/protobuf/TwoPhaseSetSerializer.java      |   3 +-
 .../ddata/protobuf/TwoPhaseSetSerializer2.java     |   3 +-
 .../TwoPhaseSetSerializerWithCompression.java      |   1 -
 .../java/jdocs/discovery/DnsDiscoveryDocTest.java  |   9 +-
 .../java/jdocs/dispatcher/MyUnboundedMailbox.java  |   6 +-
 docs/src/test/java/jdocs/duration/Java.java        |   5 +-
 docs/src/test/java/jdocs/io/IODocTest.java         |   7 +-
 .../test/java/jdocs/io/JavaReadBackPressure.java   |  12 +-
 docs/src/test/java/jdocs/io/JavaUdpMulticast.java  |  20 +-
 .../test/java/jdocs/io/JavaUdpMulticastTest.java   |  15 +-
 .../test/java/jdocs/io/UdpConnectedDocTest.java    |  15 +-
 docs/src/test/java/jdocs/io/UdpDocTest.java        |   6 +-
 docs/src/test/java/jdocs/io/japi/EchoHandler.java  |  12 +-
 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 +-
 .../jdocs/pattern/BackoffSupervisorDocTest.java    |   5 +-
 .../src/test/java/jdocs/pattern/SupervisedAsk.java |   5 +-
 .../test/java/jdocs/pattern/SupervisedAskSpec.java |   9 +-
 .../persistence/LambdaPersistenceDocTest.java      |  17 +-
 .../LambdaPersistencePluginDocTest.java            |  32 +-
 .../jdocs/persistence/PersistenceMultiDocTest.java |   6 +-
 .../jdocs/persistence/PersistenceQueryDocTest.java |  25 +-
 .../PersistenceSchemaEvolutionDocTest.java         |  19 +-
 .../jdocs/persistence/PersistentActorExample.java  |   6 +-
 .../query/LeveldbPersistenceQueryDocTest.java      |   5 +-
 .../persistence/query/MyEventsByTagSource.java     |  15 +-
 .../jdocs/persistence/testkit/Configuration.java   |   5 +-
 .../PersistenceTestKitPolicySampleTest.java        |   4 +-
 .../testkit/PersistenceTestKitSampleTest.java      |   6 +-
 .../jdocs/persistence/testkit/TestKitExamples.java |   1 +
 .../java/jdocs/routing/CustomRouterDocTest.java    |  35 +-
 .../test/java/jdocs/routing/RedundancyGroup.java   |  10 +-
 .../test/java/jdocs/stream/BidiFlowDocTest.java    |  22 +-
 .../test/java/jdocs/stream/CompositionDocTest.java |  15 +-
 docs/src/test/java/jdocs/stream/FlowDocTest.java   |  24 +-
 .../test/java/jdocs/stream/FlowErrorDocTest.java   |  13 +-
 .../java/jdocs/stream/FlowParallelismDocTest.java  |   9 +-
 .../java/jdocs/stream/FlowStreamRefsDocTest.java   |   7 +-
 .../test/java/jdocs/stream/GraphCyclesDocTest.java |  12 +-
 .../test/java/jdocs/stream/GraphStageDocTest.java  |  27 +-
 docs/src/test/java/jdocs/stream/HubDocTest.java    |  12 +-
 .../test/java/jdocs/stream/IntegrationDocTest.java |  40 +-
 .../test/java/jdocs/stream/KillSwitchDocTest.java  |  18 +-
 .../src/test/java/jdocs/stream/MigrationsJava.java |   7 +-
 .../jdocs/stream/RateTransformationDocTest.java    |  23 +-
 .../java/jdocs/stream/ReactiveStreamsDocTest.java  |  20 +-
 .../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 |  18 +-
 .../java/jdocs/stream/StreamTestKitDocTest.java    |  13 +-
 .../test/java/jdocs/stream/SubstreamDocTest.java   |   5 +-
 .../stream/TwitterStreamQuickstartDocTest.java     |  35 +-
 .../java/jdocs/stream/io/StreamFileDocTest.java    |  14 +-
 .../java/jdocs/stream/io/StreamTcpDocTest.java     |  19 +-
 .../javadsl/cookbook/RecipeAdhocSourceTest.java    |  14 +-
 .../stream/javadsl/cookbook/RecipeByteStrings.java |  21 +-
 .../stream/javadsl/cookbook/RecipeDecompress.java  |   6 +-
 .../stream/javadsl/cookbook/RecipeDigest.java      |  12 +-
 .../javadsl/cookbook/RecipeDroppyBroadcast.java    |   8 +-
 .../stream/javadsl/cookbook/RecipeFlattenList.java |  11 +-
 .../javadsl/cookbook/RecipeGlobalRateLimit.java    |  13 +-
 .../jdocs/stream/javadsl/cookbook/RecipeHold.java  |   5 +-
 .../stream/javadsl/cookbook/RecipeKeepAlive.java   |   3 +-
 .../javadsl/cookbook/RecipeLoggingElements.java    |  10 +-
 .../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    |  16 +-
 .../jdocs/stream/javadsl/cookbook/RecipeSeq.java   |   9 +-
 .../stream/javadsl/cookbook/RecipeSimpleDrop.java  |   3 +-
 .../javadsl/cookbook/RecipeSourceFromFunction.java |  12 +-
 .../stream/javadsl/cookbook/RecipeSplitter.java    |   9 +-
 .../stream/javadsl/cookbook/RecipeWorkerPool.java  |  14 +-
 .../jdocs/stream/operators/SinkDocExamples.java    |  10 +-
 .../jdocs/stream/operators/WithContextTest.java    |  21 +-
 .../converters/StreamConvertersToJava.java         |  18 +-
 .../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    |   8 +-
 .../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 +-
 .../stream/operators/source/AsSubscriber.java      |   6 +-
 .../operators/source/CompletionStageSource.java    |   3 +-
 .../java/jdocs/stream/operators/source/From.java   |   5 +-
 .../operators/source/FromCompletionStage.java      |   5 +-
 .../stream/operators/source/FromPublisher.java     |   3 +-
 .../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 |   6 +-
 .../jdocs/stream/operators/source/UnfoldAsync.java |   9 +-
 .../stream/operators/source/UnfoldResource.java    |   4 +-
 .../operators/source/UnfoldResourceAsync.java      |   7 +-
 .../java/jdocs/stream/operators/source/Zip.java    |   5 +-
 .../sourceorflow/ExtrapolateAndExpand.java         |   9 +-
 .../operators/sourceorflow/FlatMapConcat.java      |   4 +-
 .../operators/sourceorflow/FlatMapMerge.java       |   4 +-
 .../stream/operators/sourceorflow/Intersperse.java |   3 +-
 .../jdocs/stream/operators/sourceorflow/Limit.java |   5 +-
 .../operators/sourceorflow/LimitWeighted.java      |   3 +-
 .../stream/operators/sourceorflow/MapAsyncs.java   |  12 +-
 .../stream/operators/sourceorflow/MapConcat.java   |   3 +-
 .../stream/operators/sourceorflow/MapError.java    |   3 +-
 .../operators/sourceorflow/MapWithResource.java    |   6 +-
 .../stream/operators/sourceorflow/MergeLatest.java |   3 +-
 .../stream/operators/sourceorflow/Monitor.java     |  12 +-
 .../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   |  11 +-
 .../test/java/jdocs/testkit/TestKitDocTest.java    |  40 +-
 .../test/java/jdocs/testkit/TestKitSampleTest.java |  12 +-
 .../test/java/jdocs/typed/tutorial_3/Device.java   |   2 +-
 .../java/jdocs/typed/tutorial_3/DeviceTest.java    |   7 +-
 .../jdocs/typed/tutorial_3/inprogress1/Device.java |   2 +-
 .../jdocs/typed/tutorial_3/inprogress2/Device.java |   4 +-
 .../test/java/jdocs/typed/tutorial_4/Device.java   |   2 +-
 .../java/jdocs/typed/tutorial_4/DeviceGroup.java   |   8 +-
 .../jdocs/typed/tutorial_4/DeviceGroupTest.java    |  22 +-
 .../java/jdocs/typed/tutorial_4/DeviceManager.java |  11 +-
 .../jdocs/typed/tutorial_4/DeviceManagerTest.java  |   9 +-
 .../java/jdocs/typed/tutorial_4/DeviceTest.java    |   8 +-
 .../test/java/jdocs/typed/tutorial_5/Device.java   |   3 +-
 .../java/jdocs/typed/tutorial_5/DeviceGroup.java   |   7 +-
 .../jdocs/typed/tutorial_5/DeviceGroupQuery.java   |  12 +-
 .../typed/tutorial_5/DeviceGroupQueryTest.java     |  30 +-
 .../jdocs/typed/tutorial_5/DeviceGroupTest.java    |  34 +-
 .../java/jdocs/typed/tutorial_5/DeviceManager.java |  10 +-
 .../jdocs/typed/tutorial_5/DeviceManagerTest.java  |   9 +-
 .../java/jdocs/typed/tutorial_5/DeviceTest.java    |   7 +-
 .../query/internal/protobuf/QueryMessages.java     | 119 ++++-
 .../persistence/query/DummyJavaReadJournal.java    |   1 -
 .../persistence/typed/MyReplicatedBehavior.java    |   6 +-
 .../typed/ReplicatedAuctionExampleTest.java        |  30 +-
 .../persistence/typed/ReplicatedBlogExample.java   |   6 +-
 .../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   |  24 +-
 .../serialization/ReplicatedEventSourcing.java     | 518 +++++++++++++++++++--
 .../pekko/persistence/typed/BlogPostEntity.java    |   6 +
 .../typed/BlogPostEntityDurableState.java          |   4 +
 .../pekko/persistence/typed/MovieWatchList.java    |   7 +-
 .../pekko/persistence/typed/OptionalBlogState.java |   3 +-
 ...rsistentFsmToTypedMigrationCompileOnlyTest.java |  12 +-
 .../pekko/persistence/typed/StashingExample.java   |   5 +-
 .../persistence/typed/WebStoreCustomerFSM.java     |   3 +-
 .../pekko/persistence/typed/auction/Auction.java   |   5 +
 .../persistence/typed/auction/AuctionCommand.java  |   5 +-
 .../persistence/typed/auction/AuctionEntity.java   |   8 +-
 .../persistence/typed/auction/AuctionEvent.java    |   2 +
 .../persistence/typed/auction/AuctionState.java    |   2 +
 .../pekko/persistence/typed/auction/Bid.java       |   3 +
 .../typed/javadsl/LoggerSourceTest.java            |  11 +-
 .../typed/javadsl/NullEmptyStateTest.java          |   4 +-
 .../javadsl/PersistentActorCompileOnlyTest.java    |  20 +-
 .../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 |   9 +-
 .../pekko/remote/artery/aeron/AeronErrorLog.java   |   9 +-
 .../pekko/remote/artery/aeron/AeronStat.java       |  27 +-
 .../remote/protobuf/v3/ProtobufProtocolV3.java     |  30 +-
 .../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    |   6 +-
 .../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  |  47 +-
 .../pekko/stream/javadsl/FlowThrottleTest.java     |  13 +-
 .../pekko/stream/javadsl/FlowUnfoldAsyncTest.java  |   7 +-
 .../pekko/stream/javadsl/FlowWithContextTest.java  |  13 +-
 .../javadsl/FlowWithContextThrottleTest.java       |  11 +-
 .../apache/pekko/stream/javadsl/FramingTest.java   |   2 +-
 .../apache/pekko/stream/javadsl/GraphDslTest.java  |  15 +-
 .../stream/javadsl/JavaFlowSupportCompileTest.java |   4 +-
 .../pekko/stream/javadsl/JsonFramingTest.java      |  18 +-
 .../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 +-
 .../apache/pekko/stream/javadsl/SourceTest.java    |  39 +-
 .../pekko/stream/javadsl/SourceUnfoldTest.java     |   3 +-
 .../javadsl/SourceWithContextThrottleTest.java     |  13 +-
 .../org/apache/pekko/stream/stage/StageTest.java   |  15 +-
 .../pekko/stream/typed/ActorSinkExample.java       |   2 +
 .../stream/typed/ActorSinkWithAckExample.java      |   2 +
 .../pekko/stream/typed/ActorSourceExample.java     |   6 +-
 .../typed/ActorSourceWithBackpressureExample.java  |   4 +-
 .../typed/javadsl/ActorSourceSinkCompileTest.java  |   3 +-
 .../javadsl/CustomGuardianAndMaterializerTest.java |   9 +-
 .../testkit/PekkoJUnitActorSystemResource.java     |   3 +-
 .../pekko/testkit/javadsl/TestKitApiTest.java      |   5 +-
 348 files changed, 2214 insertions(+), 1703 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/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
index 2468939286..f132a13504 100644
--- a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
+++ b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
@@ -14,22 +14,23 @@
 package jdocs.org.apache.pekko.actor.testkit.typed.javadsl;
 
 // #imports
+import static org.junit.Assert.assertEquals;
+
+import com.typesafe.config.Config;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
 import org.apache.pekko.actor.testkit.typed.CapturedLogEvent;
 import org.apache.pekko.actor.testkit.typed.Effect;
 import org.apache.pekko.actor.testkit.typed.javadsl.BehaviorTestKit;
 import org.apache.pekko.actor.testkit.typed.javadsl.TestInbox;
 import org.apache.pekko.actor.typed.*;
 import org.apache.pekko.actor.typed.javadsl.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-
-import com.typesafe.config.Config;
-import org.slf4j.event.Level;
-// #imports
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
 import org.scalatestplus.junit.JUnitSuite;
+import org.slf4j.event.Level;
+
+// #imports
 
 public class SyncTestingExampleTest extends JUnitSuite {
 
@@ -39,6 +40,7 @@ public class SyncTestingExampleTest extends JUnitSuite {
       return Behaviors.receive((context, message) -> Behaviors.same());
     }
   }
+
   // #child
 
   // #under-test
@@ -139,6 +141,7 @@ public class SyncTestingExampleTest extends JUnitSuite {
       return Behaviors.same();
     }
   }
+
   // #under-test
 
   @Test
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 98a7867912..c06455e0fb 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,17 +13,14 @@
 
 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.apache.pekko.japi.function.Creator;
 import org.junit.Assert;
 import org.junit.Test;
-
-import org.apache.pekko.japi.function.Creator;
-
 import org.scalatestplus.junit.JUnitSuite;
 
 public class ActorCreationTest extends JUnitSuite {
@@ -193,7 +190,8 @@ public class ActorCreationTest extends JUnitSuite {
                       }
                     }));
     assertEquals(
-        "cannot use non-static local Creator to create actors; make it static (e.g. local to a static method) or top-level",
+        "cannot use non-static local Creator to create actors; make it static (e.g. local to a"
+            + " static method) or top-level",
         exception.getMessage());
   }
 
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 33dd7cd157..a4a02f67b4 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,29 +13,27 @@
 
 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.function.Creator;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.japi.Util;
+import org.apache.pekko.japi.function.Creator;
 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 a598bb8e6f..f85a38ce91 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,17 +13,15 @@
 
 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;
 import org.apache.pekko.serialization.JavaSerializer;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
-import scala.Option;
-
-import java.util.concurrent.Callable;
-
-import static org.junit.Assert.*;
 
 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 dccc33dd57..17e8099fb5 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.function.Function;
 import org.apache.pekko.japi.function.Predicate;
 import org.apache.pekko.japi.pf.Match;
@@ -21,8 +23,6 @@ import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.MatchError;
 
-import static org.junit.Assert.*;
-
 public class MatchBuilderTest extends JUnitSuite {
 
   @Test
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 443306a144..317bbe85b1 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,6 +13,16 @@
 
 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.CompletionStages;
 import org.apache.pekko.dispatch.Futures;
@@ -20,7 +30,6 @@ 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.ClassRule;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
@@ -29,17 +38,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..1cf86c3bd6 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 {
 
@@ -55,6 +54,7 @@ interface FSMDocTest {
         this.obj = obj;
       }
     }
+
     // #simple-events
 
     // #storing-state
@@ -132,6 +132,7 @@ interface FSMDocTest {
       }
       // #storing-state
     }
+
     // #storing-state
 
     // #simple-state
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..b05bdfa77a 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 {
@@ -63,6 +62,7 @@ public class InteractionPatternsTest extends JUnitSuite {
                     .build());
       }
     }
+
     // #fire-and-forget-definition
 
     public class CookieFabric {
@@ -84,6 +84,7 @@ public class InteractionPatternsTest extends JUnitSuite {
           this.result = result;
         }
       }
+
       // #request-response-protocol
 
       // #request-response-respond
@@ -99,6 +100,7 @@ public class InteractionPatternsTest extends JUnitSuite {
         request.replyTo.tell(new Response("Here are the cookies for " + request.query));
         return Behaviors.same();
       }
+
       // #request-response-respond
 
       void demo() {
@@ -237,6 +239,7 @@ public class InteractionPatternsTest extends JUnitSuite {
         }
       }
     }
+
     // #adapted-response
 
     // #timer
@@ -254,6 +257,7 @@ public class InteractionPatternsTest extends JUnitSuite {
         public List<Command> getMessages() {
           return messages;
         }
+
         // #timer
         @Override
         public boolean equals(Object o) {
@@ -345,6 +349,7 @@ public class InteractionPatternsTest extends JUnitSuite {
         }
       }
     }
+
     // #timer
 
     // #actor-ask
@@ -463,6 +468,7 @@ public class InteractionPatternsTest extends JUnitSuite {
         return this;
       }
     }
+
     // #actor-ask
 
     // #per-session-child
@@ -686,6 +692,7 @@ public class InteractionPatternsTest extends JUnitSuite {
         return this;
       }
     }
+
     // #standalone-ask
 
     class NotShown {
@@ -713,6 +720,7 @@ public class InteractionPatternsTest extends JUnitSuite {
               else System.out.println("Boo! didn't get cookies in time. " + failure);
             });
       }
+
       // #standalone-ask
 
       public void askAndMapInvalid(
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/RouterTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java
index d0852dda26..c181699fe3 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java
@@ -12,15 +12,18 @@
  */
 
 package jdocs.org.apache.pekko.typed;
+
 /*
  * Copyright (C) 2009-2019 Lightbend Inc. <https://www.lightbend.com>
  */
 
+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.DispatcherSelector;
 // #pool
-import org.apache.pekko.actor.typed.ActorRef;
-import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.SupervisorStrategy;
 import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
@@ -29,10 +32,6 @@ import org.apache.pekko.actor.typed.javadsl.PoolRouter;
 import org.apache.pekko.actor.typed.javadsl.Routers;
 import org.apache.pekko.actor.typed.receptionist.Receptionist;
 import org.apache.pekko.actor.typed.receptionist.ServiceKey;
-
-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.Test;
 import org.scalatestplus.junit.JUnitSuite;
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..e8b763e221 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
 
@@ -32,6 +32,7 @@ interface StashDocSample {
 
     CompletionStage<String> load(String id);
   }
+
   // #db
 
   // #stashing
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/StyleGuideDocExamples.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java
index 312d16b87a..4067c03dd4 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java
@@ -15,19 +15,18 @@ package jdocs.org.apache.pekko.typed;
 
 // #oo-style
 // #fun-style
+import java.time.Duration;
+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.SupervisorStrategy;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
 import org.apache.pekko.actor.typed.javadsl.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 // #fun-style
-import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 // #oo-style
-
-import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.javadsl.TimerScheduler;
-import org.apache.pekko.Done;
-import java.time.Duration;
 
 interface StyleGuideDocExamples {
 
@@ -97,6 +96,7 @@ interface StyleGuideDocExamples {
       public enum Increment implements Command {
         INSTANCE
       }
+
       // #message-enum
 
       public static class GetValue implements Command {
@@ -114,6 +114,7 @@ interface StyleGuideDocExamples {
           this.value = value;
         }
       }
+
       // #messages
 
       public static Behavior<Command> create() {
@@ -276,6 +277,7 @@ interface StyleGuideDocExamples {
           this.value = value;
         }
       }
+
       // #fun-style-setup-params2
 
       private static class Setup {
@@ -370,6 +372,7 @@ interface StyleGuideDocExamples {
           this.value = value;
         }
       }
+
       // #fun-style-setup-params3
 
       public static Behavior<Command> create(String name) {
@@ -462,6 +465,7 @@ interface StyleGuideDocExamples {
         }
       }
     }
+
     // #behavior-factory-method
 
     public class Usage {
@@ -601,6 +605,7 @@ interface StyleGuideDocExamples {
         getContext().getLog().debug("[{}] Incremented counter to [{}]", name, count);
         return this;
       }
+
       // #on-message-lambda
 
       private Behavior<Command> onTick() {
@@ -616,6 +621,7 @@ interface StyleGuideDocExamples {
         command.replyTo.tell(new Value(count));
         return this;
       }
+
       // #on-message-method-ref
 
       // #public-private-messages-1
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/coexistence/ClassicWatchingTypedTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java
index deea0d03d6..d8e734f244 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java
@@ -13,23 +13,23 @@
 
 package jdocs.org.apache.pekko.typed.coexistence;
 
+import static org.apache.pekko.actor.typed.javadsl.Behaviors.same;
+
 import org.apache.pekko.actor.AbstractActor;
 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.Adapter;
+// #adapter-import
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 // #adapter-import
 // In java use the static methods on Adapter to convert from typed to classic
-import org.apache.pekko.actor.typed.javadsl.Adapter;
-// #adapter-import
 import org.apache.pekko.testkit.TestProbe;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 import scala.concurrent.duration.Duration;
 
-import static org.apache.pekko.actor.typed.javadsl.Behaviors.same;
-
 public class ClassicWatchingTypedTest extends JUnitSuite {
 
   // #classic-watch
@@ -63,6 +63,7 @@ public class ClassicWatchingTypedTest extends JUnitSuite {
           .build();
     }
   }
+
   // #classic-watch
 
   // #typed
@@ -90,6 +91,7 @@ public class ClassicWatchingTypedTest extends JUnitSuite {
           .build();
     }
   }
+
   // #typed
 
   @Test
diff --git a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java
index 4fd0024de2..d01ccb26c8 100644
--- a/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java
+++ b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java
@@ -19,10 +19,10 @@ import org.apache.pekko.actor.typed.ActorRef;
 import org.apache.pekko.actor.typed.Behavior;
 // #adapter-import
 // in Java use the static methods on Adapter to convert from classic to typed
-import org.apache.pekko.actor.typed.javadsl.Adapter;
-// #adapter-import
 import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
 import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Adapter;
+// #adapter-import
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 import org.apache.pekko.testkit.javadsl.TestKit;
@@ -83,6 +83,7 @@ public class TypedWatchingClassicTest extends JUnitSuite {
       return this;
     }
   }
+
   // #typed
 
   // #classic
@@ -100,6 +101,7 @@ public class TypedWatchingClassicTest extends JUnitSuite {
       message.replyTo.tell(Typed.Pong.INSTANCE);
     }
   }
+
   // #classic
 
   @Test
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..914ae6829c 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 {
 
@@ -31,6 +30,7 @@ interface ExtensionDocTest {
     }
     // ...
   }
+
   // #shared-resource
 
   // #extension
@@ -53,6 +53,7 @@ interface ExtensionDocTest {
         return instance.apply(system);
       }
     }
+
     // #extension-id
     // #extension
 
@@ -68,6 +69,7 @@ interface ExtensionDocTest {
       return _connection;
     }
   }
+
   // #extension
 
   public static Behavior<Object> initialBehavior() {
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..16132897ec 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 {
@@ -70,6 +69,7 @@ interface TypedSample {
       return this;
     }
   }
+
   // #hello-world-actor
 
   // #children
@@ -129,6 +129,7 @@ interface TypedSample {
       return this;
     }
   }
+
   // #children
 
   public class Child {
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..fd5dddec22 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 {
@@ -45,6 +44,7 @@ public class SupervisionCompileOnlyTest {
     public static Behavior<Command> create() {
       return Behaviors.supervise(counter(1)).onFailure(SupervisorStrategy.restart());
     }
+
     // #top-level
 
     private static Behavior<Command> counter(int currentValue) {
@@ -63,6 +63,7 @@ public class SupervisionCompileOnlyTest {
       return Behaviors.same();
     }
   }
+
   // #wrap
 
   public static Behavior<String> behavior = Behaviors.empty();
@@ -116,6 +117,7 @@ public class SupervisionCompileOnlyTest {
                 }))
         .onFailure(SupervisorStrategy.restart());
   }
+
   // #restart-stop-children
 
   // #restart-keep-children
@@ -138,6 +140,7 @@ public class SupervisionCompileOnlyTest {
               .onFailure(SupervisorStrategy.restart().withStopChildren(false));
         });
   }
+
   // #restart-keep-children
 
   interface Resource {
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..8f9e341cd7 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 {}
@@ -61,7 +60,8 @@ public class ExtensionsTest extends JUnitSuite {
   public void loadJavaExtensionsFromConfig() {
     Config cfg =
         ConfigFactory.parseString(
-                "pekko.actor.typed.extensions += \"org.apache.pekko.actor.typed.ExtensionsTest$MyExtension\"")
+                "pekko.actor.typed.extensions +="
+                    + " \"org.apache.pekko.actor.typed.ExtensionsTest$MyExtension\"")
             .resolve();
     final ActorSystem<Object> system =
         ActorSystem.create(Behaviors.empty(), "loadJavaExtensionsFromConfig", cfg);
diff --git a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamDocTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamDocTest.java
index 24326de0aa..e4d04315c2 100644
--- a/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamDocTest.java
+++ b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamDocTest.java
@@ -17,7 +17,11 @@
 
 package org.apache.pekko.actor.typed.eventstream;
 
+import org.apache.pekko.actor.DeadLetter;
 import org.apache.pekko.actor.testkit.typed.javadsl.ActorTestKit;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+// #dead-letter-imports
 import org.apache.pekko.actor.typed.Behavior;
 import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
 import org.apache.pekko.actor.typed.javadsl.ActorContext;
@@ -25,10 +29,7 @@ import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.javadsl.Receive;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
-// #dead-letter-imports
-import org.apache.pekko.actor.DeadLetter;
-import org.apache.pekko.actor.typed.ActorRef;
-import org.apache.pekko.actor.typed.ActorSystem;
+
 // #dead-letter-imports
 
 public class EventStreamDocTest extends JUnitSuite {
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..177df721ce 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 {
 
@@ -119,7 +118,8 @@ public class AdapterTest extends JUnitSuite {
     }
   }
 
-  static interface Typed2Msg {};
+  static interface Typed2Msg {}
+  ;
 
   static final class Ping implements Typed2Msg {
     public final ActorRef<String> replyTo;
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..4eadf3daa6 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 {
 
@@ -46,7 +44,8 @@ public class BehaviorBuilderTest extends JUnitSuite {
     }
   }
 
-  static final class MyList<T> extends ArrayList<T> implements Message {};
+  static final class MyList<T> extends ArrayList<T> implements Message {}
+  ;
 
   public void shouldCompile() {
     Behavior<Message> b =
@@ -153,9 +152,11 @@ public class BehaviorBuilderTest extends JUnitSuite {
     probe.expectMessage("message");
   }
 
-  interface CounterMessage {};
+  interface CounterMessage {}
+  ;
 
-  static final class Increase implements CounterMessage {};
+  static final class Increase implements CounterMessage {}
+  ;
 
   static final class Get implements CounterMessage {
     final ActorRef<Got> sender;
@@ -163,7 +164,8 @@ public class BehaviorBuilderTest extends JUnitSuite {
     public Get(ActorRef<Got> sender) {
       this.sender = sender;
     }
-  };
+  }
+  ;
 
   static final class Got {
     final int n;
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/actor/AbstractActorRef.java b/actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java
index 7d7eeac66a..957e650181 100644
--- a/actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java
+++ b/actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java
@@ -16,8 +16,6 @@ package org.apache.pekko.actor;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 
-import org.apache.pekko.actor.Cell;
-
 final class AbstractActorRef {
   static final VarHandle cellHandle;
   static final VarHandle lookupHandle;
diff --git a/actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java b/actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java
index c7cd1410ec..cdebbe197f 100644
--- a/actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java
+++ b/actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java
@@ -15,7 +15,6 @@ package org.apache.pekko.actor.dungeon;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
-
 import org.apache.pekko.actor.ActorCell;
 import org.apache.pekko.dispatch.Mailbox;
 
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 9dd4bc783d..aab02e45ab 100644
--- a/actor/src/main/java/org/apache/pekko/io/ByteBufferCleaner.java
+++ b/actor/src/main/java/org/apache/pekko/io/ByteBufferCleaner.java
@@ -17,13 +17,13 @@
 
 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.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
@@ -100,9 +100,9 @@ final class ByteBufferCleaner {
       } catch (final Throwable t) {
         cleaner = null;
         System.err.println(
-            "WARNING: ByteBuffer Cleaner failed to clean a test buffer. ByteBuffer Cleaner "
-                + "has been disabled. This means direct ByteBuffers will only be cleaned upon garbage collection. "
-                + "Reason: "
+            "WARNING: ByteBuffer Cleaner failed to clean a test buffer. ByteBuffer Cleaner has been"
+                + " disabled. This means direct ByteBuffers will only be cleaned upon garbage"
+                + " collection. Reason: "
                 + t);
       }
     }
diff --git a/actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java
index a733ceb3d4..f9d3e1178b 100644
--- a/actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java
+++ b/actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java
@@ -13,11 +13,11 @@
 
 package org.apache.pekko.japi.pf;
 
+import static org.apache.pekko.actor.SupervisorStrategy.Directive;
+
 import org.apache.pekko.japi.function.Function;
 import org.apache.pekko.japi.function.Predicate;
 
-import static org.apache.pekko.actor.SupervisorStrategy.Directive;
-
 /**
  * Used for building a partial function for {@link org.apache.pekko.actor.Actor#supervisorStrategy
  * Actor.supervisorStrategy()}. * Inside an actor you can use it like this with Java 8 to define
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 edc2a69b4a..c6aa1cafa2 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,10 +13,10 @@
 
 package org.apache.pekko.japi.pf;
 
+import java.util.List;
 import org.apache.pekko.actor.FSM;
 import org.apache.pekko.japi.function.*;
 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 b10172592d..d1d9ad8491 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
@@ -18,8 +18,8 @@ import org.apache.pekko.japi.function.Predicate;
 import org.apache.pekko.japi.function.Procedure;
 import org.apache.pekko.japi.function.Procedure2;
 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/pattern/AbstractCircuitBreaker.java b/actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java
index 5851d39cb6..e17efa3824 100644
--- a/actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java
+++ b/actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java
@@ -15,10 +15,8 @@ package org.apache.pekko.pattern;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
-
-import scala.concurrent.duration.FiniteDuration;
-
 import org.apache.pekko.pattern.CircuitBreaker.State;
+import scala.concurrent.duration.FiniteDuration;
 
 class AbstractCircuitBreaker {
   protected static final VarHandle stateHandle;
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 2b12522844..47de0de449 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.invoke.MethodHandles;
 import java.lang.invoke.VarHandle;
 import java.nio.charset.StandardCharsets;
+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..f3802ef049 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
@@ -50,6 +49,7 @@ public interface AccountExampleWithEventHandlersInState {
     // Command
     // #reply-command
     interface Command extends CborSerializable {}
+
     // #reply-command
 
     public static class CreateAccount implements Command {
@@ -236,6 +236,7 @@ public interface AccountExampleWithEventHandlersInState {
             .thenReply(command.replyTo, account2 -> StatusReply.ack());
       }
     }
+
     // #reply
 
     private ReplyEffect<Event, Account> getBalance(OpenedAccount account, GetBalance command) {
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..38a6bf70f3 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
@@ -48,6 +47,7 @@ public interface AccountExampleWithNullDurableState {
     // Command
     // #reply-command
     interface Command extends CborSerializable {}
+
     // #reply-command
 
     public static class CreateAccount implements Command {
@@ -205,6 +205,7 @@ public interface AccountExampleWithNullDurableState {
             .thenReply(command.replyTo, account2 -> StatusReply.ack());
       }
     }
+
     // #reply
 
     private ReplyEffect<Account> getBalance(OpenedAccount account, GetBalance command) {
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..30313abb7c 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
@@ -221,7 +220,8 @@ public class ReplicatedShardingTest extends JUnitSuite {
       new TestKitJunitResource(
           ConfigFactory.parseString(
                   " pekko.loglevel = DEBUG\n"
-                      + "      pekko.loggers = [\"org.apache.pekko.testkit.SilenceAllTestEventListener\"]\n"
+                      + "      pekko.loggers ="
+                      + " [\"org.apache.pekko.testkit.SilenceAllTestEventListener\"]\n"
                       + "      pekko.actor.provider = \"cluster\"\n"
                       + "      # pretend we're a node in all dc:s\n"
                       + "      pekko.cluster.roles = [\"DC-A\", \"DC-B\", \"DC-C\"]\n"
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..ad51348589 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 {
@@ -44,6 +43,7 @@ public class ClusterClientTest extends JUnitSuite {
             ActorPaths.fromString("pekko://OtherSys@host1:7355/system/receptionist"),
             ActorPaths.fromString("pekko://OtherSys@host2:7355/system/receptionist")));
   }
+
   // #initialContacts
 
   @Test
@@ -115,6 +115,7 @@ public class ClusterClientTest extends JUnitSuite {
           .build();
     }
   }
+
   // #clientEventsListener
 
   // #receptionistEventsListener
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..b481ae9631 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 {
@@ -112,6 +109,7 @@ public class DistributedPubSubMediatorTest extends JUnitSuite {
           .build();
     }
   }
+
   // #publisher
 
   public // #send-destination
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/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
index 1c46d90456..c5e093f931 100644
--- a/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
+++ b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
@@ -15,13 +15,14 @@ package jdocs.org.apache.pekko.cluster.typed;
 
 // #import
 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.ActorContext;
 import org.apache.pekko.actor.typed.javadsl.Behaviors;
 import org.apache.pekko.actor.typed.receptionist.Receptionist;
 import org.apache.pekko.actor.typed.receptionist.ServiceKey;
+
 // #import
-import org.apache.pekko.actor.typed.ActorSystem;
 
 public interface ReceptionistExample {
 
@@ -69,6 +70,7 @@ public interface ReceptionistExample {
       return Behaviors.same();
     }
   }
+
   // #ping-service
 
   // #pinger
@@ -100,6 +102,7 @@ public interface ReceptionistExample {
       return Behaviors.stopped();
     }
   }
+
   // #pinger
 
   // #pinger-guardian
@@ -139,6 +142,7 @@ public interface ReceptionistExample {
       return Behaviors.same();
     }
   }
+
   // #pinger-guardian
 
   // #find
@@ -194,6 +198,7 @@ public interface ReceptionistExample {
       return Behaviors.same();
     }
   }
+
   // #find
 
   default void deregisterSample() {
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 bafa1bb49b..f948f015d2 100644
--- a/docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
+++ b/docs/src/test/java/jdocs/actor/FaultHandlingDocSample.java
@@ -15,29 +15,26 @@ 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.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.event.LoggingReceive;
 import org.apache.pekko.japi.pf.DeciderBuilder;
 import org.apache.pekko.pattern.Patterns;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-
-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 13e9726984..b1bac807d4 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 jdocs.AbstractJavaTest;
 import org.apache.pekko.japi.function.Predicate;
 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/Messages.java b/docs/src/test/java/jdocs/actor/Messages.java
index 6dfc1ece25..d80338bb1a 100644
--- a/docs/src/test/java/jdocs/actor/Messages.java
+++ b/docs/src/test/java/jdocs/actor/Messages.java
@@ -37,6 +37,7 @@ public class Messages {
       return values;
     }
   }
+
   // #immutable-message
 
   public static class DoIt {
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/Buncher.java b/docs/src/test/java/jdocs/actor/fsm/Buncher.java
index 94afef8f32..470e5a1d01 100644
--- a/docs/src/test/java/jdocs/actor/fsm/Buncher.java
+++ b/docs/src/test/java/jdocs/actor/fsm/Buncher.java
@@ -13,22 +13,22 @@
 
 package jdocs.actor.fsm;
 
+import static jdocs.actor.fsm.Buncher.Data;
+import static jdocs.actor.fsm.Buncher.State;
+import static jdocs.actor.fsm.Buncher.State.*;
+import static jdocs.actor.fsm.Buncher.Uninitialized.*;
+import static jdocs.actor.fsm.Events.*;
+
 // #simple-imports
-import org.apache.pekko.actor.AbstractFSM;
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.japi.pf.UnitMatch;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.time.Duration;
+import org.apache.pekko.actor.AbstractFSM;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.japi.pf.UnitMatch;
 // #simple-imports
 
-import static jdocs.actor.fsm.Buncher.Data;
-import static jdocs.actor.fsm.Buncher.State.*;
-import static jdocs.actor.fsm.Buncher.State;
-import static jdocs.actor.fsm.Buncher.Uninitialized.*;
-import static jdocs.actor.fsm.Events.*;
-
 // #simple-fsm
 public class Buncher extends AbstractFSM<State, Data> {
   {
@@ -97,6 +97,7 @@ public class Buncher extends AbstractFSM<State, Data> {
     initialize();
     // #fsm-body
   }
+
   // #simple-fsm
 
   static
@@ -139,6 +140,7 @@ public class Buncher extends AbstractFSM<State, Data> {
     public List<Object> getQueue() {
       return queue;
     }
+
     // #boilerplate
 
     @Override
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..6f8a593e68 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 {
 
@@ -30,6 +30,7 @@ public class Events {
     public ActorRef getRef() {
       return ref;
     }
+
     // #boilerplate
 
     @Override
@@ -52,6 +53,7 @@ public class Events {
     public Object getObj() {
       return obj;
     }
+
     // #boilerplate
 
     @Override
@@ -74,6 +76,7 @@ public class Events {
     public List<Object> getList() {
       return list;
     }
+
     // #boilerplate
 
     @Override
diff --git a/docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java b/docs/src/test/java/jdocs/actor/fsm/FSMDocTest.java
index c076e95c1e..fe0843f3ec 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;
 
@@ -59,10 +57,12 @@ public class FSMDocTest extends AbstractJavaTest {
     Bar
   };
 
-  public static interface X {};
+  public static interface X {}
+  ;
 
   public static class DummyFSM extends AbstractFSM<StateType, Integer> {
     Integer newData = 42;
+
     // #alt-transition-syntax
     public void handler(StateType from, StateType to) {
       // handle transition here
@@ -153,6 +153,7 @@ public class FSMDocTest extends AbstractJavaTest {
     // #body-elided
     // #logging-fsm
     ActorRef target = null;
+
     // #logging-fsm
     @Override
     public int logDepth() {
@@ -207,6 +208,7 @@ public class FSMDocTest extends AbstractJavaTest {
     }
     // #body-elided
   }
+
   // #logging-fsm
 
   @Test
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..11f6f6f4ad 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
 
@@ -47,6 +46,7 @@ public class DangerousJavaActor extends AbstractActor {
   public void notifyMeOnOpen() {
     log.warning("My CircuitBreaker is now open, and will not close for one minute");
   }
+
   // #circuit-breaker-initialization
 
   // #circuit-breaker-usage
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..2ee11495db 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;
@@ -84,6 +83,7 @@ public class FactorialFrontend extends AbstractActor {
     }
   }
 }
+
 // #frontend
 
 // not used, only for documentation
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..b94b8ba3b9 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;
@@ -27,6 +27,7 @@ public class SimpleClusterListener2 extends AbstractActor {
   LoggingAdapter log = Logging.getLogger(getContext().getSystem(), this);
   // #join
   Cluster cluster = Cluster.get(getContext().getSystem());
+
   // #join
 
   // subscribe to cluster changes
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..01f984a832 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 {
 
@@ -63,6 +62,7 @@ public class StatsService extends AbstractActor {
         .build();
   }
 }
+
 // #service
 
 // not used, only for documentation
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..2df77ab7a2 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
@@ -65,6 +64,7 @@ public class LeaseDocTest extends JUnitSuite {
       return true;
     }
   }
+
   // #lease-example
 
   private static ActorSystem system;
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..8f0a3a0cb8 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 {
@@ -130,6 +126,7 @@ public class DistributedDataDocTest extends AbstractJavaTest {
       return b.build();
     }
   }
+
   // #update
 
   static
@@ -176,6 +173,7 @@ public class DistributedDataDocTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #update-request-context
 
   static
@@ -251,6 +249,7 @@ public class DistributedDataDocTest extends AbstractJavaTest {
       return b.build();
     }
   }
+
   // #get
 
   static
@@ -298,6 +297,7 @@ public class DistributedDataDocTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #get-request-context
 
   static
@@ -334,6 +334,7 @@ public class DistributedDataDocTest extends AbstractJavaTest {
       replicator.tell(new Subscribe<PNCounter>(counter1Key, getSelf()), ActorRef.noSender());
     }
   }
+
   // #subscribe
 
   static
@@ -359,6 +360,7 @@ public class DistributedDataDocTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #delete
 
   public void demonstratePNCounter() {
diff --git a/docs/src/test/java/jdocs/ddata/ShoppingCart.java b/docs/src/test/java/jdocs/ddata/ShoppingCart.java
index 0c204ed827..a35f645415 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;
@@ -191,6 +190,7 @@ public class ShoppingCart extends AbstractActor {
         new Replicator.Get<LWWMap<String, LineItem>>(dataKey, Replicator.readLocal(), ctx),
         getSelf());
   }
+
   // #get-cart
 
   // #add-item
@@ -267,6 +267,7 @@ public class ShoppingCart extends AbstractActor {
     return response.key().equals(dataKey)
         && (response.getRequest().orElse(null) instanceof RemoveItem);
   }
+
   // #remove-item
 
   private Receive matchOther() {
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/discovery/DnsDiscoveryDocTest.java b/docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java
index 5b8d2352e1..ec9d0ed47c 100644
--- a/docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java
+++ b/docs/src/test/java/jdocs/discovery/DnsDiscoveryDocTest.java
@@ -13,22 +13,21 @@
 
 package jdocs.discovery;
 
+import docs.discovery.DnsDiscoveryDocSpec;
+import java.time.Duration;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 import org.apache.pekko.actor.ActorSystem;
 // #lookup-dns
 import org.apache.pekko.discovery.Discovery;
 import org.apache.pekko.discovery.ServiceDiscovery;
 // #lookup-dns
 import org.apache.pekko.testkit.javadsl.TestKit;
-import docs.discovery.DnsDiscoveryDocSpec;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
-import java.time.Duration;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
 @SuppressWarnings("unused")
 public class DnsDiscoveryDocTest extends JUnitSuite {
 
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/IODocTest.java b/docs/src/test/java/jdocs/io/IODocTest.java
index 72ec808552..5f8de1f186 100644
--- a/docs/src/test/java/jdocs/io/IODocTest.java
+++ b/docs/src/test/java/jdocs/io/IODocTest.java
@@ -13,19 +13,20 @@
 
 package jdocs.io;
 
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.actor.AbstractActor;
 // #imports
 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.ActorSystem;
 import org.apache.pekko.io.Inet;
 import org.apache.pekko.io.Tcp;
 import org.apache.pekko.io.TcpMessage;
 import org.apache.pekko.io.TcpSO;
 import org.apache.pekko.util.ByteString;
-import java.time.Duration;
+
 // #imports
 
 public class IODocTest {
diff --git a/docs/src/test/java/jdocs/io/JavaReadBackPressure.java b/docs/src/test/java/jdocs/io/JavaReadBackPressure.java
index a24d96288b..c1a87c7974 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 {
@@ -54,6 +53,7 @@ public class JavaReadBackPressure {
               })
           .build();
     }
+
     // #pull-accepting
 
     @Override
diff --git a/docs/src/test/java/jdocs/io/JavaUdpMulticast.java b/docs/src/test/java/jdocs/io/JavaUdpMulticast.java
index 83942ac5e1..b33eb95f30 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 {
@@ -41,6 +41,7 @@ public class JavaUdpMulticast {
       return DatagramChannel.open(StandardProtocolFamily.INET6);
     }
   }
+
   // #inet6-protocol-family
 
   // #multicast-group
@@ -64,6 +65,7 @@ public class JavaUdpMulticast {
       }
     }
   }
+
   // #multicast-group
 
   public static class Listener extends AbstractActor {
diff --git a/docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java b/docs/src/test/java/jdocs/io/JavaUdpMulticastTest.java
index 8cf515e554..a637aa0260 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;
@@ -61,7 +59,8 @@ public class JavaUdpMulticastTest extends AbstractJavaTest {
           system
               .log()
               .info(
-                  "JavaUdpMulticastTest skipped since no ipv6 interface supporting multicast could be found");
+                  "JavaUdpMulticastTest skipped since no ipv6 interface supporting multicast could"
+                      + " be found");
         } else {
           // lots of problems with choosing the wrong interface for this test depending
           // on the platform (awsdl0 can't be used on OSX, docker[0-9] can't be used in a docker
diff --git a/docs/src/test/java/jdocs/io/UdpConnectedDocTest.java b/docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
index 2fb7830eee..7a16c92e63 100644
--- a/docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
+++ b/docs/src/test/java/jdocs/io/UdpConnectedDocTest.java
@@ -13,25 +13,26 @@
 
 package jdocs.io;
 
-import org.apache.pekko.japi.pf.ReceiveBuilder;
-import org.junit.Test;
-
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.actor.AbstractActor;
 // #imports
+import static org.apache.pekko.util.ByteString.emptyByteString;
+
 import java.net.InetSocketAddress;
 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.ActorSystem;
 import org.apache.pekko.io.Inet;
 import org.apache.pekko.io.UdpConnected;
 import org.apache.pekko.io.UdpConnectedMessage;
 import org.apache.pekko.io.UdpSO;
+import org.apache.pekko.japi.pf.ReceiveBuilder;
 import org.apache.pekko.util.ByteString;
 
-import static org.apache.pekko.util.ByteString.emptyByteString;
-
 // #imports
+import org.junit.Test;
+
 
 public class UdpConnectedDocTest {
 
diff --git a/docs/src/test/java/jdocs/io/UdpDocTest.java b/docs/src/test/java/jdocs/io/UdpDocTest.java
index 454d27dc3f..39b5f77412 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 {
@@ -70,6 +70,7 @@ public class UdpDocTest {
           .build();
     }
   }
+
   // #sender
 
   // #listener
@@ -125,6 +126,7 @@ public class UdpDocTest {
           .build();
     }
   }
+
   // #listener
 
   // #connected
diff --git a/docs/src/test/java/jdocs/io/japi/EchoHandler.java b/docs/src/test/java/jdocs/io/japi/EchoHandler.java
index 9e94759eab..65e518d472 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 {
 
@@ -170,6 +169,7 @@ public class EchoHandler extends AbstractActor {
             })
         .build();
   }
+
   // #buffering
 
   // #closing
@@ -206,6 +206,7 @@ public class EchoHandler extends AbstractActor {
             })
         .build();
   }
+
   // #closing
 
   // #storage-omitted
@@ -246,6 +247,7 @@ public class EchoHandler extends AbstractActor {
       suspended = false;
     }
   }
+
   // #helpers
 
   protected int currentOffset() {
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/BackoffSupervisorDocTest.java b/docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java
index b9e0483ac9..2220a1272f 100644
--- a/docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java
+++ b/docs/src/test/java/jdocs/pattern/BackoffSupervisorDocTest.java
@@ -13,12 +13,13 @@
 
 package jdocs.pattern;
 
+// #backoff-imports
+import java.time.Duration;
 import org.apache.pekko.actor.*;
 import org.apache.pekko.pattern.BackoffOpts;
 import org.apache.pekko.pattern.BackoffSupervisor;
 import org.apache.pekko.testkit.TestActors.EchoActor;
-// #backoff-imports
-import java.time.Duration;
+
 // #backoff-imports
 
 public class BackoffSupervisorDocTest {
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 6168b61463..8b7cac4536 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.function.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 {}
@@ -50,6 +49,7 @@ public class LambdaPersistenceDocTest {
           public Recovery recovery() {
             return Recovery.none();
           }
+
           // #recovery-disabled
 
           // #recover-on-restart-disabled
@@ -132,6 +132,7 @@ public class LambdaPersistenceDocTest {
             // ...
           }
         }
+
         // #recovery-completed
 
         abstract class MyPersistentActor6 extends AbstractPersistentActor {
@@ -300,6 +301,7 @@ public class LambdaPersistenceDocTest {
                     })
                 .build();
           }
+
           // #save-snapshot
 
           @Override
@@ -331,6 +333,7 @@ public class LambdaPersistenceDocTest {
             return Recovery.create(
                 SnapshotSelectionCriteria.create(457L, System.currentTimeMillis()));
           }
+
           // #snapshot-criteria
 
           // #snapshot-offer
@@ -352,6 +355,7 @@ public class LambdaPersistenceDocTest {
                     })
                 .build();
           }
+
           // #snapshot-offer
 
           @Override
@@ -423,6 +427,7 @@ public class LambdaPersistenceDocTest {
             return receiveBuilder().match(String.class, this::handleCommand).build();
           }
         }
+
         // #persist-async
 
         public void usage() {
@@ -482,6 +487,7 @@ public class LambdaPersistenceDocTest {
             return receiveBuilder().match(String.class, this::handleCommand).build();
           }
         }
+
         // #defer
 
         public void usage() {
@@ -587,6 +593,7 @@ public class LambdaPersistenceDocTest {
                     })
                 .build();
           }
+
           // #nested-persist-persist
 
           void usage(ActorRef persistentActor) {
@@ -647,6 +654,7 @@ public class LambdaPersistenceDocTest {
                     })
                 .build();
           }
+
           // #nested-persistAsync-persistAsync
 
           void usage(ActorRef persistentActor) {
@@ -708,6 +716,7 @@ public class LambdaPersistenceDocTest {
             return receiveBuilder().matchAny(any -> {}).build();
           }
         }
+
         // #safe-shutdown
 
         public void usage() {
diff --git a/docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java b/docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java
index b951163911..cf2b0ad5eb 100644
--- a/docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java
+++ b/docs/src/test/java/jdocs/persistence/LambdaPersistencePluginDocTest.java
@@ -14,31 +14,27 @@
 package jdocs.persistence;
 
 // #plugin-imports
-import org.apache.pekko.dispatch.Futures;
-import org.apache.pekko.persistence.*;
-import org.apache.pekko.persistence.journal.japi.*;
-import org.apache.pekko.persistence.snapshot.japi.*;
-// #plugin-imports
-
-import org.apache.pekko.actor.*;
-import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbJournal;
-import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbStore;
-
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-
-import org.junit.runner.RunWith;
-import org.scalatestplus.junit.JUnitRunner;
-import scala.concurrent.Future;
-import java.util.function.Consumer;
-import org.iq80.leveldb.util.FileUtils;
 import java.util.Optional;
-
+import java.util.function.Consumer;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.dispatch.Futures;
+import org.apache.pekko.persistence.*;
 import org.apache.pekko.persistence.japi.journal.JavaJournalSpec;
 import org.apache.pekko.persistence.japi.snapshot.JavaSnapshotStoreSpec;
+import org.apache.pekko.persistence.journal.japi.*;
+import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbJournal;
+import org.apache.pekko.persistence.journal.leveldb.SharedLeveldbStore;
+import org.apache.pekko.persistence.snapshot.japi.*;
+// #plugin-imports
+import org.iq80.leveldb.util.FileUtils;
+import org.junit.runner.RunWith;
+import org.scalatestplus.junit.JUnitRunner;
+import scala.concurrent.Future;
 
 public class LambdaPersistencePluginDocTest {
 
@@ -47,6 +43,7 @@ public class LambdaPersistencePluginDocTest {
         final ActorSystem system = null;
         // #shared-store-creation
         final ActorRef store = system.actorOf(Props.create(SharedLeveldbStore.class), "store");
+
         // #shared-store-creation
 
         // #shared-store-usage
@@ -116,6 +113,7 @@ public class LambdaPersistencePluginDocTest {
         return Futures.failed(e);
       }
     }
+
     // #sync-journal-plugin-api
 
     @Override
diff --git a/docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java b/docs/src/test/java/jdocs/persistence/PersistenceMultiDocTest.java
index f337b9da94..e56d71465d 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 {
 
@@ -27,6 +27,7 @@ public class PersistenceMultiDocTest {
       return "123";
     }
   }
+
   // #default-plugins
 
   // #override-plugins
@@ -48,6 +49,7 @@ public class PersistenceMultiDocTest {
       return "pekko.persistence.chronicle.snapshot-store";
     }
   }
+
   // #override-plugins
 
   // #runtime-config
diff --git a/docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java b/docs/src/test/java/jdocs/persistence/PersistenceQueryDocTest.java
index 5d016b3ade..57cdfae43e 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();
@@ -50,6 +46,7 @@ public class PersistenceQueryDocTest {
       this.payload = payload;
     }
   }
+
   // #advanced-journal-query-types
 
   public
@@ -64,6 +61,7 @@ public class PersistenceQueryDocTest {
       this.infinite = infinite;
     }
   }
+
   // #advanced-journal-query-types
 
   interface OrderCompleted {}
@@ -87,6 +85,7 @@ public class PersistenceQueryDocTest {
       return this.javadslReadJournal;
     }
   }
+
   // #my-read-journal
 
   public
@@ -157,6 +156,7 @@ public class PersistenceQueryDocTest {
       throw new UnsupportedOperationException("Not implemented yet");
     }
   }
+
   // #my-read-journal
 
   public
@@ -206,6 +206,7 @@ public class PersistenceQueryDocTest {
       return javadslReadJournal.byTagsWithMeta(jTags).asScala();
     }
   }
+
   // #my-read-journal
 
   void demonstrateBasicUsage() {
@@ -372,6 +373,7 @@ public class PersistenceQueryDocTest {
       // #projection-into-different-store-simple-classes
     }
   }
+
   // #projection-into-different-store-simple-classes
 
   void demonstrateWritingIntoDifferentStoreWithMapAsync() {
@@ -414,6 +416,7 @@ public class PersistenceQueryDocTest {
       // #projection-into-different-store
     }
   }
+
   // #projection-into-different-store
 
   static class ComplexState {
diff --git a/docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java b/docs/src/test/java/jdocs/persistence/PersistenceSchemaEvolutionDocTest.java
index 756e51cff3..9e7df64eb7 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 {
 
@@ -50,6 +47,7 @@ public class PersistenceSchemaEvolutionDocTest {
       else return Unknown;
     }
   }
+
   // #protobuf-read-optional-model
 
   public
@@ -65,6 +63,7 @@ public class PersistenceSchemaEvolutionDocTest {
       this.seatType = seatType;
     }
   }
+
   // #protobuf-read-optional-model
 
   public
@@ -128,6 +127,7 @@ public class PersistenceSchemaEvolutionDocTest {
       else return SeatType.Unknown;
     }
   }
+
   // #protobuf-read-optional
 
   public static class RenamePlainJson {
@@ -185,6 +185,7 @@ public class PersistenceSchemaEvolutionDocTest {
         this.surname = surname;
       }
     }
+
     // #simplest-custom-serializer-model
 
     public
@@ -257,7 +258,8 @@ public class PersistenceSchemaEvolutionDocTest {
   }
 
   // #split-events-during-recovery
-  interface Version1 {};
+  interface Version1 {}
+  ;
 
   interface Version2 {}
 
@@ -286,6 +288,7 @@ public class PersistenceSchemaEvolutionDocTest {
       this.name = name;
     }
   }
+
   // #split-events-during-recovery
   public
   // #split-events-during-recovery
@@ -324,6 +327,7 @@ public class PersistenceSchemaEvolutionDocTest {
       return event;
     }
   }
+
   // #split-events-during-recovery
 
   public static class CustomerBlinked {
@@ -373,6 +377,7 @@ public class PersistenceSchemaEvolutionDocTest {
       else return new String(bytes, utf8);
     }
   }
+
   // #string-serializer-skip-deleved-event-by-manifest
 
   public
@@ -394,6 +399,7 @@ public class PersistenceSchemaEvolutionDocTest {
       else return EventSeq.single(event);
     }
   }
+
   // #string-serializer-skip-deleved-event-by-manifest-adapter
 
   // #string-serializer-handle-rename
@@ -438,6 +444,7 @@ public class PersistenceSchemaEvolutionDocTest {
       else throw new NotSerializableException("unexpected manifest [" + manifest + "]");
     }
   }
+
   // #string-serializer-handle-rename
 
   public
@@ -492,6 +499,7 @@ public class PersistenceSchemaEvolutionDocTest {
       this.customerName = customerName;
     }
   }
+
   // #detach-models
 
   // #detach-models-adapter
@@ -521,6 +529,7 @@ public class PersistenceSchemaEvolutionDocTest {
       }
     }
   }
+
   // #detach-models-adapter
 
   public
diff --git a/docs/src/test/java/jdocs/persistence/PersistentActorExample.java b/docs/src/test/java/jdocs/persistence/PersistentActorExample.java
index b20eff3ff9..550fd32306 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;
@@ -124,6 +123,7 @@ class ExamplePersistentActor extends AbstractPersistentActor {
         .build();
   }
 }
+
 // #persistent-actor-example
 
 public class PersistentActorExample {
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..2b2c498e86 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 {
 
@@ -36,6 +36,7 @@ public class Configuration {
 
     PersistenceTestKit testKit = PersistenceTestKit.create(system);
   }
+
   // #testkit-typed-conf
 
   // #snapshot-typed-conf
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/persistence/testkit/TestKitExamples.java b/docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java
index 162d674d12..563340713d 100644
--- a/docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java
+++ b/docs/src/test/java/jdocs/persistence/testkit/TestKitExamples.java
@@ -64,6 +64,7 @@ public class TestKitExamples {
       }
     }
   }
+
   // #set-event-storage-policy
 
   // #set-snapshot-storage-policy
diff --git a/docs/src/test/java/jdocs/routing/CustomRouterDocTest.java b/docs/src/test/java/jdocs/routing/CustomRouterDocTest.java
index 0ce2463920..e460b903f2 100644
--- a/docs/src/test/java/jdocs/routing/CustomRouterDocTest.java
+++ b/docs/src/test/java/jdocs/routing/CustomRouterDocTest.java
@@ -13,36 +13,32 @@
 
 package jdocs.routing;
 
+import static org.apache.pekko.japi.Util.immutableIndexedSeq;
+import static org.junit.Assert.*;
+
+import com.typesafe.config.ConfigFactory;
+import docs.routing.CustomRouterDocSpec;
+import java.util.ArrayList;
+import java.util.List;
+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;
+// #imports1
 import org.apache.pekko.routing.FromConfig;
 import org.apache.pekko.routing.RoundRobinRoutingLogic;
 import org.apache.pekko.routing.Routee;
 import org.apache.pekko.routing.RoutingLogic;
 import org.apache.pekko.routing.SeveralRoutees;
-import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 
-import jdocs.AbstractJavaTest;
+// #imports1
+import org.apache.pekko.testkit.PekkoJUnitActorSystemResource;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.ClassRule;
 import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import com.typesafe.config.ConfigFactory;
-
 import scala.collection.immutable.IndexedSeq;
-import static org.apache.pekko.japi.Util.immutableIndexedSeq;
 
-import docs.routing.CustomRouterDocSpec;
-import org.apache.pekko.actor.ActorRef;
-import org.apache.pekko.actor.ActorSystem;
-import org.apache.pekko.actor.Props;
-// #imports1
-import org.apache.pekko.actor.AbstractActor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-// #imports1
 
 public class CustomRouterDocTest extends AbstractJavaTest {
 
@@ -73,6 +69,7 @@ public class CustomRouterDocTest extends AbstractJavaTest {
       return new SeveralRoutees(targets);
     }
   }
+
   // #routing-logic
 
   public
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..876599d13e 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 {
 
@@ -122,6 +121,7 @@ public class BidiFlowDocTest extends AbstractJavaTest {
     }
     // #implementation-details-elided
   }
+
   // #codec-impl
 
   // #codec
@@ -140,6 +140,7 @@ public class BidiFlowDocTest extends AbstractJavaTest {
 
   public final BidiFlow<Message, ByteString, ByteString, Message, NotUsed> codec =
       BidiFlow.fromFunctions(BidiFlowDocTest::toBytes, BidiFlowDocTest::fromBytes);
+
   // #codec
 
   // #framing
@@ -238,6 +239,7 @@ public class BidiFlowDocTest extends AbstractJavaTest {
                     b.add(Flow.of(ByteString.class).via(new FrameParser()));
                 return BidiShape.fromFlows(top, bottom);
               }));
+
   // #framing
 
   @Test
diff --git a/docs/src/test/java/jdocs/stream/CompositionDocTest.java b/docs/src/test/java/jdocs/stream/CompositionDocTest.java
index 0a00c66d11..c1c9a68707 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 {
 
@@ -251,6 +249,7 @@ public class CompositionDocTest extends AbstractJavaTest {
       return rest.first().thenApply(c -> new MyClass(p, c));
     }
   }
+
   // #mat-combine-4a
 
   @Test
diff --git a/docs/src/test/java/jdocs/stream/FlowDocTest.java b/docs/src/test/java/jdocs/stream/FlowDocTest.java
index 82f04a08ba..767ce84dcd 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;
@@ -332,6 +331,7 @@ public class FlowDocTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #materializer-from-actor-context
 
   // #materializer-from-system-in-actor
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..1092557c83 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 {
 
@@ -50,6 +50,7 @@ public class FlowParallelismDocTest extends AbstractJavaTest {
 
   Flow<HalfCookedPancake, Pancake, NotUsed> fryingPan2 =
       Flow.of(HalfCookedPancake.class).map(halfCooked -> new Pancake());
+
   // #pipelining
 
   @Test
diff --git a/docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java b/docs/src/test/java/jdocs/stream/FlowStreamRefsDocTest.java
index 7044f11b1a..855e6b70cc 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;
@@ -71,6 +70,7 @@ public class FlowStreamRefsDocTest extends AbstractJavaTest {
       return Source.repeat("[INFO] some interesting logs here (for id: " + streamId + ")");
     }
   }
+
   // #offer-source
 
   public void offerSource() {
@@ -128,6 +128,7 @@ public class FlowStreamRefsDocTest extends AbstractJavaTest {
       return Sink.<String>ignore().mapMaterializedValue(done -> NotUsed.getInstance());
     }
   }
+
   // #offer-sink
 
   public void offerSink() {
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/GraphStageDocTest.java b/docs/src/test/java/jdocs/stream/GraphStageDocTest.java
index a1c83defac..fb123701d0 100644
--- a/docs/src/test/java/jdocs/stream/GraphStageDocTest.java
+++ b/docs/src/test/java/jdocs/stream/GraphStageDocTest.java
@@ -14,12 +14,19 @@
 package jdocs.stream;
 
 // #imports
+import static org.junit.Assert.assertEquals;
+
+import java.util.*;
+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.ActorSystem;
 import org.apache.pekko.japi.Pair;
-import org.apache.pekko.japi.function.Predicate;
 import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.japi.function.Predicate;
 import org.apache.pekko.japi.function.Procedure;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
@@ -27,7 +34,6 @@ import org.apache.pekko.stream.stage.*;
 // #imports
 import org.apache.pekko.stream.testkit.TestPublisher;
 import org.apache.pekko.stream.testkit.TestSubscriber;
-import jdocs.AbstractJavaTest;
 import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -35,13 +41,6 @@ import org.junit.Test;
 import org.reactivestreams.Subscription;
 import scala.concurrent.ExecutionContext;
 
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-
 public class GraphStageDocTest extends AbstractJavaTest {
   static ActorSystem system;
 
@@ -94,6 +93,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #simple-source
 
   // #simple-sink
@@ -132,6 +132,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #simple-sink
 
   @Test
@@ -209,6 +210,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #one-to-one
 
   @Test
@@ -280,6 +282,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #many-to-one
 
   @Test
@@ -353,6 +356,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #one-to-many
 
   @Test
@@ -409,6 +413,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #simpler-one-to-many
 
   @Test
@@ -502,6 +507,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #async-side-channel
 
   @Test
@@ -586,6 +592,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #timed
 
   public void demonstrateAGraphStageWithATimer() throws Exception {
@@ -656,6 +663,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       return new Pair<>(logic, promise);
     }
   }
+
   // #materialized
 
   public void demonstrateACustomMaterializedValue() throws Exception {
@@ -750,6 +758,7 @@ public class GraphStageDocTest extends AbstractJavaTest {
       };
     }
   }
+
   // #detached
 
   public void demonstrateADetachedGraphStage() throws Exception {
diff --git a/docs/src/test/java/jdocs/stream/HubDocTest.java b/docs/src/test/java/jdocs/stream/HubDocTest.java
index 6eae45c60e..2c0bcf937c 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;
@@ -186,6 +185,7 @@ public class HubDocTest extends AbstractJavaTest {
       return info.consumerIdByIdx((int) (i % info.size()));
     }
   }
+
   // #partition-hub-stateful-function
 
   @Test
diff --git a/docs/src/test/java/jdocs/stream/IntegrationDocTest.java b/docs/src/test/java/jdocs/stream/IntegrationDocTest.java
index d7baa5da60..c4462a54f0 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 {
@@ -310,6 +309,7 @@ public class IntegrationDocTest extends AbstractJavaTest {
           ec);
     }
   }
+
   // #sometimes-slow-service
 
   // #ask-actor
@@ -328,6 +328,7 @@ public class IntegrationDocTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #ask-actor
 
   // #actorRefWithBackpressure-actor
@@ -391,6 +392,7 @@ public class IntegrationDocTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #actorRefWithBackpressure-actor
 
   @SuppressWarnings("unchecked")
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/MigrationsJava.java b/docs/src/test/java/jdocs/stream/MigrationsJava.java
index e8756db5e9..43ae5ab96c 100644
--- a/docs/src/test/java/jdocs/stream/MigrationsJava.java
+++ b/docs/src/test/java/jdocs/stream/MigrationsJava.java
@@ -13,13 +13,14 @@
 
 package jdocs.stream;
 
-import java.util.stream.Stream;
+import static org.apache.pekko.stream.javadsl.AsPublisher.*;
+// #asPublisher-import
 
+import java.util.stream.Stream;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.*;
-// #asPublisher-import
-import static org.apache.pekko.stream.javadsl.AsPublisher.*;
+
 // #asPublisher-import
 
 public class MigrationsJava {
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/ReactiveStreamsDocTest.java b/docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java
index d1b48e2520..a11f5fc632 100644
--- a/docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java
+++ b/docs/src/test/java/jdocs/stream/ReactiveStreamsDocTest.java
@@ -13,31 +13,29 @@
 
 package jdocs.stream;
 
+import static jdocs.stream.ReactiveStreamsDocTest.Fixture.Data.authors;
+import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.PEKKO;
+
+import jdocs.AbstractJavaTest;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorRef;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.japi.function.Creator;
 import org.apache.pekko.stream.javadsl.*;
 import org.apache.pekko.testkit.TestProbe;
-import jdocs.AbstractJavaTest;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
 import org.apache.pekko.testkit.javadsl.TestKit;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 // #imports
+import org.reactivestreams.Processor;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
-import org.reactivestreams.Processor;
-// #imports
 import org.reactivestreams.Subscription;
 
-import java.lang.Exception;
-
-import static jdocs.stream.ReactiveStreamsDocTest.Fixture.Data.authors;
-import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.PEKKO;
+// #imports
 
 public class ReactiveStreamsDocTest extends AbstractJavaTest {
 
@@ -74,10 +72,12 @@ public class ReactiveStreamsDocTest extends AbstractJavaTest {
     static interface RS {
       // #tweets-publisher
       Publisher<Tweet> tweets();
+
       // #tweets-publisher
 
       // #author-storage-subscriber
       Subscriber<Author> storage();
+
       // #author-storage-subscriber
 
       // #author-alert-subscriber
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 b4a9a56d3d..3d080759ac 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..7dfd4de7b0 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;
@@ -104,6 +103,7 @@ public class StreamPartialGraphDSLDocTest extends AbstractJavaTest {
       return next++;
     }
   }
+
   // #source-from-partial-graph-dsl
 
   @Test
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/TwitterStreamQuickstartDocTest.java b/docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java
index 6a5deb16e1..d87a2260ea 100644
--- a/docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java
+++ b/docs/src/test/java/jdocs/stream/TwitterStreamQuickstartDocTest.java
@@ -13,6 +13,21 @@
 
 package jdocs.stream;
 
+import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.PEKKO;
+import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.tweets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Set;
+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 jdocs.AbstractJavaTest;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Hashtag;
+import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
 import org.apache.pekko.Done;
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
@@ -21,28 +36,11 @@ import org.apache.pekko.japi.JavaPartialFunction;
 import org.apache.pekko.stream.*;
 import org.apache.pekko.stream.javadsl.*;
 // #imports
-import jdocs.AbstractJavaTest;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Author;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Hashtag;
-import jdocs.stream.TwitterStreamQuickstartDocTest.Model.Tweet;
 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.Set;
-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 static jdocs.stream.TwitterStreamQuickstartDocTest.Model.PEKKO;
-import static jdocs.stream.TwitterStreamQuickstartDocTest.Model.tweets;
-
 @SuppressWarnings("unused")
 public class TwitterStreamQuickstartDocTest extends AbstractJavaTest {
 
@@ -103,6 +101,7 @@ public class TwitterStreamQuickstartDocTest extends AbstractJavaTest {
       }
       // #model
     }
+
     // #model
 
     // #model
@@ -137,6 +136,7 @@ public class TwitterStreamQuickstartDocTest extends AbstractJavaTest {
       }
       // #model
     }
+
     // #model
 
     // #model
@@ -169,6 +169,7 @@ public class TwitterStreamQuickstartDocTest extends AbstractJavaTest {
 
       // #model
     }
+
     // #model
 
     // #model
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..0d216479a7 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);
@@ -69,6 +68,7 @@ public class RecipeAdhocSourceTest extends RecipeTest {
                                     .mapMaterializedValue(v -> NotUsed.getInstance()))
                         .build()));
   }
+
   // #adhoc-source
 
   @Test
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..49c719bbeb 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;
 
@@ -140,6 +139,7 @@ public class RecipeByteStrings extends RecipeTest {
           };
         }
       }
+
       // #bytestring-chunker
 
       {
@@ -220,6 +220,7 @@ public class RecipeByteStrings extends RecipeTest {
           };
         }
       }
+
       // #bytes-limiter
 
       {
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..7b456d7d0d 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;
 
@@ -104,6 +103,7 @@ public class RecipeDigest extends RecipeTest {
       };
     }
   }
+
   // #calculating-digest
 
   @Test
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..1801cf0490 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;
 
@@ -50,6 +49,7 @@ public class RecipeDroppyBroadcast extends RecipeTest {
           Sink<T, CompletionStage<Done>> sink, int size) {
         return Flow.<T>create().buffer(size, OverflowStrategy.dropHead()).toMat(sink, Keep.right());
       }
+
       // #droppy-bcast
 
       {
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..376a1a63ba 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;
 
@@ -159,6 +158,7 @@ public class RecipeGlobalRateLimit extends RecipeTest {
               });
     }
   }
+
   // #global-limiter-actor
 
   @Test
@@ -177,6 +177,7 @@ public class RecipeGlobalRateLimit extends RecipeTest {
               return limiterTriggerFuture.thenApplyAsync(response -> element, system.dispatcher());
             });
       }
+
       // #global-limiter-flow
 
       {
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..8698d370f3 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;
 
@@ -101,6 +100,7 @@ public class RecipeHold extends RecipeTest {
       };
     }
   }
+
   // #hold-version-1
 
   // #hold-version-2
@@ -151,6 +151,7 @@ public class RecipeHold extends RecipeTest {
       };
     }
   }
+
   // #hold-version-2
 
   @Test
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..23e1ebf46e 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;
 
@@ -40,7 +39,8 @@ public class RecipeLoggingElements extends RecipeTest {
         ActorSystem.create(
             "RecipeLoggingElements",
             ConfigFactory.parseString(
-                "pekko.loglevel=DEBUG\npekko.loggers = [org.apache.pekko.testkit.TestEventListener]"));
+                "pekko.loglevel=DEBUG\n"
+                    + "pekko.loggers = [org.apache.pekko.testkit.TestEventListener]"));
   }
 
   @AfterClass
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 989fffd87a..467e5ff3de 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.Pair;
@@ -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..25c3096c4e 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;
 
@@ -99,6 +98,7 @@ public class RecipeReduceByKeyTest extends RecipeTest {
             (left, right) -> new Pair<>(left.first(), reduce.apply(left.second(), right.second())))
         .mergeSubstreams();
   }
+
   // #reduce-by-key-general
 
   @Test
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..3e285a5d0e 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;
 
@@ -37,7 +36,8 @@ public class RecipeSourceFromFunction extends RecipeTest {
         ActorSystem.create(
             "RecipeSourceFromFunction",
             ConfigFactory.parseString(
-                "pekko.loglevel=DEBUG\npekko.loggers = [org.apache.pekko.testkit.TestEventListener]"));
+                "pekko.loglevel=DEBUG\n"
+                    + "pekko.loggers = [org.apache.pekko.testkit.TestEventListener]"));
   }
 
   @AfterClass
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..3a9638e0d6 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;
 
@@ -62,6 +61,7 @@ public class RecipeWorkerPool extends RecipeTest {
               return FlowShape.of(balance.in(), merge.out());
             }));
   }
+
   // #worker-pool
 
   @Test
diff --git a/docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java b/docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java
index aa7f589c09..30a6609b6b 100644
--- a/docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java
+++ b/docs/src/test/java/jdocs/stream/operators/SinkDocExamples.java
@@ -13,19 +13,19 @@
 
 package jdocs.stream.operators;
 
+import java.util.*;
+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.japi.Pair;
 import org.apache.pekko.stream.javadsl.AsPublisher;
 import org.apache.pekko.stream.javadsl.Sink;
 import org.apache.pekko.stream.javadsl.Source;
 // #takeLast-operator-example
-import org.apache.pekko.japi.Pair;
 import org.reactivestreams.Publisher;
+
 // #takeLast-operator-example
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 
 public class SinkDocExamples {
 
diff --git a/docs/src/test/java/jdocs/stream/operators/WithContextTest.java b/docs/src/test/java/jdocs/stream/operators/WithContextTest.java
index 7dc244cec0..d5fe669fe0 100644
--- a/docs/src/test/java/jdocs/stream/operators/WithContextTest.java
+++ b/docs/src/test/java/jdocs/stream/operators/WithContextTest.java
@@ -13,27 +13,26 @@
 
 package jdocs.stream.operators;
 
+import static org.hamcrest.CoreMatchers.hasItems;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import jdocs.AbstractJavaTest;
+import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
 // #imports
-import org.apache.pekko.NotUsed;
 import org.apache.pekko.japi.Pair;
 import org.apache.pekko.stream.javadsl.*;
 // #imports
 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;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
-
-import static org.hamcrest.CoreMatchers.hasItems;
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class WithContextTest extends AbstractJavaTest {
 
   static ActorSystem system;
diff --git a/docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java b/docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java
index 1601c03f26..7bb5c9a365 100644
--- a/docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java
+++ b/docs/src/test/java/jdocs/stream/operators/converters/StreamConvertersToJava.java
@@ -13,13 +13,8 @@
 
 package jdocs.stream.operators.converters;
 
-import org.apache.pekko.NotUsed;
-import org.apache.pekko.actor.ActorSystem;
+import static org.junit.Assert.assertEquals;
 // #import
-import org.apache.pekko.japi.function.Creator;
-import org.apache.pekko.stream.Materializer;
-import org.apache.pekko.stream.javadsl.Sink;
-import org.apache.pekko.stream.javadsl.StreamConverters;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
@@ -28,15 +23,18 @@ import java.util.concurrent.TimeoutException;
 import java.util.stream.BaseStream;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
+import jdocs.AbstractJavaTest;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.japi.function.Creator;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.StreamConverters;
 // #import
 import org.apache.pekko.testkit.javadsl.TestKit;
-import jdocs.AbstractJavaTest;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.apache.pekko.stream.javadsl.Source;
-
-import static org.junit.Assert.assertEquals;
 
 /** */
 public class StreamConvertersToJava extends AbstractJavaTest {
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..8ed38c9b36 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;
@@ -31,6 +30,7 @@ public class FutureFlow {
     return CompletableFuture.completedFuture(
         Flow.of(Integer.class).map(n -> "id: " + id + " value: " + n));
   }
+
   // #base-on-first-element
 
   public void compileOnlyBaseOnFirst() {
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/AsSubscriber.java b/docs/src/test/java/jdocs/stream/operators/source/AsSubscriber.java
index 280cc3504c..b289479910 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/AsSubscriber.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/AsSubscriber.java
@@ -14,13 +14,13 @@
 package jdocs.stream.operators.source;
 
 // #imports
-import java.util.concurrent.Flow.Subscriber;
 import java.util.concurrent.Flow.Publisher;
-
+import java.util.concurrent.Flow.Subscriber;
 import org.apache.pekko.NotUsed;
-import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.JavaFlowSupport;
 // #imports
+import org.apache.pekko.stream.javadsl.Source;
+
 public interface AsSubscriber {
   // We are 'faking' the JavaFlowSupport API here so we can include the signature as a snippet in
   // the API,
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/FromPublisher.java b/docs/src/test/java/jdocs/stream/operators/source/FromPublisher.java
index cc273fa362..ee4594b66c 100644
--- a/docs/src/test/java/jdocs/stream/operators/source/FromPublisher.java
+++ b/docs/src/test/java/jdocs/stream/operators/source/FromPublisher.java
@@ -15,10 +15,9 @@ package jdocs.stream.operators.source;
 
 // #imports
 import java.util.concurrent.Flow.Publisher;
-
 import org.apache.pekko.NotUsed;
-import org.apache.pekko.stream.javadsl.Source;
 import org.apache.pekko.stream.javadsl.JavaFlowSupport;
+import org.apache.pekko.stream.javadsl.Source;
 
 // #imports
 
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 9a620bf87c..7e8ba979a2 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.function.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..8e6817e817 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
@@ -31,6 +30,7 @@ interface Unfold {
           else return Optional.of(Pair.create(current - 1, current));
         });
   }
+
   // #countdown
 
   // #fibonacci
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..f38b7a0c0f 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
@@ -29,6 +28,7 @@ interface UnfoldResource {
 
   interface QueryResult {
     boolean hasMore();
+
     // potentially blocking retrieval of each element
     DatabaseEntry nextEntry();
 
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..71128470ff 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;
 
@@ -27,6 +26,7 @@ public class FlatMapConcat {
   private Source<String, NotUsed> lookupCustomerEvents(String customerId) {
     return Source.from(Arrays.asList(customerId + "-event-1", customerId + "-event-2"));
   }
+
   // #flatmap-concat
 
   void example() {
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..720c5f7252 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;
 
@@ -27,6 +26,7 @@ public class FlatMapMerge {
   private Source<String, NotUsed> lookupCustomerEvents(String customerId) {
     return Source.from(Arrays.asList(customerId + "-evt-1", customerId + "-evt-2"));
   }
+
   // #flatmap-merge
 
   void example() {
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..c3831904b6 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 {
 
@@ -74,6 +73,7 @@ public class MapAsyncs {
     // #mapasync-concurrent
     // #mapasyncunordered
   }
+
   // #mapasync-strict-order
   // #mapasync-concurrent
   // #mapasyncunordered
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..efd5f6fbdd 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
@@ -51,6 +50,7 @@ public interface MapWithResource {
   }
 
   interface DatabaseRecord {}
+
   // #mapWithResource-blocking-api
 
   default void mapWithResourceExample() {
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..79094c2aaf 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 {
 
@@ -45,6 +44,7 @@ public class Monitor {
       System.out.println("Stream completed already");
     }
   }
+
   // #monitor
 
   public static void main(String[] args)
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 7e12a53de3..b8209ebb39 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.function.Creator;
 import org.apache.pekko.japi.function.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;
 
@@ -61,6 +61,7 @@ public class ParentChildTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #test-example
 
   static
@@ -79,6 +80,7 @@ public class ParentChildTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #test-dependentchild
 
   static
@@ -100,6 +102,7 @@ public class ParentChildTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #test-dependentparent
 
   static
@@ -120,6 +123,7 @@ public class ParentChildTest extends AbstractJavaTest {
           .build();
     }
   }
+
   // #test-dependentparent-generic
 
   @Test
@@ -190,6 +194,7 @@ public class ParentChildTest extends AbstractJavaTest {
       };
     }
   }
+
   // #test-fabricated-parent-creator
 
   @Test
diff --git a/docs/src/test/java/jdocs/testkit/TestKitDocTest.java b/docs/src/test/java/jdocs/testkit/TestKitDocTest.java
index c753a57361..225e693556 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 {
 
@@ -89,6 +85,7 @@ public class TestKitDocTest extends AbstractJavaTest {
     final MyActor actor = ref.underlyingActor();
     assertTrue(actor.testMe());
   }
+
   // #test-actor-ref
 
   // #timer
@@ -129,6 +126,7 @@ public class TestKitDocTest extends AbstractJavaTest {
       getTimers().startSingleTimer(SCHED_KEY, new ScheduledMessage(), Duration.ofMillis(500));
     }
   }
+
   // #timer
 
   @Test
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..a6e3d8d014 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;
@@ -49,6 +48,7 @@ public class Device extends AbstractBehavior<Device.Command> {
       this.requestId = requestId;
     }
   }
+
   // #write-protocol
 
   public static final class ReadTemperature implements Command {
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..d907525a57 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
 /*
@@ -45,6 +45,7 @@ public class DeviceTest extends org.scalatestplus.junit.JUnitSuite {
     assertEquals(42L, response.requestId);
     assertEquals(Optional.empty(), response.value);
   }
+
   // #device-read-test
 
   // #device-write-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..cf8cba3820 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 {}
@@ -48,6 +47,7 @@ public class Device extends AbstractBehavior<Device.Command> {
       this.value = value;
     }
   }
+
   // #read-protocol-2
 
   public static Behavior<Command> create(String groupId, String deviceId) {
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..7b6200d7b0 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;
@@ -73,6 +72,7 @@ public class Device extends AbstractBehavior<Device.Command> {
   static enum Passivate implements Command {
     INSTANCE
   }
+
   // #passivate-msg
 
   public static Behavior<Command> create(String groupId, String deviceId) {
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..c1d79dd883 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
@@ -43,6 +42,7 @@ public class DeviceGroup extends AbstractBehavior<DeviceGroup.Command> {
       this.deviceId = deviceId;
     }
   }
+
   // #device-terminated
 
   public static Behavior<Command> create(String groupId) {
@@ -93,6 +93,7 @@ public class DeviceGroup extends AbstractBehavior<DeviceGroup.Command> {
     r.replyTo.tell(new DeviceManager.ReplyDeviceList(r.requestId, deviceIdToActor.keySet()));
     return this;
   }
+
   // #device-group-remove
 
   private DeviceGroup onTerminated(DeviceTerminated t) {
@@ -100,6 +101,7 @@ public class DeviceGroup extends AbstractBehavior<DeviceGroup.Command> {
     deviceIdToActor.remove(t.deviceId);
     return this;
   }
+
   // #device-group-register
 
   @Override
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..781e4c5924 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();
@@ -65,6 +63,7 @@ public class DeviceGroupTest extends JUnitSuite {
     groupActor.tell(new RequestTrackDevice("wrongGroup", "device1", probe.getRef()));
     probe.expectNoMessage();
   }
+
   // #device-group-test-registration
 
   // #device-group-test3
@@ -81,6 +80,7 @@ public class DeviceGroupTest extends JUnitSuite {
     DeviceRegistered registered2 = probe.receiveMessage();
     assertEquals(registered1.device, registered2.device);
   }
+
   // #device-group-test3
 
   // #device-group-list-terminate-test
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..3824867272 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> {
@@ -52,6 +51,7 @@ public class DeviceManager extends AbstractBehavior<DeviceManager.Command> {
       this.device = device;
     }
   }
+
   // #device-registration-msgs
 
   // #device-list-msgs
@@ -77,6 +77,7 @@ public class DeviceManager extends AbstractBehavior<DeviceManager.Command> {
       this.ids = ids;
     }
   }
+
   // #device-list-msgs
 
   private static class DeviceGroupTerminated implements 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..9ffe9edf74 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();
@@ -39,6 +38,7 @@ public class DeviceTest extends JUnitSuite {
     assertEquals(42L, response.requestId);
     assertEquals(Optional.empty(), response.value);
   }
+
   // #device-read-test
 
   // #device-write-read-test
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..0e53ed124f 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;
@@ -69,6 +68,7 @@ public class Device extends AbstractBehavior<Device.Command> {
       this.value = value;
     }
   }
+
   // #respond-declare
 
   static enum Passivate implements Command {
@@ -114,6 +114,7 @@ public class Device extends AbstractBehavior<Device.Command> {
     r.replyTo.tell(new RespondTemperature(r.requestId, deviceId, lastTemperatureReading));
     return this;
   }
+
   // #respond-reply
 
   private Behavior<Command> onPostStop() {
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..1c615241e4 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> {
@@ -139,6 +138,7 @@ public class DeviceGroupQuery extends AbstractBehavior<DeviceGroupQuery.Command>
     stillWaiting.clear();
     return respondWhenAllCollected();
   }
+
   // #query-state
 
   // #query-collect-reply
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..f0eb0732e4 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();
@@ -75,6 +73,7 @@ public class DeviceGroupQueryTest extends JUnitSuite {
 
     assertEquals(expectedTemperatures, response.temperatures);
   }
+
   // #query-test-normal
 
   // #query-test-no-reading
@@ -114,6 +113,7 @@ public class DeviceGroupQueryTest extends JUnitSuite {
 
     assertEquals(expectedTemperatures, response.temperatures);
   }
+
   // #query-test-no-reading
 
   // #query-test-stopped
@@ -151,6 +151,7 @@ public class DeviceGroupQueryTest extends JUnitSuite {
 
     assertEquals(expectedTemperatures, response.temperatures);
   }
+
   // #query-test-stopped
 
   // #query-test-stopped-later
@@ -192,6 +193,7 @@ public class DeviceGroupQueryTest extends JUnitSuite {
 
     assertEquals(expectedTemperatures, response.temperatures);
   }
+
   // #query-test-stopped-later
 
   // #query-test-timeout
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..9fe5a2ee54 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 {}
@@ -143,6 +142,7 @@ public class DeviceManager extends AbstractBehavior<DeviceManager.Command> {
   public enum DeviceTimedOut implements TemperatureReading {
     INSTANCE
   }
+
   // #query-protocol
 
   private static class DeviceGroupTerminated implements DeviceManager.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/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java b/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
index 22ceea9346..9c482be8be 100644
--- a/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
+++ b/persistence-query/src/main/java/org/apache/pekko/persistence/query/internal/protobuf/QueryMessages.java
@@ -51,12 +51,14 @@ public final class QueryMessages {
      * @return Whether the persistenceId field is set.
      */
     boolean hasPersistenceId();
+
     /**
      * <code>required string persistence_id = 1;</code>
      *
      * @return The persistenceId.
      */
     java.lang.String getPersistenceId();
+
     /**
      * <code>required string persistence_id = 1;</code>
      *
@@ -70,12 +72,14 @@ public final class QueryMessages {
      * @return Whether the entityType field is set.
      */
     boolean hasEntityType();
+
     /**
      * <code>required string entity_type = 2;</code>
      *
      * @return The entityType.
      */
     java.lang.String getEntityType();
+
     /**
      * <code>required string entity_type = 2;</code>
      *
@@ -89,6 +93,7 @@ public final class QueryMessages {
      * @return Whether the slice field is set.
      */
     boolean hasSlice();
+
     /**
      * <code>required int32 slice = 3;</code>
      *
@@ -102,6 +107,7 @@ public final class QueryMessages {
      * @return Whether the sequenceNr field is set.
      */
     boolean hasSequenceNr();
+
     /**
      * <code>required int64 sequence_nr = 4;</code>
      *
@@ -115,6 +121,7 @@ public final class QueryMessages {
      * @return Whether the timestamp field is set.
      */
     boolean hasTimestamp();
+
     /**
      * <code>required int64 timestamp = 5;</code>
      *
@@ -128,12 +135,14 @@ public final class QueryMessages {
      * @return Whether the offset field is set.
      */
     boolean hasOffset();
+
     /**
      * <code>required string offset = 6;</code>
      *
      * @return The offset.
      */
     java.lang.String getOffset();
+
     /**
      * <code>required string offset = 6;</code>
      *
@@ -147,12 +156,14 @@ public final class QueryMessages {
      * @return Whether the offsetManifest field is set.
      */
     boolean hasOffsetManifest();
+
     /**
      * <code>required string offset_manifest = 7;</code>
      *
      * @return The offsetManifest.
      */
     java.lang.String getOffsetManifest();
+
     /**
      * <code>required string offset_manifest = 7;</code>
      *
@@ -166,12 +177,14 @@ public final class QueryMessages {
      * @return Whether the event field is set.
      */
     boolean hasEvent();
+
     /**
      * <code>optional .Payload event = 8;</code>
      *
      * @return The event.
      */
     org.apache.pekko.remote.ContainerFormats.Payload getEvent();
+
     /** <code>optional .Payload event = 8;</code> */
     org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder();
 
@@ -181,15 +194,18 @@ public final class QueryMessages {
      * @return Whether the metadata field is set.
      */
     boolean hasMetadata();
+
     /**
      * <code>optional .Payload metadata = 9;</code>
      *
      * @return The metadata.
      */
     org.apache.pekko.remote.ContainerFormats.Payload getMetadata();
+
     /** <code>optional .Payload metadata = 9;</code> */
     org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder();
   }
+
   /**
    *
    *
@@ -215,6 +231,7 @@ public final class QueryMessages {
           /* suffix= */ "",
           EventEnvelope.class.getName());
     }
+
     // Use EventEnvelope.newBuilder() to construct.
     private EventEnvelope(
         org.apache.pekko.protobufv3.internal.GeneratedMessage.Builder<?> builder) {
@@ -251,6 +268,7 @@ public final class QueryMessages {
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object persistenceId_ = "";
+
     /**
      * <code>required string persistence_id = 1;</code>
      *
@@ -260,6 +278,7 @@ public final class QueryMessages {
     public boolean hasPersistenceId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
+
     /**
      * <code>required string persistence_id = 1;</code>
      *
@@ -280,6 +299,7 @@ public final class QueryMessages {
         return s;
       }
     }
+
     /**
      * <code>required string persistence_id = 1;</code>
      *
@@ -302,6 +322,7 @@ public final class QueryMessages {
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object entityType_ = "";
+
     /**
      * <code>required string entity_type = 2;</code>
      *
@@ -311,6 +332,7 @@ public final class QueryMessages {
     public boolean hasEntityType() {
       return ((bitField0_ & 0x00000002) != 0);
     }
+
     /**
      * <code>required string entity_type = 2;</code>
      *
@@ -331,6 +353,7 @@ public final class QueryMessages {
         return s;
       }
     }
+
     /**
      * <code>required string entity_type = 2;</code>
      *
@@ -351,6 +374,7 @@ public final class QueryMessages {
 
     public static final int SLICE_FIELD_NUMBER = 3;
     private int slice_ = 0;
+
     /**
      * <code>required int32 slice = 3;</code>
      *
@@ -360,6 +384,7 @@ public final class QueryMessages {
     public boolean hasSlice() {
       return ((bitField0_ & 0x00000004) != 0);
     }
+
     /**
      * <code>required int32 slice = 3;</code>
      *
@@ -372,6 +397,7 @@ public final class QueryMessages {
 
     public static final int SEQUENCE_NR_FIELD_NUMBER = 4;
     private long sequenceNr_ = 0L;
+
     /**
      * <code>required int64 sequence_nr = 4;</code>
      *
@@ -381,6 +407,7 @@ public final class QueryMessages {
     public boolean hasSequenceNr() {
       return ((bitField0_ & 0x00000008) != 0);
     }
+
     /**
      * <code>required int64 sequence_nr = 4;</code>
      *
@@ -393,6 +420,7 @@ public final class QueryMessages {
 
     public static final int TIMESTAMP_FIELD_NUMBER = 5;
     private long timestamp_ = 0L;
+
     /**
      * <code>required int64 timestamp = 5;</code>
      *
@@ -402,6 +430,7 @@ public final class QueryMessages {
     public boolean hasTimestamp() {
       return ((bitField0_ & 0x00000010) != 0);
     }
+
     /**
      * <code>required int64 timestamp = 5;</code>
      *
@@ -416,6 +445,7 @@ public final class QueryMessages {
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object offset_ = "";
+
     /**
      * <code>required string offset = 6;</code>
      *
@@ -425,6 +455,7 @@ public final class QueryMessages {
     public boolean hasOffset() {
       return ((bitField0_ & 0x00000020) != 0);
     }
+
     /**
      * <code>required string offset = 6;</code>
      *
@@ -445,6 +476,7 @@ public final class QueryMessages {
         return s;
       }
     }
+
     /**
      * <code>required string offset = 6;</code>
      *
@@ -467,6 +499,7 @@ public final class QueryMessages {
 
     @SuppressWarnings("serial")
     private volatile java.lang.Object offsetManifest_ = "";
+
     /**
      * <code>required string offset_manifest = 7;</code>
      *
@@ -476,6 +509,7 @@ public final class QueryMessages {
     public boolean hasOffsetManifest() {
       return ((bitField0_ & 0x00000040) != 0);
     }
+
     /**
      * <code>required string offset_manifest = 7;</code>
      *
@@ -496,6 +530,7 @@ public final class QueryMessages {
         return s;
       }
     }
+
     /**
      * <code>required string offset_manifest = 7;</code>
      *
@@ -516,6 +551,7 @@ public final class QueryMessages {
 
     public static final int EVENT_FIELD_NUMBER = 8;
     private org.apache.pekko.remote.ContainerFormats.Payload event_;
+
     /**
      * <code>optional .Payload event = 8;</code>
      *
@@ -525,6 +561,7 @@ public final class QueryMessages {
     public boolean hasEvent() {
       return ((bitField0_ & 0x00000080) != 0);
     }
+
     /**
      * <code>optional .Payload event = 8;</code>
      *
@@ -536,6 +573,7 @@ public final class QueryMessages {
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : event_;
     }
+
     /** <code>optional .Payload event = 8;</code> */
     @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
@@ -546,6 +584,7 @@ public final class QueryMessages {
 
     public static final int METADATA_FIELD_NUMBER = 9;
     private org.apache.pekko.remote.ContainerFormats.Payload metadata_;
+
     /**
      * <code>optional .Payload metadata = 9;</code>
      *
@@ -555,6 +594,7 @@ public final class QueryMessages {
     public boolean hasMetadata() {
       return ((bitField0_ & 0x00000100) != 0);
     }
+
     /**
      * <code>optional .Payload metadata = 9;</code>
      *
@@ -566,6 +606,7 @@ public final class QueryMessages {
           ? org.apache.pekko.remote.ContainerFormats.Payload.getDefaultInstance()
           : metadata_;
     }
+
     /** <code>optional .Payload metadata = 9;</code> */
     @java.lang.Override
     public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
@@ -926,6 +967,7 @@ public final class QueryMessages {
       Builder builder = new Builder(parent);
       return builder;
     }
+
     /**
      *
      *
@@ -1266,6 +1308,7 @@ public final class QueryMessages {
       private int bitField0_;
 
       private java.lang.Object persistenceId_ = "";
+
       /**
        * <code>required string persistence_id = 1;</code>
        *
@@ -1274,6 +1317,7 @@ public final class QueryMessages {
       public boolean hasPersistenceId() {
         return ((bitField0_ & 0x00000001) != 0);
       }
+
       /**
        * <code>required string persistence_id = 1;</code>
        *
@@ -1293,6 +1337,7 @@ public final class QueryMessages {
           return (java.lang.String) ref;
         }
       }
+
       /**
        * <code>required string persistence_id = 1;</code>
        *
@@ -1309,6 +1354,7 @@ public final class QueryMessages {
           return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
+
       /**
        * <code>required string persistence_id = 1;</code>
        *
@@ -1324,6 +1370,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string persistence_id = 1;</code>
        *
@@ -1335,6 +1382,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string persistence_id = 1;</code>
        *
@@ -1352,6 +1400,7 @@ public final class QueryMessages {
       }
 
       private java.lang.Object entityType_ = "";
+
       /**
        * <code>required string entity_type = 2;</code>
        *
@@ -1360,6 +1409,7 @@ public final class QueryMessages {
       public boolean hasEntityType() {
         return ((bitField0_ & 0x00000002) != 0);
       }
+
       /**
        * <code>required string entity_type = 2;</code>
        *
@@ -1379,6 +1429,7 @@ public final class QueryMessages {
           return (java.lang.String) ref;
         }
       }
+
       /**
        * <code>required string entity_type = 2;</code>
        *
@@ -1395,6 +1446,7 @@ public final class QueryMessages {
           return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
+
       /**
        * <code>required string entity_type = 2;</code>
        *
@@ -1410,6 +1462,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string entity_type = 2;</code>
        *
@@ -1421,6 +1474,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string entity_type = 2;</code>
        *
@@ -1438,6 +1492,7 @@ public final class QueryMessages {
       }
 
       private int slice_;
+
       /**
        * <code>required int32 slice = 3;</code>
        *
@@ -1447,6 +1502,7 @@ public final class QueryMessages {
       public boolean hasSlice() {
         return ((bitField0_ & 0x00000004) != 0);
       }
+
       /**
        * <code>required int32 slice = 3;</code>
        *
@@ -1456,6 +1512,7 @@ public final class QueryMessages {
       public int getSlice() {
         return slice_;
       }
+
       /**
        * <code>required int32 slice = 3;</code>
        *
@@ -1469,6 +1526,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required int32 slice = 3;</code>
        *
@@ -1482,6 +1540,7 @@ public final class QueryMessages {
       }
 
       private long sequenceNr_;
+
       /**
        * <code>required int64 sequence_nr = 4;</code>
        *
@@ -1491,6 +1550,7 @@ public final class QueryMessages {
       public boolean hasSequenceNr() {
         return ((bitField0_ & 0x00000008) != 0);
       }
+
       /**
        * <code>required int64 sequence_nr = 4;</code>
        *
@@ -1500,6 +1560,7 @@ public final class QueryMessages {
       public long getSequenceNr() {
         return sequenceNr_;
       }
+
       /**
        * <code>required int64 sequence_nr = 4;</code>
        *
@@ -1513,6 +1574,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required int64 sequence_nr = 4;</code>
        *
@@ -1526,6 +1588,7 @@ public final class QueryMessages {
       }
 
       private long timestamp_;
+
       /**
        * <code>required int64 timestamp = 5;</code>
        *
@@ -1535,6 +1598,7 @@ public final class QueryMessages {
       public boolean hasTimestamp() {
         return ((bitField0_ & 0x00000010) != 0);
       }
+
       /**
        * <code>required int64 timestamp = 5;</code>
        *
@@ -1544,6 +1608,7 @@ public final class QueryMessages {
       public long getTimestamp() {
         return timestamp_;
       }
+
       /**
        * <code>required int64 timestamp = 5;</code>
        *
@@ -1557,6 +1622,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required int64 timestamp = 5;</code>
        *
@@ -1570,6 +1636,7 @@ public final class QueryMessages {
       }
 
       private java.lang.Object offset_ = "";
+
       /**
        * <code>required string offset = 6;</code>
        *
@@ -1578,6 +1645,7 @@ public final class QueryMessages {
       public boolean hasOffset() {
         return ((bitField0_ & 0x00000020) != 0);
       }
+
       /**
        * <code>required string offset = 6;</code>
        *
@@ -1597,6 +1665,7 @@ public final class QueryMessages {
           return (java.lang.String) ref;
         }
       }
+
       /**
        * <code>required string offset = 6;</code>
        *
@@ -1613,6 +1682,7 @@ public final class QueryMessages {
           return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
+
       /**
        * <code>required string offset = 6;</code>
        *
@@ -1628,6 +1698,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string offset = 6;</code>
        *
@@ -1639,6 +1710,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string offset = 6;</code>
        *
@@ -1656,6 +1728,7 @@ public final class QueryMessages {
       }
 
       private java.lang.Object offsetManifest_ = "";
+
       /**
        * <code>required string offset_manifest = 7;</code>
        *
@@ -1664,6 +1737,7 @@ public final class QueryMessages {
       public boolean hasOffsetManifest() {
         return ((bitField0_ & 0x00000040) != 0);
       }
+
       /**
        * <code>required string offset_manifest = 7;</code>
        *
@@ -1683,6 +1757,7 @@ public final class QueryMessages {
           return (java.lang.String) ref;
         }
       }
+
       /**
        * <code>required string offset_manifest = 7;</code>
        *
@@ -1699,6 +1774,7 @@ public final class QueryMessages {
           return (org.apache.pekko.protobufv3.internal.ByteString) ref;
         }
       }
+
       /**
        * <code>required string offset_manifest = 7;</code>
        *
@@ -1714,6 +1790,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string offset_manifest = 7;</code>
        *
@@ -1725,6 +1802,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /**
        * <code>required string offset_manifest = 7;</code>
        *
@@ -1747,6 +1825,7 @@ public final class QueryMessages {
               org.apache.pekko.remote.ContainerFormats.Payload.Builder,
               org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           eventBuilder_;
+
       /**
        * <code>optional .Payload event = 8;</code>
        *
@@ -1755,6 +1834,7 @@ public final class QueryMessages {
       public boolean hasEvent() {
         return ((bitField0_ & 0x00000080) != 0);
       }
+
       /**
        * <code>optional .Payload event = 8;</code>
        *
@@ -1769,6 +1849,7 @@ public final class QueryMessages {
           return eventBuilder_.getMessage();
         }
       }
+
       /** <code>optional .Payload event = 8;</code> */
       public Builder setEvent(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (eventBuilder_ == null) {
@@ -1783,6 +1864,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /** <code>optional .Payload event = 8;</code> */
       public Builder setEvent(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
@@ -1795,6 +1877,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /** <code>optional .Payload event = 8;</code> */
       public Builder mergeEvent(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (eventBuilder_ == null) {
@@ -1814,6 +1897,7 @@ public final class QueryMessages {
         }
         return this;
       }
+
       /** <code>optional .Payload event = 8;</code> */
       public Builder clearEvent() {
         bitField0_ = (bitField0_ & ~0x00000080);
@@ -1825,12 +1909,14 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /** <code>optional .Payload event = 8;</code> */
       public org.apache.pekko.remote.ContainerFormats.Payload.Builder getEventBuilder() {
         bitField0_ |= 0x00000080;
         onChanged();
         return internalGetEventFieldBuilder().getBuilder();
       }
+
       /** <code>optional .Payload event = 8;</code> */
       public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getEventOrBuilder() {
         if (eventBuilder_ != null) {
@@ -1841,6 +1927,7 @@ public final class QueryMessages {
               : event_;
         }
       }
+
       /** <code>optional .Payload event = 8;</code> */
       private org.apache.pekko.protobufv3.internal.SingleFieldBuilder<
               org.apache.pekko.remote.ContainerFormats.Payload,
@@ -1865,6 +1952,7 @@ public final class QueryMessages {
               org.apache.pekko.remote.ContainerFormats.Payload.Builder,
               org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder>
           metadataBuilder_;
+
       /**
        * <code>optional .Payload metadata = 9;</code>
        *
@@ -1873,6 +1961,7 @@ public final class QueryMessages {
       public boolean hasMetadata() {
         return ((bitField0_ & 0x00000100) != 0);
       }
+
       /**
        * <code>optional .Payload metadata = 9;</code>
        *
@@ -1887,6 +1976,7 @@ public final class QueryMessages {
           return metadataBuilder_.getMessage();
         }
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       public Builder setMetadata(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (metadataBuilder_ == null) {
@@ -1901,6 +1991,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       public Builder setMetadata(
           org.apache.pekko.remote.ContainerFormats.Payload.Builder builderForValue) {
@@ -1913,6 +2004,7 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       public Builder mergeMetadata(org.apache.pekko.remote.ContainerFormats.Payload value) {
         if (metadataBuilder_ == null) {
@@ -1933,6 +2025,7 @@ public final class QueryMessages {
         }
         return this;
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       public Builder clearMetadata() {
         bitField0_ = (bitField0_ & ~0x00000100);
@@ -1944,12 +2037,14 @@ public final class QueryMessages {
         onChanged();
         return this;
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       public org.apache.pekko.remote.ContainerFormats.Payload.Builder getMetadataBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
         return internalGetMetadataFieldBuilder().getBuilder();
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       public org.apache.pekko.remote.ContainerFormats.PayloadOrBuilder getMetadataOrBuilder() {
         if (metadataBuilder_ != null) {
@@ -1960,6 +2055,7 @@ public final class QueryMessages {
               : metadata_;
         }
       }
+
       /** <code>optional .Payload metadata = 9;</code> */
       private org.apache.pekko.protobufv3.internal.SingleFieldBuilder<
               org.apache.pekko.remote.ContainerFormats.Payload,
@@ -2048,15 +2144,20 @@ public final class QueryMessages {
 
   static {
     java.lang.String[] descriptorData = {
-      "\n\023QueryMessages.proto\022\"org.apache.pekko."
-          + "persistence.query\032\026ContainerFormats.prot"
-          + "o\"\321\001\n\rEventEnvelope\022\026\n\016persistence_id\030\001 "
-          + "\002(\t\022\023\n\013entity_type\030\002 \002(\t\022\r\n\005slice\030\003 \002(\005\022"
-          + "\023\n\013sequence_nr\030\004 \002(\003\022\021\n\ttimestamp\030\005 \002(\003\022"
-          + "\016\n\006offset\030\006 \002(\t\022\027\n\017offset_manifest\030\007 \002(\t"
-          + "\022\027\n\005event\030\010 \001(\0132\010.Payload\022\032\n\010metadata\030\t "
-          + "\001(\0132\010.PayloadB8\n4org.apache.pekko.persis"
-          + "tence.query.internal.protobufH\001"
+      "\n"
+          + "\023QueryMessages.proto\022\"org.apache.pekko."
+          + "persistence.query\032\026ContainerFormats.proto\"\321\001\n\r"
+          + "EventEnvelope\022\026\n"
+          + "\016persistence_id\030\001 \002(\t\022\023\n"
+          + "\013entity_type\030\002 \002(\t\022\r\n"
+          + "\005slice\030\003 \002(\005\022\023\n"
+          + "\013sequence_nr\030\004 \002(\003\022\021\n"
+          + "\ttimestamp\030\005 \002(\003\022\016\n"
+          + "\006offset\030\006 \002(\t\022\027\n"
+          + "\017offset_manifest\030\007 \002(\t\022\027\n"
+          + "\005event\030\010 \001(\0132\010.Payload\022\032\n"
+          + "\010metadata\030\t \001(\0132\010.PayloadB8\n"
+          + "4org.apache.pekko.persistence.query.internal.protobufH\001"
     };
     descriptor =
         org.apache.pekko.protobufv3.internal.Descriptors.FileDescriptor
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..26698e4208 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<
@@ -37,6 +36,7 @@ public class MyReplicatedBehavior
 
   public static final Set<ReplicaId> ALL_REPLICAS =
       Collections.unmodifiableSet(new HashSet<>(Arrays.asList(DCA, DCB)));
+
   // #replicas
 
   // #factory-shared
@@ -48,6 +48,7 @@ public class MyReplicatedBehavior
         queryPluginId,
         MyReplicatedBehavior::new);
   }
+
   // #factory-shared
 
   // #factory
@@ -65,6 +66,7 @@ public class MyReplicatedBehavior
   private MyReplicatedBehavior(ReplicationContext replicationContext) {
     super(replicationContext);
   }
+
   // #factory
 
   @Override
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..aedb4aed17 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 =
@@ -167,6 +166,7 @@ class AuctionEntity
   private enum Close implements Command {
     INSTANCE
   }
+
   // #commands
 
   // #events
@@ -201,6 +201,7 @@ class AuctionEntity
       this.amount = amount;
     }
   }
+
   // #events
 
   // #state
@@ -261,6 +262,7 @@ class AuctionEntity
       return !stillRunning && finishedAtDc.isEmpty();
     }
   }
+
   // #state
 
   // #setup
@@ -398,6 +400,7 @@ class AuctionEntity
 
     return builder.build();
   }
+
   // #command-handler
 
   // #event-handler
@@ -427,6 +430,7 @@ class AuctionEntity
         .onEvent(WinnerDecided.class, (state, event) -> state.close())
         .build();
   }
+
   // #event-handler
 
   // #event-triggers
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..bc0c5a9985 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
@@ -259,6 +258,7 @@ interface ReplicatedBlogExample {
       if (state.content.isPresent()) command.replyTo.tell(state.content.get());
       return Effect().none();
     }
+
     // #command-handler
 
     // #event-handler
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;
... 5629 lines suppressed ...


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