switch to kiwiproject consul-client (#548)

* switch to kiwiproject consul-client

* Create switch-to-kiwiprojects.excludes

* mima

Author: pjfanning

discovery-consul/src/main/mima-filters/2.0.x.backwards.excludes/switch-to-kiwiprojects.excludes

@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Issues caused by switch to org.kiwiprojects consul-client
+ProblemFilters.exclude[IncompatibleSignatureProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery.ConsulResponseFutureDecorator")
+ProblemFilters.exclude[MissingTypesProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery$ConsulResponseFutureCallback")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery#ConsulResponseFutureCallback.fail")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery#ConsulResponseFutureCallback.future")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery#ConsulResponseFutureCallback.onComplete")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery#ConsulResponseFutureDecorator.asFuture")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("org.apache.pekko.discovery.consul.ConsulServiceDiscovery#ConsulResponseFutureDecorator.this")

discovery-consul/src/main/scala/org/apache/pekko/discovery/consul/ConsulServiceDiscovery.scala

@@ -14,18 +14,18 @@
 package org.apache.pekko.discovery.consul
 
 import com.google.common.net.HostAndPort
-import com.orbitz.consul.Consul
-import com.orbitz.consul.async.ConsulResponseCallback
-import com.orbitz.consul.model.ConsulResponse
-import com.orbitz.consul.model.catalog.CatalogService
-import com.orbitz.consul.option.QueryOptions
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.annotation.ApiMayChange
 import pekko.discovery.ServiceDiscovery.{ Resolved, ResolvedTarget }
 import pekko.discovery.consul.ConsulServiceDiscovery._
 import pekko.discovery.{ Lookup, ServiceDiscovery }
 import pekko.pattern.after
+import org.kiwiproject.consul.Consul
+import org.kiwiproject.consul.async.ConsulResponseCallback
+import org.kiwiproject.consul.model.ConsulResponse
+import org.kiwiproject.consul.model.catalog.CatalogService
+import org.kiwiproject.consul.option.Options
 
 import java.net.InetAddress
 import java.util
@@ -88,7 +88,7 @@ class ConsulServiceDiscovery(system: ActorSystem) extends ServiceDiscovery {
 
   private def getService(name: String) =
     ((callback: ConsulResponseCallback[util.List[CatalogService]]) =>
-          consul.catalogClient().getService(name, QueryOptions.BLANK, callback)).asFuture
+          consul.catalogClient().getService(name, Options.BLANK_QUERY_OPTIONS, callback)).asFuture
 
 }
 

discovery-consul/src/test/scala/org/apache/pekko/cluster/bootstrap/discovery/ConsulDiscoverySpec.scala

@@ -14,15 +14,15 @@
 package org.apache.pekko.cluster.bootstrap.discovery
 
 import com.google.common.net.HostAndPort
-import com.orbitz.consul.Consul
-import com.orbitz.consul.model.catalog.ImmutableCatalogRegistration
-import com.orbitz.consul.model.health.ImmutableService
 import com.typesafe.config.ConfigFactory
 import org.apache.pekko
 import pekko.actor.ActorSystem
 import pekko.discovery.ServiceDiscovery.ResolvedTarget
 import pekko.discovery.consul.ConsulServiceDiscovery
 import pekko.testkit.TestKitBase
+import org.kiwiproject.consul.Consul
+import org.kiwiproject.consul.model.catalog.ImmutableCatalogRegistration
+import org.kiwiproject.consul.model.health.ImmutableService
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.matchers.should.Matchers
@@ -40,7 +40,7 @@ class ConsulDiscoverySpec
     with TestKitBase
     with ScalaFutures {
 
-  private val consul = new ConsulContainer("hashicorp/consul:1.15")
+  private val consul = new ConsulContainer("hashicorp/consul:1.22")
   consul.start()
 
   "Consul Discovery" should {

project/Dependencies.scala

@@ -47,8 +47,8 @@ object Dependencies {
   val discoveryConsul = Seq(
     "org.apache.pekko" %% "pekko-actor" % pekkoVersion,
     "org.apache.pekko" %% "pekko-discovery" % pekkoVersion,
-    "com.orbitz.consul" % "consul-client" % "1.5.3",
-    "org.testcontainers" % "consul" % "1.21.3" % Test,
+    "org.kiwiproject" % "consul-client" % "1.8.1",
+    "org.testcontainers" % "testcontainers-consul" % "2.0.2" % Test,
     "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
     "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
     "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % Test,