refactor: merge client module to opengemini-client

opengemini-client-okhttp/pom.xml → opengemini-client/pom.xml

@@ -9,7 +9,7 @@
         <version>0.3.0</version>
     </parent>
 
-    <artifactId>opengemini-client-okhttp</artifactId>
+    <artifactId>opengemini-client</artifactId>
 
     <dependencies>
         <dependency>
@@ -23,15 +23,22 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.opengemini</groupId>
-            <artifactId>opengemini-client-test-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
+            <groupId>org.asynchttpclient</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>${async-http-client.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
             <version>${okhttp.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.opengemini</groupId>
+            <artifactId>opengemini-client-test-common</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

opengemini-client-asynchttpclient/src/main/java/io/opengemini/client/asynchttpclient/OpenGeminiAsyncHttpClient.java → opengemini-client/src/main/java/io/opengemini/client/asynchttpclient/OpenGeminiAsyncHttpClient.java

@@ -105,11 +105,15 @@ private <T> CompletableFuture<T> compose(CompletableFuture<HttpResponse> respons
                     T body = JacksonService.toObject(responseBody, type);
                     return CompletableFuture.completedFuture(body);
                 } catch (JsonProcessingException e) {
-                    return CompletableFuture.failedFuture(e);
+                    CompletableFuture<T> future = new CompletableFuture<>();
+                    future.completeExceptionally(e);
+                    return future;
                 }
             } else {
                 OpenGeminiException exp = new OpenGeminiException("http error: " + responseBody, responseStatus.code());
-                return CompletableFuture.failedFuture(exp);
+                CompletableFuture<T> future = new CompletableFuture<>();
+                future.completeExceptionally(exp);
+                return future;
             }
         });
     }

opengemini-client-jdk/src/main/java/io/opengemini/client/jdk/OpenGeminiJdkClient.java → opengemini-client/src/main/java/io/opengemini/client/jdk/OpenGeminiJdkClient.java

@@ -17,7 +17,6 @@
 import io.opengemini.client.common.JacksonService;
 import org.jetbrains.annotations.NotNull;
 
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -98,12 +97,16 @@ protected CompletableFuture<Pong> executePing() {
                 T resp = JacksonService.toObject(body, type);
                 return CompletableFuture.completedFuture(resp);
             } catch (JsonProcessingException e) {
-                return CompletableFuture.failedFuture(e);
+                CompletableFuture<T> future = new CompletableFuture<>();
+                future.completeExceptionally(e);
+                return future;
             }
         } else {
             String errorMsg = "http error: " + body;
-            return CompletableFuture.failedFuture(
-                new OpenGeminiException(errorMsg, response.statusCode()));
+            OpenGeminiException openGeminiException = new OpenGeminiException(errorMsg, response.statusCode());
+            CompletableFuture<T> future = new CompletableFuture<>();
+            future.completeExceptionally(openGeminiException);
+            return future;
         }
     }
 
@@ -116,12 +119,6 @@ public CompletableFuture<HttpResponse> post(String url, String body) {
                 headers);
     }
 
-    @Override
-    protected String encode(String str) {
-        // jdk17 has a better way than jdk8
-        return URLEncoder.encode(str, StandardCharsets.UTF_8);
-    }
-
     @Override
     public void close() {
         // no need to close

pom.xml

@@ -9,11 +9,9 @@
     <version>0.3.0</version>
     <packaging>pom</packaging>
     <modules>
+        <module>opengemini-client</module>
         <module>opengemini-client-api</module>
-        <module>opengemini-client-asynchttpclient</module>
         <module>opengemini-client-common</module>
-        <module>opengemini-client-jdk</module>
-        <module>opengemini-client-okhttp</module>
         <module>opengemini-client-reactor</module>
         <module>opengemini-client-test-common</module>
         <module>spring</module>
@@ -41,7 +39,6 @@
         <reactor-netty.version>1.1.21</reactor-netty.version>
         <scala.version>3.4.0</scala.version>
         <slf4j.version>2.0.7</slf4j.version>
-        <spring.version>6.0.19</spring.version>
         <spring-boot.version>3.1.11</spring-boot.version>
         <!-- plugin -->
         <central-publishing-maven-plugin.version>0.6.0</central-publishing-maven-plugin.version>

spring/opengemini-spring-boot-starter-reactive/pom.xml

@@ -26,7 +26,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

spring/opengemini-spring-boot-starter/pom.xml

@@ -21,12 +21,10 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

spring/opengemini-spring/pom.xml

@@ -19,10 +19,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.opengemini</groupId>
-            <artifactId>opengemini-client-okhttp</artifactId>
-            <version>${project.version}</version>
-            <optional>true</optional>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
         </dependency>
         <dependency>
             <groupId>io.opengemini</groupId>
@@ -33,12 +31,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
-            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 

spring/pom.xml

@@ -12,10 +12,27 @@
     <artifactId>opengemini-spring-parent</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
     <modules>
         <module>opengemini-spring</module>
         <module>opengemini-spring-boot-starter</module>
         <module>opengemini-spring-boot-starter-reactive</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>