Scalafix and formatting fixes

Author: SamTheisens

actors-akka/src/main/scala/reactivemongo/actors/actor/package.scala

@@ -12,5 +12,4 @@ package object actor {
   val Props = akka.actor.Props
   type Terminated = akka.actor.Terminated
   type Cancellable = akka.actor.Cancellable
-
 }

actors-akka/src/main/scala/reactivemongo/actors/util/package.scala

@@ -1,15 +1,9 @@
 package reactivemongo.actors
 
-import akka.util.{
-  ByteString => PekkoByteString,
-  Timeout => PekkoTimeout
-}
-
 package object util {
-  type Timeout = PekkoTimeout
-  val Timeout = PekkoTimeout
-
-  type ByteString = PekkoByteString
-  val ByteString = PekkoByteString
+  type Timeout = akka.util.Timeout
+  val Timeout = akka.util.Timeout
 
+  type ByteString = akka.util.ByteString
+  val ByteString = akka.util.ByteString
 }

actors-pekko/src/main/scala/reactivemongo/actors/actor/package.scala

@@ -12,5 +12,4 @@ package object actor {
   val Props = org.apache.pekko.actor.Props
   type Terminated = org.apache.pekko.actor.Terminated
   type Cancellable = org.apache.pekko.actor.Cancellable
-
 }

actors-pekko/src/main/scala/reactivemongo/actors/util/package.scala

@@ -1,15 +1,9 @@
 package reactivemongo.actors
 
-import org.apache.pekko.util.{
-  ByteString => PekkoByteString,
-  Timeout => PekkoTimeout
-}
-
 package object util {
-  type Timeout = PekkoTimeout
-  val Timeout = PekkoTimeout
-
-  type ByteString = PekkoByteString
-  val ByteString = PekkoByteString
+  type Timeout = org.apache.pekko.util.Timeout
+  val Timeout = org.apache.pekko.util.Timeout
 
+  type ByteString = org.apache.pekko.util.ByteString
+  val ByteString = org.apache.pekko.util.ByteString
 }

build.sbt

@@ -75,7 +75,7 @@ lazy val `ReactiveMongo-Test` = project
   .settings(
     description := "ReactiveMongo test helpers"
   )
-  .dependsOn(`ReactiveMongo`).dependsOn()
+  .dependsOn(`ReactiveMongo`)
 
 // ---
 

driver/src/main/scala/api/AsyncDriver.scala

@@ -18,11 +18,17 @@ import reactivemongo.core.actors.{
   StandardDBSystemWithX509
 }
 import reactivemongo.core.nodeset.Authenticate
-import reactivemongo.actors.actor.{ Actor, ActorRef, ActorSystem }
+
+import com.typesafe.config.Config
+import reactivemongo.actors.actor.{
+  Actor,
+  ActorRef,
+  ActorSystem,
+  Props,
+  Terminated
+}
 import reactivemongo.actors.pattern.ask._
 import reactivemongo.actors.util.Timeout
-import com.typesafe.config.Config
-import reactivemongo.actors.actor.{ Props, Terminated }
 
 /**
  * The asynchronous driver (see [[MongoConnection]]).
@@ -38,6 +44,7 @@ import reactivemongo.actors.actor.{ Props, Terminated }
  *
  * @param config a custom configuration (otherwise the default options are used)
  * @param classLoader a classloader used to load the actor system
+ *
  * @define parsedURIParam the URI parsed by [[reactivemongo.api.MongoConnection.fromString]]
  * @define connectionNameParam the name for the connection pool
  * @define optionsParam the options for the new connection pool

driver/src/main/scala/api/Failover.scala

@@ -1,11 +1,12 @@
 package reactivemongo.api
 
-import reactivemongo.actors.pattern.after
-
 import scala.util.{ Failure, Success, Try }
 import scala.util.control.NonFatal
+
 import scala.concurrent.{ ExecutionContext, Future }
 import scala.concurrent.duration.{ Duration, FiniteDuration }
+
+import reactivemongo.actors.pattern.after
 import reactivemongo.util.LazyLogger
 
 private[reactivemongo] final class Failover[A](

driver/src/main/scala/core/actors/MongoDBSystem.scala

@@ -85,9 +85,9 @@ import reactivemongo.api.commands.{
   UpsertedFactory
 }
 
-import reactivemongo.actors.actor.{ Actor, ActorRef, Cancellable }
 import com.github.ghik.silencer.silent
 import external.reactivemongo.ConnectionListener
+import reactivemongo.actors.actor.{ Actor, ActorRef, Cancellable }
 import reactivemongo.util.{ LazyLogger, SimpleRing }
 
 /** Main actor that processes the requests. */

driver/src/test/scala/ApiTesting.scala

@@ -10,7 +10,6 @@ import scala.concurrent.duration.{ FiniteDuration, SECONDS }
 import reactivemongo.io.netty.buffer.{ ByteBuf, Unpooled }
 import reactivemongo.io.netty.channel.{ Channel, ChannelId, DefaultChannelId }
 
-import reactivemongo.actors.pattern.ask._
 import reactivemongo.core.actors
 import reactivemongo.core.errors.DatabaseException
 import reactivemongo.core.netty.ChannelFactory
@@ -33,6 +32,7 @@ import reactivemongo.api.collections.QueryCodecs
 import reactivemongo.api.commands.CommandKind
 
 import reactivemongo.actors.actor.ActorRef
+import reactivemongo.actors.pattern.ask._
 import reactivemongo.actors.util.Timeout
 
 import actors.{

driver/src/test/scala/NodeSetSpec.scala

@@ -1,9 +1,9 @@
 package reactivemongo
 
-import reactivemongo.actors.pattern.ask._
-
 import scala.collection.immutable.ListSet
+
 import scala.concurrent.{ Await, Future }
+
 import reactivemongo.core.actors.{
   PrimaryAvailable,
   PrimaryUnavailable,
@@ -21,15 +21,19 @@ import reactivemongo.core.nodeset.{
   PingInfo
 }
 import reactivemongo.core.protocol.ProtocolMetadata
+
 import reactivemongo.api.{
   AsyncDriver,
   MongoConnection,
   MongoConnectionOptions,
   ReadPreference
 }
+
 import org.specs2.concurrent.ExecutionEnv
 import org.specs2.matcher.MatchResult
+
 import reactivemongo.actors.actor.ActorRef
+import reactivemongo.actors.pattern.ask._
 import reactivemongo.actors.testkit.TestActorRef
 
 final class NodeSetSpec(