From 4bd3edaa323c99565a5c1944d36dc2858d417048 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Tue, 15 Oct 2019 10:36:13 +0200 Subject: [PATCH] add missing apply for consistency types, #27997 (#27998) --- .../ddata/typed/scaladsl/Replicator.scala | 30 +++++++++++++++++++ .../scaladsl/ReplicatorCompileOnlyTest.scala | 12 ++++++++ 2 files changed, 42 insertions(+) diff --git a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala index acbee3f374..f235eb8624 100644 --- a/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala +++ b/akka-cluster-typed/src/main/scala/akka/cluster/ddata/typed/scaladsl/Replicator.scala @@ -4,6 +4,8 @@ package akka.cluster.ddata.typed.scaladsl +import scala.concurrent.duration.FiniteDuration + import akka.cluster.{ ddata => dd } import akka.cluster.ddata.Key import akka.cluster.ddata.ReplicatedData @@ -31,14 +33,42 @@ object Replicator { type ReadConsistency = dd.Replicator.ReadConsistency val ReadLocal = dd.Replicator.ReadLocal + object ReadFrom { + def apply(n: Int, timeout: FiniteDuration): ReadFrom = + dd.Replicator.ReadFrom(n, timeout) + } type ReadFrom = dd.Replicator.ReadFrom + object ReadMajority { + def apply(timeout: FiniteDuration): ReadMajority = + dd.Replicator.ReadMajority(timeout: FiniteDuration) + def apply(timeout: FiniteDuration, minCap: Int): ReadMajority = + dd.Replicator.ReadMajority(timeout: FiniteDuration, minCap) + } type ReadMajority = dd.Replicator.ReadMajority + object ReadAll { + def apply(timeout: FiniteDuration): ReadAll = + dd.Replicator.ReadAll(timeout: FiniteDuration) + } type ReadAll = dd.Replicator.ReadAll type WriteConsistency = dd.Replicator.WriteConsistency val WriteLocal = dd.Replicator.WriteLocal + object WriteTo { + def apply(n: Int, timeout: FiniteDuration): WriteTo = + dd.Replicator.WriteTo(n, timeout: FiniteDuration) + } type WriteTo = dd.Replicator.WriteTo + object WriteMajority { + def apply(timeout: FiniteDuration): WriteMajority = + dd.Replicator.WriteMajority(timeout: FiniteDuration) + def apply(timeout: FiniteDuration, minCap: Int): WriteMajority = + dd.Replicator.WriteMajority(timeout: FiniteDuration, minCap) + } type WriteMajority = dd.Replicator.WriteMajority + object WriteAll { + def apply(timeout: FiniteDuration): WriteAll = + dd.Replicator.WriteAll(timeout: FiniteDuration) + } type WriteAll = dd.Replicator.WriteAll trait Command diff --git a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala index 4bc0c699e5..d7f2e83599 100644 --- a/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala +++ b/akka-cluster-typed/src/test/scala/akka/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala @@ -114,4 +114,16 @@ object ReplicatorCompileOnlyTest { case ReplicaCount(_) => } } + + def shouldHaveApplyForConsistencies(): Unit = { + Replicator.ReadFrom(3, 3.seconds) + Replicator.ReadMajority(3.seconds) + Replicator.ReadMajority(3.seconds, minCap = 5) + Replicator.ReadAll(3.seconds) + + Replicator.WriteTo(3, 3.seconds) + Replicator.WriteMajority(3.seconds) + Replicator.WriteMajority(3.seconds, minCap = 5) + Replicator.WriteAll(3.seconds) + } }