Cleanup code by applying inspections

Author: mdedetrich

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectionProvider.scala

@@ -138,17 +138,16 @@ final class AmqpDetailsConnectionProvider private (
       factory.setPassword(credentials.password)
     }
     virtualHost.foreach(factory.setVirtualHost)
-    sslConfiguration.foreach(sslConfiguration => {
+    sslConfiguration.foreach { sslConfiguration =>
       if (sslConfiguration.protocol.isDefined) {
         if (sslConfiguration.trustManager.isDefined)
           factory.useSslProtocol(sslConfiguration.protocol.get, sslConfiguration.trustManager.get)
         else factory.useSslProtocol(sslConfiguration.protocol.get)
-      } else if (sslConfiguration.context.isDefined) {
+      } else if (sslConfiguration.context.isDefined)
         factory.useSslProtocol(sslConfiguration.context.get)
-      } else {
+      else
         factory.useSslProtocol()
-      }
-    })
+    }
     requestedHeartbeat.foreach(factory.setRequestedHeartbeat)
     connectionTimeout.foreach(factory.setConnectionTimeout)
     handshakeTimeout.foreach(factory.setHandshakeTimeout)
@@ -244,9 +243,8 @@ object AmqpCredentials {
 final class AmqpSSLConfiguration private (val protocol: Option[String] = None,
     val trustManager: Option[TrustManager] = None,
     val context: Option[SSLContext] = None) {
-  if (protocol.isDefined && context.isDefined) {
+  if (protocol.isDefined && context.isDefined)
     throw new IllegalArgumentException("Protocol and context can't be defined in the same AmqpSSLConfiguration.")
-  }
 
   def withProtocol(protocol: String): AmqpSSLConfiguration =
     copy(protocol = Some(protocol))
@@ -419,10 +417,8 @@ final class AmqpCachedConnectionProvider private (val provider: AmqpConnectionPr
               throw new ConcurrentModificationException(
                 "Unexpected concurrent modification while closing the connection.")
           }
-        } else {
-          if (!state.compareAndSet(c, Connected(cachedConnection, clients - 1)))
-            releaseRecursive(amqpConnectionProvider, connection)
-        }
+        } else if (!state.compareAndSet(c, Connected(cachedConnection, clients - 1)))
+          releaseRecursive(amqpConnectionProvider, connection)
       case Closing => releaseRecursive(amqpConnectionProvider, connection)
     }
 

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/AmqpConnectorSettings.scala

@@ -152,7 +152,7 @@ final class TemporaryQueueSourceSettings private (
 }
 
 object TemporaryQueueSourceSettings {
-  def apply(connectionProvider: AmqpConnectionProvider, exchange: String) =
+  def apply(connectionProvider: AmqpConnectionProvider, exchange: String): TemporaryQueueSourceSettings =
     new TemporaryQueueSourceSettings(connectionProvider, exchange)
 
   /**

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AbstractAmqpAsyncFlowStageLogic.scala

@@ -72,9 +72,7 @@ import scala.concurrent.Promise
     val callback = getAsyncCallback[(DeliveryTag, Boolean)] {
       case (tag: DeliveryTag, multiple: Boolean) => confirmCallback(tag, multiple)
     }
-    new ConfirmCallback { // cant use function literal because it doesn't work with 2.11
-      override def handle(tag: DeliveryTag, multiple: Boolean): Unit = callback.invoke((tag, multiple))
-    }
+    (tag: DeliveryTag, multiple: Boolean) => callback.invoke((tag, multiple))
   }
 
   private def onConfirmation(tag: DeliveryTag, multiple: Boolean): Unit = {
@@ -155,9 +153,8 @@ import scala.concurrent.Promise
         if (noAwaitingMessages && exitQueue.isEmpty) {
           streamCompletion.success(Done)
           super.onUpstreamFinish()
-        } else {
+        } else
           log.debug("Received upstream finish signal - stage will be closed when all buffered messages are processed")
-        }
 
       private def publish(message: WriteMessage): DeliveryTag = {
         val tag: DeliveryTag = channel.getNextPublishSeqNo
@@ -193,10 +190,9 @@ import scala.concurrent.Promise
 
   override protected def onTimer(timerKey: Any): Unit =
     timerKey match {
-      case tag: DeliveryTag => {
+      case tag: DeliveryTag =>
         log.debug("Received timeout for deliveryTag {}.", tag)
         onRejection(tag, multiple = false)
-      }
       case _ => ()
     }
 

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpAsyncFlowStage.scala

@@ -58,15 +58,14 @@ import scala.concurrent.{ Future, Promise }
           buffer += (tag -> AwaitingMessage(tag, passThrough))
 
         override def dequeueAwaitingMessages(tag: DeliveryTag, multiple: Boolean): Iterable[AwaitingMessage[T]] =
-          if (multiple) {
+          if (multiple)
             dequeueWhile((t, _) => t <= tag)
-          } else {
+          else {
             setReady(tag)
-            if (isAtHead(tag)) {
+            if (isAtHead(tag))
               dequeueWhile((_, message) => message.ready)
-            } else {
+            else
               Seq.empty
-            }
           }
 
         private def dequeueWhile(

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpReplyToSinkStage.scala

@@ -31,7 +31,7 @@ import scala.concurrent.{ Future, Promise }
 private[amqp] final class AmqpReplyToSinkStage(replyToSinkSettings: AmqpReplyToSinkSettings)
     extends GraphStageWithMaterializedValue[SinkShape[WriteMessage], Future[Done]] { stage =>
 
-  val in = Inlet[WriteMessage]("AmqpReplyToSink.in")
+  val in: Inlet[WriteMessage] = Inlet[WriteMessage]("AmqpReplyToSink.in")
 
   override def shape: SinkShape[WriteMessage] = SinkShape.of(in)
 
@@ -82,9 +82,8 @@ private[amqp] final class AmqpReplyToSinkStage(replyToSinkSettings: AmqpReplyToS
                   elem.immediate,
                   elem.properties.orNull,
                   elem.bytes.toArray)
-              } else if (settings.failIfReplyToMissing) {
+              } else if (settings.failIfReplyToMissing)
                 onFailure(new RuntimeException("Reply-to header was not set"))
-              }
 
               tryPull(in)
             }

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpRpcFlowStage.scala

@@ -42,8 +42,8 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
     extends GraphStageWithMaterializedValue[FlowShape[WriteMessage, CommittableReadResult], Future[String]] {
   stage =>
 
-  val in = Inlet[WriteMessage]("AmqpRpcFlow.in")
-  val out = Outlet[CommittableReadResult]("AmqpRpcFlow.out")
+  val in: Inlet[WriteMessage] = Inlet[WriteMessage]("AmqpRpcFlow.in")
+  val out: Outlet[CommittableReadResult] = Outlet[CommittableReadResult]("AmqpRpcFlow.out")
 
   override def shape: FlowShape[WriteMessage, CommittableReadResult] = FlowShape.of(in, out)
 
@@ -70,7 +70,7 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
           val consumerCallback = getAsyncCallback(handleDelivery)
 
           val commitCallback = getAsyncCallback[AckArguments] {
-            case AckArguments(deliveryTag, multiple, promise) => {
+            case AckArguments(deliveryTag, multiple, promise) =>
               try {
                 channel.basicAck(deliveryTag, multiple)
                 unackedMessages -= 1
@@ -81,10 +81,9 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
               } catch {
                 case e: Throwable => promise.failure(e)
               }
-            }
           }
           val nackCallback = getAsyncCallback[NackArguments] {
-            case NackArguments(deliveryTag, multiple, requeue, promise) => {
+            case NackArguments(deliveryTag, multiple, requeue, promise) =>
               try {
                 channel.basicNack(deliveryTag, multiple, requeue)
                 unackedMessages -= 1
@@ -95,7 +94,6 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
               } catch {
                 case e: Throwable => promise.failure(e)
               }
-            }
           }
 
           val amqpSourceConsumer = new DefaultConsumer(channel) {
@@ -105,7 +103,7 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
                 body: Array[Byte]): Unit =
               consumerCallback.invoke(
                 new CommittableReadResult {
-                  override val message = ReadResult(ByteString(body), envelope, properties)
+                  override val message: ReadResult = ReadResult(ByteString(body), envelope, properties)
 
                   override def ack(multiple: Boolean): Future[Done] = {
                     val promise = Promise[Done]()
@@ -148,21 +146,19 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
         }
 
         def handleDelivery(message: CommittableReadResult): Unit =
-          if (isAvailable(out)) {
+          if (isAvailable(out))
             pushMessage(message)
-          } else if (queue.size + 1 > bufferSize) {
+          else if (queue.size + 1 > bufferSize)
             onFailure(new RuntimeException(s"Reached maximum buffer size $bufferSize"))
-          } else {
+          else
             queue.enqueue(message)
-          }
 
         setHandler(
           out,
           new OutHandler {
             override def onPull(): Unit =
-              if (queue.nonEmpty) {
+              if (queue.nonEmpty)
                 pushMessage(queue.dequeue())
-              }
 
             override def onDownstreamFinish(cause: Throwable): Unit = {
               setKeepGoing(true)
@@ -207,15 +203,14 @@ private[amqp] final class AmqpRpcFlowStage(writeSettings: AmqpWriteSettings, buf
 
               val expectedResponses: Int = {
                 val headers = props.getHeaders
-                if (headers == null) {
+                if (headers == null)
                   responsesPerMessage
-                } else {
+                else {
                   val r = headers.get("expectedReplies")
-                  if (r != null) {
+                  if (r != null)
                     r.asInstanceOf[Int]
-                  } else {
+                  else
                     responsesPerMessage
-                  }
                 }
               }
 

amqp/src/main/scala/org/apache/pekko/stream/connectors/amqp/impl/AmqpSourceStage.scala

@@ -94,9 +94,8 @@ private[amqp] final class AmqpSourceStage(settings: AmqpSourceSettings, bufferSi
               properties: BasicProperties,
               body: Array[Byte]): Unit = {
             val message = if (ackRequired) {
-
               new CommittableReadResult {
-                override val message = ReadResult(ByteString(body), envelope, properties)
+                override val message: ReadResult = ReadResult(ByteString(body), envelope, properties)
 
                 override def ack(multiple: Boolean): Future[Done] = {
                   val promise = Promise[Done]()
@@ -155,21 +154,19 @@ private[amqp] final class AmqpSourceStage(settings: AmqpSourceSettings, bufferSi
       }
 
       def handleDelivery(message: CommittableReadResult): Unit =
-        if (isAvailable(out)) {
+        if (isAvailable(out))
           pushMessage(message)
-        } else if (queue.size + 1 > bufferSize) {
+        else if (queue.size + 1 > bufferSize)
           onFailure(new RuntimeException(s"Reached maximum buffer size $bufferSize"))
-        } else {
+        else
           queue.enqueue(message)
-        }
 
       setHandler(
         out,
         new OutHandler {
           override def onPull(): Unit =
-            if (queue.nonEmpty) {
+            if (queue.nonEmpty)
               pushMessage(queue.dequeue())
-            }
 
           override def onDownstreamFinish(cause: Throwable): Unit =
             if (unackedMessages == 0) super.onDownstreamFinish(cause)

amqp/src/test/scala/docs/scaladsl/AmqpDocsSpec.scala

@@ -35,7 +35,7 @@ class AmqpDocsSpec extends AmqpSpec {
 
   override implicit val patienceConfig: PatienceConfig = PatienceConfig(10.seconds)
 
-  val businessLogic: CommittableReadResult => Future[CommittableReadResult] = Future.successful(_)
+  val businessLogic: CommittableReadResult => Future[CommittableReadResult] = Future.successful
 
   "The AMQP Connectors" should {
 
@@ -158,7 +158,7 @@ class AmqpDocsSpec extends AmqpSpec {
       val mergingFlow = mergedSources
         .viaMat(KillSwitches.single)(Keep.right)
         .to(Sink.fold(Set.empty[Int]) {
-          case (seen, (branch, element)) =>
+          case (seen, (branch, _)) =>
             if (seen.size == fanoutSize) completion.trySuccess(Done)
             seen + branch
         })

amqp/src/test/scala/org/apache/pekko/stream/connectors/amqp/AmqpProxyConnection.scala

@@ -29,21 +29,21 @@ import com.rabbitmq.client._
  *                 otherwise undefined
  */
 class AmqpProxyConnection(protected val delegate: Connection) extends Connection {
-  override def getAddress: InetAddress = delegate.getAddress()
+  override def getAddress: InetAddress = delegate.getAddress
 
-  override def getPort: Int = delegate.getPort()
+  override def getPort: Int = delegate.getPort
 
-  override def getChannelMax: Int = delegate.getChannelMax()
+  override def getChannelMax: Int = delegate.getChannelMax
 
-  override def getFrameMax: Int = delegate.getFrameMax()
+  override def getFrameMax: Int = delegate.getFrameMax
 
-  override def getHeartbeat: Int = delegate.getHeartbeat()
+  override def getHeartbeat: Int = delegate.getHeartbeat
 
-  override def getClientProperties: util.Map[String, AnyRef] = delegate.getClientProperties()
+  override def getClientProperties: util.Map[String, AnyRef] = delegate.getClientProperties
 
-  override def getClientProvidedName: String = delegate.getClientProvidedName()
+  override def getClientProvidedName: String = delegate.getClientProvidedName
 
-  override def getServerProperties: util.Map[String, AnyRef] = delegate.getServerProperties()
+  override def getServerProperties: util.Map[String, AnyRef] = delegate.getServerProperties
 
   override def createChannel(): Channel = delegate.createChannel()
 
@@ -76,9 +76,9 @@ class AmqpProxyConnection(protected val delegate: Connection) extends Connection
 
   override def clearBlockedListeners(): Unit = delegate.clearBlockedListeners()
 
-  override def getExceptionHandler: ExceptionHandler = delegate.getExceptionHandler()
+  override def getExceptionHandler: ExceptionHandler = delegate.getExceptionHandler
 
-  override def getId: String = delegate.getId()
+  override def getId: String = delegate.getId
 
   override def setId(s: String): Unit = delegate.setId(s)
 
@@ -88,9 +88,9 @@ class AmqpProxyConnection(protected val delegate: Connection) extends Connection
   override def removeShutdownListener(shutdownListener: ShutdownListener): Unit =
     delegate.removeShutdownListener(shutdownListener)
 
-  override def getCloseReason: ShutdownSignalException = delegate.getCloseReason()
+  override def getCloseReason: ShutdownSignalException = delegate.getCloseReason
 
   override def notifyListeners(): Unit = delegate.notifyListeners()
 
-  override def isOpen: Boolean = delegate.isOpen()
+  override def isOpen: Boolean = delegate.isOpen
 }

amqp/src/test/scala/org/apache/pekko/stream/connectors/amqp/scaladsl/AmqpConnectorsSpec.scala

@@ -270,9 +270,9 @@ class AmqpConnectorsSpec extends AmqpSpec {
         .take(input.size)
         .runWith(Sink.seq)
 
-      result.futureValue.map(cm => {
+      result.futureValue.map { cm =>
         noException should be thrownBy cm.ack().futureValue
-      })
+      }
     }
 
     "not republish message without autoAck(false) if nack is sent" in assertAllStagesStopped {