From 6b17a7a15f1f7dcee91edd94097ebb6091437d60 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 1 Oct 2019 12:24:51 +0200 Subject: [PATCH] Update scalafmt-core to 2.1.0 (#27831) * Update scalafmt-core to 2.1.0 * scalafmt --- .scalafmt.conf | 2 +- .../src/test/scala/akka/io/TcpConnectionSpec.scala | 6 +++--- .../stream/TwitterStreamQuickstartDocSpec.scala | 1 - .../persistence/journal/leveldb/LeveldbStore.scala | 4 ++-- .../src/main/scala/akka/remote/RemoteWatcher.scala | 4 ++-- .../src/main/scala/akka/remote/artery/Codecs.scala | 14 ++++++++++---- .../main/scala/akka/remote/artery/Control.scala | 7 +++++-- .../src/main/scala/akka/stream/KillSwitch.scala | 5 +++-- .../stream/impl/ActorRefBackpressureSource.scala | 5 +++-- .../scala/akka/stream/impl/ActorRefSource.scala | 5 +++-- .../stream/impl/StreamSubscriptionTimeout.scala | 2 +- 11 files changed, 33 insertions(+), 22 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index ad7a47bc05..6e174dee53 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 2.0.1 +version = 2.1.0 style = defaultWithAlign diff --git a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala index 142de600f6..e6cba34861 100644 --- a/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/io/TcpConnectionSpec.scala @@ -464,9 +464,9 @@ class TcpConnectionSpec extends AkkaSpec(""" val buffer = ByteBuffer.allocate(1) val thrown = the[IOException] thrownBy { - windowsWorkaroundToDetectAbort() - serverSideChannel.read(buffer) - } + windowsWorkaroundToDetectAbort() + serverSideChannel.read(buffer) + } thrown.getMessage should ===(ConnectionResetByPeerMessage) } } diff --git a/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala b/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala index c70df3907a..e15c718469 100644 --- a/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala +++ b/akka-docs/src/test/scala/docs/stream/TwitterStreamQuickstartDocSpec.scala @@ -157,7 +157,6 @@ class TwitterStreamQuickstartDocSpec extends AkkaSpec { .mapConcat(identity) // Flatten the set of hashtags to a stream of hashtags .map(_.name.toUpperCase) // Convert all hashtags to upper case .runWith(Sink.foreach(println)) // Attach the Flow to a Sink that will finally print the hashtags - //#fiddle_code .value } diff --git a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala index 34bf3005d0..e2e3746a8c 100644 --- a/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala +++ b/akka-persistence/src/main/scala/akka/persistence/journal/leveldb/LeveldbStore.scala @@ -55,10 +55,10 @@ private[persistence] trait LeveldbStore import com.github.ghik.silencer.silent @silent("deprecated") private val persistenceIdSubscribers = new mutable.HashMap[String, mutable.Set[ActorRef]] - with mutable.MultiMap[String, ActorRef] + with mutable.MultiMap[String, ActorRef] @silent("deprecated") private val tagSubscribers = new mutable.HashMap[String, mutable.Set[ActorRef]] - with mutable.MultiMap[String, ActorRef] + with mutable.MultiMap[String, ActorRef] private var allPersistenceIdsSubscribers = Set.empty[ActorRef] private var tagSequenceNr = Map.empty[String, Long] diff --git a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala index 213a7379ba..d39be3747c 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteWatcher.scala @@ -118,12 +118,12 @@ private[akka] class RemoteWatcher( // actors that this node is watching, map of watchee -> Set(watchers) @silent("deprecated") val watching = new mutable.HashMap[InternalActorRef, mutable.Set[InternalActorRef]]() - with mutable.MultiMap[InternalActorRef, InternalActorRef] + with mutable.MultiMap[InternalActorRef, InternalActorRef] // nodes that this node is watching, i.e. expecting heartbeats from these nodes. Map of address -> Set(watchee) on this address @silent("deprecated") val watcheeByNodes = new mutable.HashMap[Address, mutable.Set[InternalActorRef]]() - with mutable.MultiMap[Address, InternalActorRef] + with mutable.MultiMap[Address, InternalActorRef] def watchingNodes = watcheeByNodes.keySet var unreachable: Set[Address] = Set.empty diff --git a/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala b/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala index c8186a55af..51ec4d0116 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Codecs.scala @@ -62,8 +62,11 @@ private[remote] class Encoder( override def createLogicAndMaterializedValue( inheritedAttributes: Attributes): (GraphStageLogic, OutboundCompressionAccess) = { - val logic = new GraphStageLogic(shape) with InHandler with OutHandler with StageLogging - with OutboundCompressionAccess { + val logic = new GraphStageLogic(shape) + with InHandler + with OutHandler + with StageLogging + with OutboundCompressionAccess { private val headerBuilder = HeaderBuilder.out() headerBuilder.setVersion(version) @@ -347,8 +350,11 @@ private[remote] class Decoder( val shape: FlowShape[EnvelopeBuffer, InboundEnvelope] = FlowShape(in, out) def createLogicAndMaterializedValue(inheritedAttributes: Attributes): (GraphStageLogic, InboundCompressionAccess) = { - val logic = new TimerGraphStageLogic(shape) with InboundCompressionAccessImpl with InHandler with OutHandler - with StageLogging { + val logic = new TimerGraphStageLogic(shape) + with InboundCompressionAccessImpl + with InHandler + with OutHandler + with StageLogging { import Decoder.RetryResolveRemoteDeployedRecipient override val compressions = inboundCompressions diff --git a/akka-remote/src/main/scala/akka/remote/artery/Control.scala b/akka-remote/src/main/scala/akka/remote/artery/Control.scala index 02b6301ce7..56b374406f 100644 --- a/akka-remote/src/main/scala/akka/remote/artery/Control.scala +++ b/akka-remote/src/main/scala/akka/remote/artery/Control.scala @@ -172,8 +172,11 @@ private[remote] class OutboundControlJunction( override def createLogicAndMaterializedValue(inheritedAttributes: Attributes) = { - val logic = new GraphStageLogic(shape) with InHandler with OutHandler with StageLogging - with OutboundControlIngress { + val logic = new GraphStageLogic(shape) + with InHandler + with OutHandler + with StageLogging + with OutboundControlIngress { val sendControlMessageCallback = getAsyncCallback[ControlMessage](internalSendControlMessage) private val maxControlMessageBufferSize: Int = outboundContext.settings.Advanced.OutboundControlQueueSize diff --git a/akka-stream/src/main/scala/akka/stream/KillSwitch.scala b/akka-stream/src/main/scala/akka/stream/KillSwitch.scala index b4d0169cb7..1339184bf0 100644 --- a/akka-stream/src/main/scala/akka/stream/KillSwitch.scala +++ b/akka-stream/src/main/scala/akka/stream/KillSwitch.scala @@ -292,8 +292,9 @@ final class SharedKillSwitch private[stream] (val name: String) extends KillSwit override def createLogicAndMaterializedValue( inheritedAttributes: Attributes): (GraphStageLogic, SharedKillSwitch) = { val shutdownListener = terminationSignal.createListener() - val logic = new KillSwitches.KillableGraphStageLogic(shutdownListener.future, shape) with InHandler - with OutHandler { + val logic = new KillSwitches.KillableGraphStageLogic(shutdownListener.future, shape) + with InHandler + with OutHandler { setHandler(shape.in, this) setHandler(shape.out, this) diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSource.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSource.scala index 398e928442..083937a884 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefBackpressureSource.scala @@ -37,8 +37,9 @@ private object ActorRefBackpressureSource { private[akka] override def createLogicAndMaterializedValue( inheritedAttributes: Attributes, eagerMaterializer: Materializer): (GraphStageLogic, ActorRef) = { - val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape) with StageLogging - with ActorRefStage { + val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape) + with StageLogging + with ActorRefStage { override protected def logSource: Class[_] = classOf[ActorRefSource[_]] private var isCompleting: Boolean = false diff --git a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala index 3326d1bdfa..22f595aec1 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/ActorRefSource.scala @@ -36,8 +36,9 @@ private object ActorRefSource { private[akka] override def createLogicAndMaterializedValue( inheritedAttributes: Attributes, eagerMaterializer: Materializer): (GraphStageLogic, ActorRef) = { - val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape) with StageLogging - with ActorRefStage { + val stage: GraphStageLogic with StageLogging with ActorRefStage = new GraphStageLogic(shape) + with StageLogging + with ActorRefStage { override protected def logSource: Class[_] = classOf[ActorRefSource[_]] private val buffer: OptionVal[Buffer[T]] = diff --git a/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala b/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala index 4c567c4795..ddc3754c8c 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala +++ b/akka-stream/src/main/scala/akka/stream/impl/StreamSubscriptionTimeout.scala @@ -90,7 +90,7 @@ import scala.util.control.NoStackTrace handleSubscriptionTimeout( target, new SubscriptionTimeoutException(s"Publisher was not attached to upstream within deadline ($millis) ms") - with NoStackTrace) + with NoStackTrace) case p: Publisher[_] => log.debug("Cancelling {} (after: {} ms)", p, millis)