From ac08ca87298dadd243876c64b812307d23024a4c Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 11 Oct 2019 16:55:23 +0200 Subject: [PATCH] small simplification since Scala 2.11 isn't supported --- .../scala/akka/actor/typed/receptionist/Receptionist.scala | 4 +--- .../cluster/sharding/typed/scaladsl/ClusterSharding.scala | 4 +--- .../akka/cluster/ddata/typed/javadsl/DistributedData.scala | 4 +--- .../src/main/scala/akka/cluster/typed/Cluster.scala | 4 +--- .../src/main/scala/akka/cluster/typed/ClusterSingleton.scala | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala b/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala index c8bbb65cd3..8e7f0a9037 100644 --- a/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala +++ b/akka-actor-typed/src/main/scala/akka/actor/typed/receptionist/Receptionist.scala @@ -372,9 +372,7 @@ object Receptionist extends ExtensionId[Receptionist] { object ReceptionistSetup { def apply[T <: Extension](createExtension: ActorSystem[_] => Receptionist): ReceptionistSetup = - new ReceptionistSetup(new java.util.function.Function[ActorSystem[_], Receptionist] { - override def apply(sys: ActorSystem[_]): Receptionist = createExtension(sys) - }) // TODO can be simplified when compiled only with Scala >= 2.12 + new ReceptionistSetup(createExtension(_)) } diff --git a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala index 4228a3fbdb..0f0005a313 100644 --- a/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala +++ b/akka-cluster-sharding-typed/src/main/scala/akka/cluster/sharding/typed/scaladsl/ClusterSharding.scala @@ -445,9 +445,7 @@ object EntityTypeKey { object ClusterShardingSetup { def apply[T <: Extension](createExtension: ActorSystem[_] => ClusterSharding): ClusterShardingSetup = - new ClusterShardingSetup(new java.util.function.Function[ActorSystem[_], ClusterSharding] { - override def apply(sys: ActorSystem[_]): ClusterSharding = createExtension(sys) - }) // TODO can be simplified when compiled only with Scala >= 2.12 + new ClusterShardingSetup(createExtension(_)) } diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala index b6311d8643..6a4da97fb4 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/javadsl/DistributedData.scala @@ -99,9 +99,7 @@ abstract class DistributedData extends Extension { object DistributedDataSetup { def apply[T <: Extension](createExtension: ActorSystem[_] => DistributedData): DistributedDataSetup = - new DistributedDataSetup(new java.util.function.Function[ActorSystem[_], DistributedData] { - override def apply(sys: ActorSystem[_]): DistributedData = createExtension(sys) - }) // TODO can be simplified when compiled only with Scala >= 2.12 + new DistributedDataSetup(createExtension(_)) } diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala index 9c50567a23..b1ed912e30 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/Cluster.scala @@ -194,9 +194,7 @@ abstract class Cluster extends Extension { object ClusterSetup { def apply[T <: Extension](createExtension: ActorSystem[_] => Cluster): ClusterSetup = - new ClusterSetup(new java.util.function.Function[ActorSystem[_], Cluster] { - override def apply(sys: ActorSystem[_]): Cluster = createExtension(sys) - }) // TODO can be simplified when compiled only with Scala >= 2.12 + new ClusterSetup(createExtension(_)) } diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala b/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala index 5a09628c6c..f1971162c3 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/typed/ClusterSingleton.scala @@ -297,9 +297,7 @@ final class ClusterSingletonManagerSettings( object ClusterSingletonSetup { def apply[T <: Extension](createExtension: ActorSystem[_] => ClusterSingleton): ClusterSingletonSetup = - new ClusterSingletonSetup(new java.util.function.Function[ActorSystem[_], ClusterSingleton] { - override def apply(sys: ActorSystem[_]): ClusterSingleton = createExtension(sys) - }) // TODO can be simplified when compiled only with Scala >= 2.12 + new ClusterSingletonSetup(createExtension(_)) }