apache · He-Pin · Jul 14, 2026 · pjfanning · Jul 13, 2026 · He-Pin
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -1,7 +1,7 @@
 // .scalafix.conf
 rules = [
   RemoveUnused
-  SortImports
+  OrganizeImports
   ExplicitResultTypes
   fix.scala213.DottyMigrate
 //  fix.scala213.NullaryOverride
@@ -14,7 +14,7 @@ ExplicitResultTypes {
 ExplicitImplicitTypes.symbolReplacements {
   "scala/concurrent/ExecutionContextExecutor#" = "scala/concurrent/ExecutionContext#"
 }
-RemoveUnused.imports = true
+RemoveUnused.imports = false
 RemoveUnused.privates = false
 RemoveUnused.locals = false
 
@@ -28,7 +28,10 @@ ignored-files = [
   "SourceSpec.scala",
   "StatsSampleSpec.scala",
   "ActorFlowSpec.scala",
-  "FSMTimingSpec.scala"
+  "FSMTimingSpec.scala",
+  "ThreadPoolVirtualThreadSpec.scala",
+  "ForkJoinPoolVirtualThreadSpec.scala",
+  "VirtualThreadPoolDispatcherSpec.scala"
 ]
 
 //ignored packages
@@ -38,17 +41,26 @@ ignored-packages = [
   "jdoc"
 ]
 
-//sort imports, see https://github.com/NeQuissimus/sort-imports
-SortImports.asciiSort = false
-SortImports.blocks = [
-  "re:javax?\\.",
-  "scala.",
-  "*",
-  "com.sun."
-  "re:^(org\\.apache\\.pekko|pekko\\.)\\w*"
-  "org.reactivestreams."
-  "io.netty."
-  "org.scalatest."
-  "org.slf4j."
-  "com.typesafe."
-]
+OrganizeImports {
+  blankLines = Auto
+  coalesceToWildcardImportThreshold = null
+  expandRelative = false
+  groupedImports = Keep
+  groups = [
+    "re:javax?\\.",
+    "scala.",
+    "com.sun.",
+    "re:org\\.apache\\.pekko",
+    "pekko.",
+    "org.reactivestreams.",
+    "io.netty.",
+    "org.scalatest.",
+    "org.slf4j.",
+    "com.typesafe.",
+    "*"
+  ]
+  importSelectorsOrder = Ascii
+  importsOrder = Ascii
+  removeUnused = true
+  targetDialect = StandardLayout
+}
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -7,7 +7,7 @@ docstrings.wrap                          = false
 indentOperator.preset                    = spray
 maxColumn                                = 120
 lineEndings                              = preserve
-rewrite.rules                            = [RedundantParens, SortImports, AvoidInfix]
+rewrite.rules                            = [RedundantParens, AvoidInfix]
 indentOperator.exemptScope               = all
 align.preset                             = some
 align.tokens."+"                         = [

diff --git a/...-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala b/...-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
@@ -18,12 +18,13 @@ import java.util.Optional
 import scala.jdk.OptionConverters._
 
 import org.apache.pekko
-import pekko.annotation.InternalApi
-import pekko.util.OptionVal
 
 import org.slf4j.Marker
 import org.slf4j.event.Level
 
+import pekko.annotation.InternalApi
+import pekko.util.OptionVal
+
 /**
  * Representation of a Log Event issued by a [[pekko.actor.typed.Behavior]]
  * when testing with [[pekko.actor.testkit.typed.scaladsl.BehaviorTestKit]]

diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
@@ -22,6 +22,7 @@ import scala.jdk.FunctionConverters._
 import scala.util.{ Failure, Success, Try }
 
 import org.apache.pekko
+
 import pekko.actor.typed.{ ActorRef, Behavior, Props, RecipientRef }
 import pekko.annotation.{ DoNotInherit, InternalApi }
 

diff --git a/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
@@ -14,6 +14,7 @@
 package org.apache.pekko.actor.testkit.typed
 
 import org.apache.pekko
+
 import pekko.annotation.DoNotInherit
 
 /**

diff --git a/...r-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala b/...r-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
@@ -17,13 +17,14 @@ import scala.concurrent.duration.{ Duration, FiniteDuration }
 import scala.jdk.DurationConverters._
 
 import org.apache.pekko
+
+import com.typesafe.config.Config
+
 import pekko.actor.typed.ActorSystem
 import pekko.actor.typed.Extension
 import pekko.actor.typed.ExtensionId
 import pekko.util.Timeout
 
-import com.typesafe.config.Config
-
 object TestKitSettings {
 
   /**

diff --git a/...-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala b/...-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
@@ -20,6 +20,12 @@ import scala.concurrent._
 import scala.jdk.FutureConverters._
 
 import org.apache.pekko
+
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import com.typesafe.config.{ Config, ConfigFactory }
+
 import pekko.{ actor => classic }
 import pekko.Done
 import pekko.actor.{ ActorPath, ActorRefProvider, Address, ReflectiveDynamicAccess }
@@ -38,11 +44,6 @@ import pekko.actor.typed.internal.InternalRecipientRef
 import pekko.actor.typed.receptionist.Receptionist
 import pekko.annotation.InternalApi
 
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import com.typesafe.config.{ Config, ConfigFactory }
-
 /**
  * INTERNAL API
  */

diff --git a/...ed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/...ed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
@@ -23,6 +23,7 @@ import scala.util.control.Exception.Catcher
 import scala.util.control.NonFatal
 
 import org.apache.pekko
+
 import pekko.actor.ActorPath
 import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
 import pekko.actor.testkit.typed.Effect._

diff --git a/...yped/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala b/...yped/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
@@ -13,10 +13,11 @@
 
 package org.apache.pekko.actor.testkit.typed.internal
 
+import org.apache.pekko
+
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.AppenderBase
 
-import org.apache.pekko
 import pekko.annotation.InternalApi
 
 /**

diff --git a/...testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala b/...testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
@@ -18,6 +18,7 @@ import java.util.concurrent.ConcurrentLinkedQueue
 import scala.annotation.tailrec
 
 import org.apache.pekko
+
 import pekko.{ actor => classic }
 import pekko.actor.ActorRefProvider
 import pekko.actor.typed.ActorRef

diff --git a/.../src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala b/.../src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
@@ -23,6 +23,7 @@ import scala.util.Try
 import scala.util.control.NonFatal
 
 import org.apache.pekko
+
 import pekko.actor.{ ActorPath, Cancellable }
 import pekko.actor.testkit.typed.Effect
 import pekko.actor.testkit.typed.Effect._

diff --git a/...ped/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala b/...ped/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
@@ -20,6 +20,9 @@ import scala.reflect.ClassTag
 import scala.util.matching.Regex
 
 import org.apache.pekko
+
+import org.slf4j.event.Level
+
 import pekko.actor.testkit.typed.LoggingEvent
 import pekko.actor.testkit.typed.TestKitSettings
 import pekko.actor.testkit.typed.javadsl
@@ -28,8 +31,6 @@ import pekko.actor.typed.ActorSystem
 import pekko.annotation.InternalApi
 import pekko.testkit.TestKit
 
-import org.slf4j.event.Level
-
 /**
  * INTERNAL API
  */

diff --git a/...ed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala b/...ed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
@@ -21,6 +21,10 @@ import scala.concurrent.ExecutionContextExecutor
 import scala.concurrent.duration.FiniteDuration
 
 import org.apache.pekko
+
+import org.slf4j.helpers.{ MessageFormatter, SubstituteLoggerFactory }
+import org.slf4j.{ Logger, Marker }
+
 import pekko.{ actor => classic }
 import pekko.actor.{ ActorPath, ActorRefProvider, InvalidMessageException }
 import pekko.actor.testkit.typed.CapturedLogEvent
@@ -29,9 +33,6 @@ import pekko.actor.typed.internal._
 import pekko.annotation.InternalApi
 import pekko.util.Helpers
 
-import org.slf4j.{ Logger, Marker }
-import org.slf4j.helpers.{ MessageFormatter, SubstituteLoggerFactory }
-
 /**
  * INTERNAL API
  *

diff --git a/...kit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala b/...kit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
@@ -15,16 +15,17 @@ package org.apache.pekko.actor.testkit.typed.internal
 
 import java.util.Collections
 
+import org.apache.pekko
+
+import org.slf4j.{ MDC, Marker }
+
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.classic.spi.ThrowableProxy
 import ch.qos.logback.core.AppenderBase
 
-import org.apache.pekko
 import pekko.actor.testkit.typed.LoggingEvent
 import pekko.annotation.InternalApi
 
-import org.slf4j.{ MDC, Marker }
-
 /**
  * INTERNAL API
  *

diff --git a/...it-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala b/...it-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
@@ -19,6 +19,7 @@ import scala.annotation.tailrec
 import scala.collection.immutable
 
 import org.apache.pekko
+
 import pekko.actor.{ ActorPath, Address, RootActorPath }
 import pekko.actor.typed.ActorRef
 import pekko.annotation.InternalApi

diff --git a/...kit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala b/...kit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
@@ -13,12 +13,13 @@
 
 package org.apache.pekko.actor.testkit.typed.internal
 
-import scala.concurrent.{ Await, TimeoutException }
 import scala.concurrent.duration.Duration
+import scala.concurrent.{ Await, TimeoutException }
 import scala.util.control.Exception.Catcher
 import scala.util.control.NonFatal
 
 import org.apache.pekko
+
 import pekko.actor.typed.{ ActorRef, ActorSystem, Behavior, Props }
 import pekko.actor.typed.scaladsl.ActorContext
 import pekko.actor.typed.scaladsl.Behaviors

diff --git a/...it-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala b/...it-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
@@ -14,10 +14,10 @@
 package org.apache.pekko.actor.testkit.typed.internal
 
 import java.time.{ Duration => JDuration }
-import java.util.{ List => JList }
 import java.util.concurrent.BlockingDeque
 import java.util.concurrent.LinkedBlockingDeque
 import java.util.function.Supplier
+import java.util.{ List => JList }
 
 import scala.annotation.tailrec
 import scala.collection.immutable
@@ -28,6 +28,7 @@ import scala.reflect.ClassTag
 import scala.util.control.NonFatal
 
 import org.apache.pekko
+
 import pekko.actor.ActorRefProvider
 import pekko.actor.ExtendedActorSystem
 import pekko.actor.testkit.typed.FishingOutcome

diff --git a/...tkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala b/...tkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
@@ -18,6 +18,9 @@ import java.time.Duration
 import scala.jdk.DurationConverters._
 
 import org.apache.pekko
+
+import com.typesafe.config.Config
+
 import pekko.actor.DeadLetter
 import pekko.actor.Dropped
 import pekko.actor.UnhandledMessage
@@ -31,8 +34,6 @@ import pekko.actor.typed.Props
 import pekko.actor.typed.Scheduler
 import pekko.util.Timeout
 
-import com.typesafe.config.Config
-
 object ActorTestKit {
 
   /**

diff --git a/...t-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala b/...t-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
@@ -18,6 +18,9 @@ import java.util.concurrent.ThreadLocalRandom
 import scala.annotation.nowarn
 
 import org.apache.pekko
+
+import com.typesafe.config.Config
+
 import pekko.actor.testkit.typed.{ CapturedLogEvent, Effect }
 import pekko.actor.testkit.typed.internal.{ ActorSystemStub, BehaviorTestKitImpl }
 import pekko.actor.typed.{ ActorRef, Behavior, Signal }
@@ -26,8 +29,6 @@ import pekko.annotation.{ ApiMayChange, DoNotInherit }
 import pekko.japi.function.{ Function => JFunction }
 import pekko.pattern.StatusReply
 
-import com.typesafe.config.Config
-
 object BehaviorTestKit {
 
   /**

diff --git a/...r-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala b/...r-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
@@ -18,6 +18,7 @@ import java.time.Duration
 import scala.jdk.DurationConverters._
 
 import org.apache.pekko
+
 import pekko.actor.typed.{ ActorRef, Behavior, Props, RecipientRef }
 
 /**

diff --git a/...ed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala b/...ed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnit5TestKitBuilder.scala
@@ -18,12 +18,13 @@
 package org.apache.pekko.actor.testkit.typed.javadsl
 
 import org.apache.pekko
+
+import com.typesafe.config.Config
+
 import pekko.actor.testkit.typed.internal.TestKitUtils
 import pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig
 import pekko.actor.typed.ActorSystem
 
-import com.typesafe.config.Config
-
 @deprecated("Use JUnitJupiterTestKitBuilder instead", "2.0.0")
 final class JUnit5TestKitBuilder() {
 

diff --git a/.../main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnitJupiterTestKitBuilder.scala b/.../main/scala/org/apache/pekko/actor/testkit/typed/javadsl/JUnitJupiterTestKitBuilder.scala
@@ -18,12 +18,13 @@
 package org.apache.pekko.actor.testkit.typed.javadsl
 
 import org.apache.pekko
+
+import com.typesafe.config.Config
+
 import pekko.actor.testkit.typed.internal.TestKitUtils
 import pekko.actor.testkit.typed.scaladsl.ActorTestKit.ApplicationTestConfig
 import pekko.actor.typed.ActorSystem
 
-import com.typesafe.config.Config
-
 final class JUnitJupiterTestKitBuilder() {
 
   var system: Option[ActorSystem[?]] = None

diff --git a/...tkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala b/...tkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala
@@ -15,14 +15,14 @@ package org.apache.pekko.actor.testkit.typed.javadsl
 
 import scala.util.control.NonFatal
 
-import org.junit.rules.TestRule
-import org.junit.runner.Description
-import org.junit.runners.model.Statement
-
 import org.apache.pekko.actor.testkit.typed.internal.CapturingAppender
 
 import org.slf4j.LoggerFactory
 
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
 /**
  * JUnit `TestRule` to make log lines appear only when the test failed.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     package org.apache.pekko.actor.testkit.typed
     import org.apache.pekko
     import pekko.annotation.DoNotInherit
     /**
@@ Expand Down @@