From 3c6f7cd5973e24ac4a09a65b9e4b58f0d7869b66 Mon Sep 17 00:00:00 2001 From: Levi Ramsey Date: Fri, 7 Feb 2025 13:30:03 -0500 Subject: [PATCH] mima --- .../src/main/mima-filters/1.6.0.backwards.excludes | 11 +++++++++++ .../kubernetes/KubernetesApiServiceDiscovery.scala | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 discovery-kubernetes-api/src/main/mima-filters/1.6.0.backwards.excludes diff --git a/discovery-kubernetes-api/src/main/mima-filters/1.6.0.backwards.excludes b/discovery-kubernetes-api/src/main/mima-filters/1.6.0.backwards.excludes new file mode 100644 index 000000000..e8231680d --- /dev/null +++ b/discovery-kubernetes-api/src/main/mima-filters/1.6.0.backwards.excludes @@ -0,0 +1,11 @@ +ProblemFilters.exclude[DirectAbstractMethodProblem]("akka.discovery.ServiceDiscovery.lookup") + +# private class changed enclosing object +ProblemFilters.exclude[MissingClassProblem]("akka.discovery.kubernetes.KubernetesApiServiceDiscovery$KubernetesSetup") +ProblemFilters.exclude[MissingClassProblem]("akka.discovery.kubernetes.KubernetesApiServiceDiscovery$KubernetesSetup$") + +# InternalAPI +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.discovery.kubernetes.PodList#PodStatus.copy") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.discovery.kubernetes.PodList#PodStatus.this") +ProblemFilters.exclude[MissingTypesProblem]("akka.discovery.kubernetes.PodList$PodStatus$") +ProblemFilters.exclude[DirectMissingMethodProblem]("akka.discovery.kubernetes.PodList#PodStatus.apply") diff --git a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala b/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala index 2de7cd17d..2c1683b00 100644 --- a/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala +++ b/discovery-kubernetes-api/src/main/scala/akka/discovery/kubernetes/KubernetesApiServiceDiscovery.scala @@ -20,6 +20,7 @@ import scala.util.control.NonFatal import akka.actor.ActorSystem import akka.annotation.InternalApi +import akka.annotation.DoNotInherit import akka.discovery.ServiceDiscovery.Resolved import akka.discovery.ServiceDiscovery.ResolvedTarget import akka.discovery._ @@ -111,7 +112,9 @@ object BaseKubernetesApiServiceDiscovery { /** * Discovery implementation that uses the Kubernetes API. * + * Not for user extension */ +@DoNotInherit sealed abstract class BaseKubernetesApiServiceDiscovery(protected val log: LoggingAdapter)(implicit system: ActorSystem) extends ServiceDiscovery {