Scalafmt

Author: danicheg

core/src/main/scala/org/http4s/blaze/channel/ChannelHead.scala

@@ -47,6 +47,6 @@ object ChannelHead {
     "Connection reset", // Found on Linux, Java 13
     "An existing connection was forcibly closed by the remote host", // Found on Windows
     "Broken pipe", // also found on Linux
-    "The specified network name is no longer available.\r\n", // Found on Windows NIO2
+    "The specified network name is no longer available.\r\n" // Found on Windows NIO2
   )
 }

core/src/main/scala/org/http4s/blaze/channel/nio1/FixedSelectorPool.scala

@@ -26,7 +26,7 @@ import scala.annotation.tailrec
 final class FixedSelectorPool(
     poolSize: Int,
     bufferSize: Int,
-    threadFactory: ThreadFactory,
+    threadFactory: ThreadFactory
 ) extends SelectorLoopPool {
   require(poolSize > 0, s"Invalid pool size: $poolSize")
 

core/src/main/scala/org/http4s/blaze/channel/nio1/NIO1ClientChannel.scala

@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 private[blaze] final class NIO1ClientChannel(
     private[this] val underlying: SocketChannel,
-    private[this] val onClose: () => Unit,
+    private[this] val onClose: () => Unit
 ) extends NIO1Channel {
 
   private[this] val closed = new AtomicBoolean(false)

core/src/main/scala/org/http4s/blaze/channel/nio1/NIO1HeadStage.scala

@@ -72,7 +72,7 @@ private[nio1] object NIO1HeadStage {
   private def performWrite(
       ch: NIO1ClientChannel,
       scratch: ByteBuffer,
-      buffers: Array[ByteBuffer],
+      buffers: Array[ByteBuffer]
   ): WriteResult =
     try
       if (BufferTools.areDirectOrEmpty(buffers)) {
@@ -122,7 +122,7 @@ private[nio1] object NIO1HeadStage {
 private[nio1] final class NIO1HeadStage(
     ch: NIO1ClientChannel,
     selectorLoop: SelectorLoop,
-    key: SelectionKey,
+    key: SelectionKey
 ) extends ChannelHead
     with Selectable {
   import NIO1HeadStage._

core/src/main/scala/org/http4s/blaze/channel/nio1/NIO1SocketServerGroup.scala

@@ -28,7 +28,7 @@ import org.http4s.blaze.channel.{
   DefaultPoolSize,
   ServerChannel,
   ServerChannelGroup,
-  SocketPipelineBuilder,
+  SocketPipelineBuilder
 }
 import org.http4s.blaze.pipeline.Command
 import org.http4s.blaze.util.{BasicThreadFactory, Connections}
@@ -67,7 +67,7 @@ object NIO1SocketServerGroup {
       acceptorPool: SelectorLoopPool,
       workerPool: SelectorLoopPool,
       channelOptions: ChannelOptions = ChannelOptions.DefaultOptions,
-      maxConnections: Int = DefaultMaxConnections,
+      maxConnections: Int = DefaultMaxConnections
   ): ServerChannelGroup =
     new NIO1SocketServerGroup(acceptorPool, workerPool, channelOptions, maxConnections)
 
@@ -82,7 +82,7 @@ object NIO1SocketServerGroup {
       selectorThreadFactory: ThreadFactory = defaultWorkerThreadFactory,
       acceptorThreads: Int = 1,
       acceptorThreadFactory: ThreadFactory = defaultAcceptorThreadFactory,
-      maxConnections: Int = DefaultMaxConnections,
+      maxConnections: Int = DefaultMaxConnections
   ): ServerChannelGroup = {
     val acceptorPool = new FixedSelectorPool(acceptorThreads, 1, acceptorThreadFactory)
     val workerPool = new FixedSelectorPool(workerThreads, bufferSize, selectorThreadFactory)
@@ -104,7 +104,7 @@ object NIO1SocketServerGroup {
 
       override def bind(
           address: InetSocketAddress,
-          service: SocketPipelineBuilder,
+          service: SocketPipelineBuilder
       ): Try[ServerChannel] =
         underlying.bind(address, service)
     }
@@ -122,7 +122,7 @@ private final class NIO1SocketServerGroup private (
     acceptorPool: SelectorLoopPool,
     workerPool: SelectorLoopPool,
     channelOptions: ChannelOptions,
-    maxConnections: Int,
+    maxConnections: Int
 ) extends ServerChannelGroup {
   private[this] val logger = getLogger
   // Also acts as our intrinsic lock.
@@ -140,7 +140,7 @@ private final class NIO1SocketServerGroup private (
   private[this] class SocketAcceptor(
       key: SelectionKey,
       ch: ServerChannelImpl,
-      service: SocketPipelineBuilder,
+      service: SocketPipelineBuilder
   ) extends Selectable {
     // Save it since once the channel is closed, we're in trouble.
     private[this] val closed = new AtomicBoolean(false)
@@ -192,7 +192,7 @@ private final class NIO1SocketServerGroup private (
   // minimize race conditions.
   private[this] final class ServerChannelImpl(
       val selectableChannel: ServerSocketChannel,
-      selectorLoop: SelectorLoop,
+      selectorLoop: SelectorLoop
   ) extends ServerChannel
       with NIO1Channel {
     @volatile
@@ -252,7 +252,7 @@ private final class NIO1SocketServerGroup private (
     */
   override def bind(
       address: InetSocketAddress,
-      service: SocketPipelineBuilder,
+      service: SocketPipelineBuilder
   ): Try[ServerChannel] =
     Try {
       val ch = ServerSocketChannel.open().bind(address)
@@ -283,7 +283,7 @@ private final class NIO1SocketServerGroup private (
   // Will be called from within the SelectorLoop
   private[this] def buildSocketAcceptor(
       ch: ServerChannelImpl,
-      service: SocketPipelineBuilder,
+      service: SocketPipelineBuilder
   )(key: SelectionKey): Selectable = {
     val acceptor = new SocketAcceptor(key, ch, service)
     try key.interestOps(SelectionKey.OP_ACCEPT)
@@ -295,7 +295,7 @@ private final class NIO1SocketServerGroup private (
 
   private[this] def handleClientChannel(
       clientChannel: NIO1ClientChannel,
-      service: SocketPipelineBuilder,
+      service: SocketPipelineBuilder
   ): Unit =
     try {
       clientChannel.configureBlocking(false)

core/src/main/scala/org/http4s/blaze/channel/nio1/SelectorLoop.scala

@@ -47,7 +47,7 @@ import scala.util.control.{ControlThrowable, NonFatal}
 final class SelectorLoop(
     selector: Selector,
     bufferSize: Int,
-    threadFactory: ThreadFactory,
+    threadFactory: ThreadFactory
 ) extends Executor
     with ExecutionContext {
   require(bufferSize > 0, s"Invalid buffer size: $bufferSize")
@@ -126,7 +126,7 @@ final class SelectorLoop(
     */
   def initChannel(
       ch: NIO1Channel,
-      mkStage: SelectionKey => Selectable,
+      mkStage: SelectionKey => Selectable
   ): Unit =
     enqueueTask(new Runnable {
       override def run(): Unit =

core/src/main/scala/org/http4s/blaze/channel/nio2/ByteBufferHead.scala

@@ -68,7 +68,7 @@ private[nio2] final class ByteBufferHead(channel: AsynchronousSocketChannel, buf
                   p.success(())
                   ()
                 }
-            },
+            }
           )
 
         go(0)
@@ -107,7 +107,7 @@ private[nio2] final class ByteBufferHead(channel: AsynchronousSocketChannel, buf
               p.success(BufferTools.copyBuffer(scratchBuffer))
               ()
           }
-      },
+      }
     )
     p.future
   }

core/src/main/scala/org/http4s/blaze/channel/nio2/ClientChannelFactory.scala

@@ -44,21 +44,21 @@ final class ClientChannelFactory(
     group: Option[AsynchronousChannelGroup] = None,
     channelOptions: ChannelOptions = ChannelOptions.DefaultOptions,
     scheduler: TickWheelExecutor = Execution.scheduler,
-    connectTimeout: Duration = Duration.Inf,
+    connectTimeout: Duration = Duration.Inf
 ) {
   private[this] val logger = getLogger
 
   // for binary compatibility with <=0.14.6
   def this(
       bufferSize: Int,
       group: Option[AsynchronousChannelGroup],
-      channelOptions: ChannelOptions,
+      channelOptions: ChannelOptions
   ) =
     this(bufferSize, group, channelOptions, Execution.scheduler, Duration.Inf)
 
   def connect(
       remoteAddress: SocketAddress,
-      bufferSize: Int = bufferSize,
+      bufferSize: Int = bufferSize
   ): Future[HeadStage[ByteBuffer]] = {
     val p = Promise[HeadStage[ByteBuffer]]()
 

core/src/main/scala/org/http4s/blaze/pipeline/PipelineBuilder.scala

@@ -56,7 +56,7 @@ object LeafBuilder {
   */
 final class TrunkBuilder[I1, O] private[pipeline] (
     protected val head: MidStage[I1, _],
-    protected val tail: MidStage[_, O],
+    protected val tail: MidStage[_, O]
 ) {
   def append[N](stage: MidStage[O, N]): TrunkBuilder[I1, N] = {
     if (stage._prevStage != null) sys.error(s"Stage $stage must be fresh")

core/src/main/scala/org/http4s/blaze/pipeline/stages/SSLStage.scala

@@ -32,7 +32,7 @@ import org.http4s.blaze.util.{
   BufferTools,
   Execution,
   SerialExecutionContext,
-  ThreadLocalScratchBuffer,
+  ThreadLocalScratchBuffer
 }
 import org.http4s.blaze.util.BufferTools._