From 46a310e2cc819e70db789b0c64bd975453f139ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bu=CC=80i=20Vie=CC=A3=CC=82t=20Tha=CC=80nh?= Date: Fri, 3 Apr 2020 00:13:12 +0700 Subject: [PATCH] scalafix ConstructorProcedureSyntax fix by: + enabling only ConstructorProcedureSyntax rule in .scalafix.conf + then: ``` % sbt -Dakka.build.scalaVersion=2.13.1 > fixall > scalafmtAll ``` --- .scalafix.conf | 1 + .../actor/testkit/typed/CapturedLogEvent.scala | 15 +++++---------- .../src/test/scala/akka/event/EventBusSpec.scala | 3 +-- .../src/test/scala/akka/util/ReflectSpec.scala | 4 ++-- .../sharding/typed/ClusterShardingSettings.scala | 4 +--- .../pubsub/DistributedPubSubMediator.scala | 3 +-- .../akka/cluster/ddata/LocalConcurrencySpec.scala | 3 +-- .../scala/akka/persistence/EventAdapterSpec.scala | 3 +-- .../main/scala/akka/stream/scaladsl/Framing.scala | 3 +-- .../sslconfig/akka/util/AkkaLoggerBridge.scala | 2 +- 10 files changed, 15 insertions(+), 26 deletions(-) diff --git a/.scalafix.conf b/.scalafix.conf index c06b139489..90d9a78ca1 100644 --- a/.scalafix.conf +++ b/.scalafix.conf @@ -1,6 +1,7 @@ // .scalafix.conf rules = [ RemoveUnused + "github:ohze/scalafix-rules/ConstructorProcedureSyntax" ] RemoveUnused.imports = true RemoveUnused.privates = false diff --git a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala index c6e31bb29d..c53e677d6c 100644 --- a/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala +++ b/akka-actor-testkit-typed/src/main/scala/akka/actor/testkit/typed/CapturedLogEvent.scala @@ -28,37 +28,32 @@ final case class CapturedLogEvent(level: Level, message: String, cause: Option[T message: String, errorCause: Optional[Throwable], marker: Optional[Marker], - mdc: java.util.Map[String, Any]) { + mdc: java.util.Map[String, Any]) = this(level, message, errorCause.asScala, marker.asScala) - } /** * Constructor for Java API */ - def this(level: Level, message: String) { + def this(level: Level, message: String) = this(level, message, Option.empty, Option.empty) - } /** * Constructor for Java API */ - def this(level: Level, message: String, errorCause: Throwable) { + def this(level: Level, message: String, errorCause: Throwable) = this(level, message, Some(errorCause), Option.empty[Marker]) - } /** * Constructor for Java API */ - def this(level: Level, message: String, marker: Marker) { + def this(level: Level, message: String, marker: Marker) = this(level, message, Option.empty[Throwable], Some(marker)) - } /** * Constructor for Java API */ - def this(level: Level, message: String, errorCause: Throwable, marker: Marker) { + def this(level: Level, message: String, errorCause: Throwable, marker: Marker) = this(level, message, Some(errorCause), Some(marker)) - } def getErrorCause: Optional[Throwable] = cause.asJava diff --git a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala index 0ab496215e..ce135661b6 100644 --- a/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/EventBusSpec.scala @@ -172,9 +172,8 @@ class ActorEventBusSpec(conf: Config) extends EventBusSpec("ActorEventBus", conf import akka.event.ActorEventBusSpec._ import EventBusSpec.TestActorWrapperActor - def this() { + def this() = this(ConfigFactory.parseString("akka.actor.debug.event-stream = on").withFallback(AkkaSpec.testConf)) - } type BusType = MyActorEventBus def createNewEventBus(): BusType = new MyActorEventBus(system) diff --git a/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala b/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala index 9fc8003040..5b203eecdc 100644 --- a/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/util/ReflectSpec.scala @@ -16,8 +16,8 @@ object ReflectSpec { class Two(@unused a: A, @unused b: B) class MultipleOne(a: A, b: B) { - def this(a: A) { this(a, null) } - def this(b: B) { this(null, b) } + def this(a: A) = this(a, null) + def this(b: B) = this(null, b) } } diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala index a77daeda84..4c71b3a51d 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/ClusterShardingSettings.scala @@ -127,7 +127,7 @@ object ClusterShardingSettings { val updatingStateTimeout: FiniteDuration, val waitingForStateTimeout: FiniteDuration) { - def this(classic: ClassicShardingSettings.TuningParameters) { + def this(classic: ClassicShardingSettings.TuningParameters) = this( bufferSize = classic.bufferSize, coordinatorFailureBackoff = classic.coordinatorFailureBackoff, @@ -147,8 +147,6 @@ object ClusterShardingSettings { entityRecoveryConstantRateStrategyFrequency = classic.entityRecoveryConstantRateStrategyFrequency, entityRecoveryConstantRateStrategyNumberOfEntities = classic.entityRecoveryConstantRateStrategyNumberOfEntities) - } - require( entityRecoveryStrategy == "all" || entityRecoveryStrategy == "constant", s"Unknown 'entity-recovery-strategy' [$entityRecoveryStrategy], valid values are 'all' or 'constant'") diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala index 7e67fcb6ce..4d46f656b5 100644 --- a/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala +++ b/akka-cluster-tools/src/main/scala/akka/cluster/pubsub/DistributedPubSubMediator.scala @@ -104,7 +104,7 @@ final class DistributedPubSubSettings( routingLogic: RoutingLogic, gossipInterval: FiniteDuration, removedTimeToLive: FiniteDuration, - maxDeltaElements: Int) { + maxDeltaElements: Int) = this( role, routingLogic, @@ -112,7 +112,6 @@ final class DistributedPubSubSettings( removedTimeToLive, maxDeltaElements, sendToDeadLettersWhenNoSubscribers = true) - } require( !routingLogic.isInstanceOf[ConsistentHashingRoutingLogic], diff --git a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala index a1daaee9f0..3f069e75e4 100644 --- a/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala +++ b/akka-distributed-data/src/test/scala/akka/cluster/ddata/LocalConcurrencySpec.scala @@ -45,7 +45,7 @@ class LocalConcurrencySpec(_system: ActorSystem) with ImplicitSender { import LocalConcurrencySpec._ - def this() { + def this() = this( ActorSystem( "LocalConcurrencySpec", @@ -54,7 +54,6 @@ class LocalConcurrencySpec(_system: ActorSystem) akka.remote.classic.netty.tcp.port=0 akka.remote.artery.canonical.port = 0 """))) - } override def afterAll(): Unit = { shutdown(system) diff --git a/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala b/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala index 7ec7adeb35..3ed0b0b7b9 100644 --- a/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala +++ b/akka-persistence/src/test/scala/akka/persistence/EventAdapterSpec.scala @@ -101,7 +101,7 @@ abstract class EventAdapterSpec(journalName: String, journalConfig: Config, adap import EventAdapterSpec._ - def this(journalName: String) { + def this(journalName: String) = this( "inmem", PersistenceSpec.config("inmem", "InmemPersistentTaggingSpec"), @@ -150,7 +150,6 @@ abstract class EventAdapterSpec(journalName: String, journalConfig: Config, adap | } |} """.stripMargin)) - } def persister(name: String, journalId: String = journalName) = system.actorOf(Props(classOf[PersistAllIncomingActor], name, "akka.persistence.journal." + journalId)) diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala index fe5dde2cb4..43cdee6ea9 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala +++ b/akka-stream/src/main/scala/akka/stream/scaladsl/Framing.scala @@ -371,9 +371,8 @@ object Framing { extends GraphStage[FlowShape[ByteString, ByteString]] { //for the sake of binary compatibility - def this(lengthFieldLength: Int, lengthFieldOffset: Int, maximumFrameLength: Int, byteOrder: ByteOrder) { + def this(lengthFieldLength: Int, lengthFieldOffset: Int, maximumFrameLength: Int, byteOrder: ByteOrder) = this(lengthFieldLength, lengthFieldOffset, maximumFrameLength, byteOrder, None) - } private val minimumChunkSize = lengthFieldOffset + lengthFieldLength private val intDecoder = byteOrder match { diff --git a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala index 08c22a1f9e..1299525838 100644 --- a/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala +++ b/akka-stream/src/main/scala/com/typesafe/sslconfig/akka/util/AkkaLoggerBridge.scala @@ -17,7 +17,7 @@ final class AkkaLoggerFactory(system: ActorSystem) extends LoggerFactory { } class AkkaLoggerBridge(bus: EventStream, logSource: String, logClass: Class[_]) extends NoDepsLogger { - def this(bus: EventStream, clazz: Class[_]) { this(bus, clazz.getCanonicalName, clazz) } + def this(bus: EventStream, clazz: Class[_]) = this(bus, clazz.getCanonicalName, clazz) override def isDebugEnabled: Boolean = true