Update Consul Client to expose deprecated Consul API (#29288)

apache · Dec 5, 2023 · b96b0d4 · b96b0d4
1 parent cb0cf03
commit b96b0d4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/mode/type/cluster/repository/provider/consul/pom.xml b/mode/type/cluster/repository/provider/consul/pom.xml
@@ -32,6 +32,12 @@
                 <groupId>com.ecwid.consul</groupId>
                 <artifactId>consul-api</artifactId>
                 <version>${consul.api.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>

diff --git a/...a/org/apache/shardingsphere/mode/repository/cluster/consul/ShardingSphereQueryParams.java b/...a/org/apache/shardingsphere/mode/repository/cluster/consul/ShardingSphereQueryParams.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.mode.repository.cluster.consul;
 
 import com.ecwid.consul.UrlParameters;
-import com.ecwid.consul.Utils;
 import lombok.RequiredArgsConstructor;
 
 import java.util.ArrayList;
@@ -42,7 +41,7 @@ public List<String> toUrlParameters() {
             result.add(String.format("wait=%dms", TimeUnit.MILLISECONDS.toMillis(waitMillis)));
         }
         if (-1 != index) {
-            result.add(String.format("index=%s", Utils.toUnsignedString(index)));
+            result.add(String.format("index=%s", Long.toUnsignedString(index)));
         }
         return result;
     }

diff --git a/.../org/apache/shardingsphere/mode/repository/cluster/consul/lock/ConsulDistributedLock.java b/.../org/apache/shardingsphere/mode/repository/cluster/consul/lock/ConsulDistributedLock.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.mode.repository.cluster.consul.lock;
 
 import com.ecwid.consul.ConsulException;
-import com.ecwid.consul.transport.RawResponse;
+import com.ecwid.consul.transport.HttpResponse;
 import com.ecwid.consul.v1.ConsulClient;
 import com.ecwid.consul.v1.OperationException;
 import com.ecwid.consul.v1.QueryParams;
@@ -133,7 +133,7 @@ private long waitUntilRelease(final long valueIndex, final long timeoutMillis) {
         }
     }
 
-    private Response<GetValue> getResponse(final RawResponse rawResponse) {
+    private Response<GetValue> getResponse(final HttpResponse rawResponse) {
         if (200 == rawResponse.getStatusCode()) {
             List<GetValue> value = JsonUtils.fromJsonString(rawResponse.getContent(), new TypeReference<List<GetValue>>() {
             });

diff --git a/pom.xml b/pom.xml
@@ -106,11 +106,11 @@
         <zookeeper.version>3.9.0</zookeeper.version>
         <audience-annotations.version>0.12.0</audience-annotations.version>
         <jetcd.version>0.7.6</jetcd.version>
-        <consul.api.version>1.4.1</consul.api.version>
+        <consul.api.version>1.4.5</consul.api.version>
 
         <grpc.version>1.58.0</grpc.version>
         <protobuf.version>3.21.12</protobuf.version>
-        <httpclient.version>4.5.13</httpclient.version>
+        <httpclient.version>4.5.14</httpclient.version>
         <okhttp.version>4.12.0</okhttp.version>
 
         <elasticjob.version>3.0.4</elasticjob.version>