From b89cc4c4172c55a1ec933449a24cf07cef6ba2df Mon Sep 17 00:00:00 2001 From: Renato Cavalcanti Date: Fri, 12 Jun 2020 21:27:27 +0200 Subject: [PATCH 1/4] User Interger in javadsl function --- .../sharding/typed/internal/ShardedDaemonProcessImpl.scala | 2 +- .../cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala index a5c12d66f1..3df856a276 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala @@ -168,7 +168,7 @@ private[akka] final class ShardedDaemonProcessImpl(system: ActorSystem[_]) messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Int, Behavior[T]], + behaviorFactory: function.Function[Integer, Behavior[T]], stopMessage: T): Unit = init(name, numberOfInstances, n => behaviorFactory(n), ShardedDaemonProcessSettings(system), Some(stopMessage))( ClassTag(messageClass)) diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala index cfead91abf..b6b63eb98c 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala @@ -56,7 +56,7 @@ abstract class ShardedDaemonProcess { messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Int, Behavior[T]], + behaviorFactory: function.Function[Integer, Behavior[T]], stopMessage: T): Unit /** From e7a7d95e37c43591517f5b4fc632cd56852aab58 Mon Sep 17 00:00:00 2001 From: Renato Cavalcanti Date: Wed, 17 Jun 2020 11:24:30 +0200 Subject: [PATCH 2/4] mima exclusions --- .../daemon-process-init-overloads.excludes | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes diff --git a/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes b/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes new file mode 100644 index 0000000000..9fe63a0d50 --- /dev/null +++ b/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes @@ -0,0 +1,3 @@ +# ShardedDaemonProcess: Use Interger in javadsl function #29235 +ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.cluster.sharding.typed.javadsl.ShardedDaemonProcess.init") +ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.cluster.sharding.typed.internal.ShardedDaemonProcessImpl.init") \ No newline at end of file From 6ab23dfd68d5a3c05295eab9d661351d77490869 Mon Sep 17 00:00:00 2001 From: Renato Cavalcanti Date: Wed, 17 Jun 2020 13:26:20 +0200 Subject: [PATCH 3/4] javadsl uses java.util.function.IntFunction instead --- .../daemon-process-init-overloads.excludes | 6 ++++-- .../typed/internal/ShardedDaemonProcessImpl.scala | 8 ++++---- .../sharding/typed/javadsl/ShardedDaemonProcess.scala | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes b/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes index 9fe63a0d50..78079828f6 100644 --- a/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes +++ b/akka-cluster-sharding-typed/src/main/mima-filters/2.6.6.backwards.excludes/daemon-process-init-overloads.excludes @@ -1,3 +1,5 @@ # ShardedDaemonProcess: Use Interger in javadsl function #29235 -ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.cluster.sharding.typed.javadsl.ShardedDaemonProcess.init") -ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.cluster.sharding.typed.internal.ShardedDaemonProcessImpl.init") \ No newline at end of file +ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.cluster.sharding.typed.javadsl.ShardedDaemonProcess.init") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.cluster.sharding.typed.javadsl.ShardedDaemonProcess.init") +ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.cluster.sharding.typed.internal.ShardedDaemonProcessImpl.init") +ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.cluster.sharding.typed.javadsl.ShardedDaemonProcess.init") diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala index 3df856a276..f69e09c64b 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala @@ -4,6 +4,7 @@ package akka.cluster.sharding.typed.internal +import java.util.function.IntFunction import java.util.Optional import scala.compat.java8.OptionConverters._ @@ -29,7 +30,6 @@ import akka.cluster.sharding.typed.scaladsl.Entity import akka.cluster.sharding.typed.scaladsl.EntityTypeKey import akka.cluster.sharding.typed.scaladsl.StartEntity import akka.cluster.typed.Cluster -import akka.japi.function import akka.util.PrettyDuration /** @@ -161,14 +161,14 @@ private[akka] final class ShardedDaemonProcessImpl(system: ActorSystem[_]) messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Integer, Behavior[T]]): Unit = + behaviorFactory: IntFunction[Behavior[T]]): Unit = init(name, numberOfInstances, n => behaviorFactory(n))(ClassTag(messageClass)) override def init[T]( messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Integer, Behavior[T]], + behaviorFactory: IntFunction[Behavior[T]], stopMessage: T): Unit = init(name, numberOfInstances, n => behaviorFactory(n), ShardedDaemonProcessSettings(system), Some(stopMessage))( ClassTag(messageClass)) @@ -177,7 +177,7 @@ private[akka] final class ShardedDaemonProcessImpl(system: ActorSystem[_]) messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Integer, Behavior[T]], + behaviorFactory: IntFunction[Behavior[T]], settings: ShardedDaemonProcessSettings, stopMessage: Optional[T]): Unit = init(name, numberOfInstances, n => behaviorFactory(n), settings, stopMessage.asScala)(ClassTag(messageClass)) diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala index b6b63eb98c..c49281f04c 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala @@ -4,6 +4,7 @@ package akka.cluster.sharding.typed.javadsl +import java.util.function.IntFunction import java.util.Optional import akka.actor.typed.ActorSystem @@ -11,7 +12,6 @@ import akka.actor.typed.Behavior import akka.annotation.ApiMayChange import akka.annotation.DoNotInherit import akka.cluster.sharding.typed.ShardedDaemonProcessSettings -import akka.japi.function object ShardedDaemonProcess { def get(system: ActorSystem[_]): ShardedDaemonProcess = @@ -43,7 +43,7 @@ abstract class ShardedDaemonProcess { messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Integer, Behavior[T]]): Unit + behaviorFactory: IntFunction[Behavior[T]]): Unit /** * Start a specific number of actors that is then kept alive in the cluster. @@ -56,7 +56,7 @@ abstract class ShardedDaemonProcess { messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Integer, Behavior[T]], + behaviorFactory: IntFunction[Behavior[T]], stopMessage: T): Unit /** @@ -69,7 +69,7 @@ abstract class ShardedDaemonProcess { messageClass: Class[T], name: String, numberOfInstances: Int, - behaviorFactory: function.Function[Integer, Behavior[T]], + behaviorFactory: IntFunction[Behavior[T]], settings: ShardedDaemonProcessSettings, stopMessage: Optional[T]): Unit From 1b2b7bffc8508155bdde9100e1f70fcd4a520c6c Mon Sep 17 00:00:00 2001 From: Renato Cavalcanti Date: Wed, 17 Jun 2020 14:36:21 +0200 Subject: [PATCH 4/4] formatting --- .../sharding/typed/internal/ShardedDaemonProcessImpl.scala | 2 +- .../cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala index f69e09c64b..f84bc51647 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala @@ -4,7 +4,7 @@ package akka.cluster.sharding.typed.internal -import java.util.function.IntFunction +import java.util.function.IntFunction import java.util.Optional import scala.compat.java8.OptionConverters._ diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala index c49281f04c..0b13435676 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala @@ -4,7 +4,7 @@ package akka.cluster.sharding.typed.javadsl -import java.util.function.IntFunction +import java.util.function.IntFunction import java.util.Optional import akka.actor.typed.ActorSystem