diff --git a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala index bea745c59a..fbc1d3be61 100644 --- a/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala +++ b/akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ClusterShardingSettings.scala @@ -8,7 +8,7 @@ import scala.concurrent.duration._ import scala.concurrent.duration.FiniteDuration import akka.actor.ActorSystem import akka.actor.NoSerializationVerificationNeeded -import akka.annotation.{ ApiMayChange, InternalApi } +import akka.annotation.InternalApi import com.typesafe.config.Config import akka.cluster.Cluster import akka.cluster.singleton.ClusterSingletonManagerSettings @@ -302,7 +302,6 @@ final class ClusterShardingSettings( def withPassivateIdleAfter(duration: java.time.Duration): ClusterShardingSettings = copy(passivateIdleAfter = duration.asScala) - @ApiMayChange def withLeaseSettings(leaseSettings: LeaseUsageSettings): ClusterShardingSettings = copy(leaseSettings = Some(leaseSettings)) diff --git a/akka-coordination/src/main/mima-filters/2.5.x.backwards.excludes b/akka-coordination/src/main/mima-filters/2.5.x.backwards.excludes new file mode 100644 index 0000000000..6c04674e2e --- /dev/null +++ b/akka-coordination/src/main/mima-filters/2.5.x.backwards.excludes @@ -0,0 +1,2 @@ +# Made final when removing api may change +ProblemFilters.exclude[FinalClassProblem]("akka.coordination.lease.LeaseUsageSettings") diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala index 7ab4de5101..69b18cc4b6 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseException.scala @@ -4,10 +4,6 @@ package akka.coordination.lease -import akka.annotation.ApiMayChange - -@ApiMayChange class LeaseException(message: String) extends RuntimeException(message) -@ApiMayChange final class LeaseTimeoutException(message: String) extends LeaseException(message) diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala index 813012618f..2e93dc6a6f 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseSettings.scala @@ -4,17 +4,14 @@ package akka.coordination.lease -import akka.annotation.ApiMayChange import com.typesafe.config.Config object LeaseSettings { - @ApiMayChange def apply(config: Config, leaseName: String, ownerName: String): LeaseSettings = { new LeaseSettings(leaseName, ownerName, TimeoutSettings(config), config) } } -@ApiMayChange final class LeaseSettings( val leaseName: String, val ownerName: String, diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala index 8c2288b700..7285bed6c2 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/LeaseUsageSettings.scala @@ -4,14 +4,12 @@ package akka.coordination.lease -import akka.annotation.ApiMayChange import akka.util.JavaDurationConverters._ import akka.util.PrettyDuration._ import scala.concurrent.duration.FiniteDuration -@ApiMayChange -class LeaseUsageSettings private[akka] (val leaseImplementation: String, val leaseRetryInterval: FiniteDuration) { +final class LeaseUsageSettings private[akka] (val leaseImplementation: String, val leaseRetryInterval: FiniteDuration) { def getLeaseRetryInterval(): java.time.Duration = leaseRetryInterval.asJava override def toString = s"LeaseUsageSettings($leaseImplementation, ${leaseRetryInterval.pretty})" diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala b/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala index 89457d8144..7d2e9973e9 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/TimeoutSettings.scala @@ -4,13 +4,11 @@ package akka.coordination.lease -import akka.annotation.ApiMayChange import com.typesafe.config.{ Config, ConfigValueType } import akka.util.JavaDurationConverters._ import scala.concurrent.duration._ object TimeoutSettings { - @ApiMayChange def apply(config: Config): TimeoutSettings = { val heartBeatTimeout = config.getDuration("heartbeat-timeout").asScala val heartBeatInterval = config.getValue("heartbeat-interval").valueType() match { @@ -24,7 +22,6 @@ object TimeoutSettings { } -@ApiMayChange final class TimeoutSettings( val heartbeatInterval: FiniteDuration, val heartbeatTimeout: FiniteDuration, diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala b/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala index 39d5c67483..80cf8b4fcc 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/Lease.scala @@ -7,10 +7,8 @@ package akka.coordination.lease.javadsl import java.util.Optional import java.util.concurrent.CompletionStage -import akka.annotation.ApiMayChange import akka.coordination.lease.LeaseSettings -@ApiMayChange abstract class Lease() { def getSettings(): LeaseSettings diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala b/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala index 9b92741caa..8bc439dd5b 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/javadsl/LeaseProvider.scala @@ -5,11 +5,9 @@ package akka.coordination.lease.javadsl import akka.actor.{ ActorSystem, ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider } -import akka.annotation.ApiMayChange import akka.coordination.lease.internal.LeaseAdapter import akka.coordination.lease.scaladsl.{ LeaseProvider => ScalaLeaseProvider } -@ApiMayChange object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider { override def get(system: ActorSystem): LeaseProvider = super.get(system) @@ -20,7 +18,6 @@ object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider private final case class LeaseKey(leaseName: String, configPath: String, clientName: String) } -@ApiMayChange class LeaseProvider(system: ExtendedActorSystem) extends Extension { private val delegate = ScalaLeaseProvider(system) diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala index d7eca9af66..d87d26aa21 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/Lease.scala @@ -4,12 +4,10 @@ package akka.coordination.lease.scaladsl -import akka.annotation.ApiMayChange import akka.coordination.lease.LeaseSettings import scala.concurrent.Future -@ApiMayChange abstract class Lease(val settings: LeaseSettings) { /** diff --git a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala index 0673e4dfdc..f5c6413d91 100644 --- a/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala +++ b/akka-coordination/src/main/scala/akka/coordination/lease/scaladsl/LeaseProvider.scala @@ -14,11 +14,9 @@ import akka.actor.ExtendedActorSystem import akka.actor.Extension import akka.actor.ExtensionId import akka.actor.ExtensionIdProvider -import akka.annotation.ApiMayChange import akka.event.Logging import akka.coordination.lease.LeaseSettings -@ApiMayChange object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider { override def get(system: ActorSystem): LeaseProvider = super.get(system) @@ -29,7 +27,6 @@ object LeaseProvider extends ExtensionId[LeaseProvider] with ExtensionIdProvider private final case class LeaseKey(leaseName: String, configPath: String, clientName: String) } -@ApiMayChange class LeaseProvider(system: ExtendedActorSystem) extends Extension { import LeaseProvider.LeaseKey diff --git a/akka-docs/src/main/paradox/coordination.md b/akka-docs/src/main/paradox/coordination.md index 0ba40cbc6e..e1f30bfe49 100644 --- a/akka-docs/src/main/paradox/coordination.md +++ b/akka-docs/src/main/paradox/coordination.md @@ -1,12 +1,5 @@ # Coordination -@@@ warning - -This module is currently marked as @ref:[may change](common/may-change.md). It is ready to be used -in production but the API may change without warning or a deprecation period. - -@@@ - Akka Coordination is a set of tools for distributed coordination. ## Dependency diff --git a/build.sbt b/build.sbt index ec92322f87..d64a59e9ed 100644 --- a/build.sbt +++ b/build.sbt @@ -455,7 +455,6 @@ lazy val coordination = akkaModule("akka-coordination") .settings(Dependencies.coordination) .settings(AutomaticModuleName.settings("akka.coordination")) .settings(OSGi.coordination) - .settings(AkkaBuild.mayChangeSettings) def akkaModule(name: String): Project = Project(id = name, base = file(name))