feat: update common version and remove jersey code

.github/workflows/client-ci.yml

@@ -1,6 +1,7 @@
 name: "hugegraph-client-ci"
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/codeql-analysis.yml

@@ -12,6 +12,9 @@
 name: "CodeQL"
 
 on:
+  workflow_dispatch:
+  push:
+    branches: [ master, release-* ]
   pull_request:
     # The branches below must be a subset of the branches above
     # branches: [ master ] # enable in all PR

.github/workflows/hubble-ci.yml

@@ -1,6 +1,7 @@
 name: "hugegraph-hubble-ci"
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/loader-ci.yml

@@ -1,6 +1,7 @@
 name: "hugegraph-loader-ci"
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

.github/workflows/tools-ci.yml

@@ -1,5 +1,6 @@
 name: "hugegraph-tools-ci"
 on:
+  workflow_dispatch:
   push:
     branches:
       - master

.licenserc.yaml

@@ -75,6 +75,7 @@ header: # `header` section is configurations for source codes license header.
     - 'assembly/**'
     - '.github/**/*'
     - '**/target/*'
+    - 'hugegraph-client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker'
     # - 'hugegraph-hubble/hubble-fe/**'
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 

hugegraph-client/pom.xml

@@ -15,8 +15,8 @@
   License for the specific language governing permissions and limitations
   under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -30,15 +30,12 @@
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
-    <url>https://github.com/apache/incubator-hugegraph-toolchain/tree/master/hugegraph-client</url>
+    <url>https://github.com/apache/hugegraph-toolchain/tree/master/hugegraph-client</url>
     <description>
         hugegraph-client is a Java-written client of HugeGraph, providing
         operations of graph, schema, gremlin, variables and traversals etc.
     </description>
 
-    <properties>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.hugegraph</groupId>
@@ -48,15 +45,17 @@
             <groupId>org.lz4</groupId>
             <artifactId>lz4-java</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>

hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java

@@ -50,7 +50,7 @@ public User get(Object id) {
     }
 
     public UserRole getUserRole(Object id) {
-        String idEncoded = RestClient.encode(formatEntityId(id));
+        String idEncoded = formatEntityId(id);
         String path = String.join("/", this.path(), idEncoded, "role");
         RestResult result = this.client.get(path);
         return result.readObject(UserRole.class);

hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java

@@ -23,6 +23,7 @@
 
 import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.exception.NotAllCreatedException;
+import org.apache.hugegraph.rest.RestHeaders;
 import org.apache.hugegraph.rest.RestResult;
 import org.apache.hugegraph.structure.constant.Direction;
 import org.apache.hugegraph.structure.constant.HugeType;
@@ -32,8 +33,6 @@
 
 import com.google.common.collect.ImmutableMap;
 
-import jakarta.ws.rs.core.MultivaluedHashMap;
-
 public class EdgeAPI extends GraphAPI {
 
     public EdgeAPI(RestClient client, String graph) {
@@ -51,12 +50,9 @@ public Edge create(Edge edge) {
     }
 
     public List<String> create(List<Edge> edges, boolean checkVertex) {
-        MultivaluedHashMap<String, Object> headers = new MultivaluedHashMap<>();
-        headers.putSingle("Content-Encoding", BATCH_ENCODING);
-        Map<String, Object> params = ImmutableMap.of("check_vertex",
-                                                     checkVertex);
-        RestResult result = this.client.post(this.batchPath(), edges,
-                                             headers, params);
+        RestHeaders headers = new RestHeaders().add(RestHeaders.CONTENT_ENCODING, BATCH_ENCODING);
+        Map<String, Object> params = ImmutableMap.of("check_vertex", checkVertex);
+        RestResult result = this.client.post(this.batchPath(), edges, headers, params);
         List<String> ids = result.readList(String.class);
         if (edges.size() != ids.size()) {
             throw new NotAllCreatedException("Not all edges are successfully created, " +
@@ -68,10 +64,8 @@ public List<String> create(List<Edge> edges, boolean checkVertex) {
 
     public List<Edge> update(BatchEdgeRequest request) {
         this.client.checkApiVersion("0.45", "batch property update");
-        MultivaluedHashMap<String, Object> headers = new MultivaluedHashMap<>();
-        headers.putSingle("Content-Encoding", BATCH_ENCODING);
-        RestResult result = this.client.put(this.batchPath(), null,
-                                            request, headers);
+        RestHeaders headers = new RestHeaders().add(RestHeaders.CONTENT_ENCODING, BATCH_ENCODING);
+        RestResult result = this.client.put(this.batchPath(), null, request, headers);
         return result.readList(this.type(), Edge.class);
     }
 
@@ -98,11 +92,9 @@ public Edges list(int limit) {
         return this.list(null, null, null, null, 0, null, limit);
     }
 
-    public Edges list(Object vertexId, Direction direction,
-                      String label, Map<String, Object> properties,
-                      int offset, String page, int limit) {
-        return this.list(vertexId, direction, label, properties, false,
-                         offset, page, limit);
+    public Edges list(Object vertexId, Direction direction, String label,
+                      Map<String, Object> properties, int offset, String page, int limit) {
+        return this.list(vertexId, direction, label, properties, false, offset, page, limit);
     }
 
     public Edges list(Object vertexId, Direction direction, String label,

hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/GraphAPI.java

@@ -20,9 +20,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import org.glassfish.jersey.uri.UriComponent;
-import org.glassfish.jersey.uri.UriComponent.Type;
-
 import org.apache.hugegraph.api.API;
 import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.util.E;
@@ -61,25 +58,14 @@ public static String formatVertexId(Object id, boolean allowNull) {
             id = id.toString();
         }
         E.checkArgument(id instanceof String || id instanceof Number,
-                        "The vertex id must be either String or " +
-                        "Number, but got '%s'", id);
+                        "The vertex id must be either String or Number, but got '%s'", id);
         return (uuid ? "U" : "") + JsonUtil.toJson(id);
     }
 
     public static String formatProperties(Map<String, Object> properties) {
         if (properties == null) {
             return null;
         }
-        String json = JsonUtil.toJson(properties);
-        /*
-         * Don't use UrlEncoder.encode, it encoded the space as `+`,
-         * which will invalidate the jersey's automatic decoding
-         * because it considers the space to be encoded as `%2F`
-         */
-        return encode(json);
-    }
-
-    public static String encode(String raw) {
-        return UriComponent.encode(raw, Type.QUERY_PARAM_SPACE_ENCODED);
+        return JsonUtil.toJson(properties);
     }
 }

hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java

@@ -24,6 +24,8 @@
 import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.exception.InvalidResponseException;
 import org.apache.hugegraph.exception.NotAllCreatedException;
+import org.apache.hugegraph.rest.RestHeaders;
+import org.apache.hugegraph.rest.RestResult;
 import org.apache.hugegraph.structure.constant.HugeType;
 import org.apache.hugegraph.structure.graph.BatchOlapPropertyRequest;
 import org.apache.hugegraph.structure.graph.BatchVertexRequest;
@@ -32,10 +34,6 @@
 
 import com.google.common.collect.ImmutableMap;
 
-import jakarta.ws.rs.core.MultivaluedHashMap;
-
-import org.apache.hugegraph.rest.RestResult;
-
 public class VertexAPI extends GraphAPI {
 
     public VertexAPI(RestClient client, String graph) {
@@ -53,10 +51,8 @@
     }
 
     public List<Object> create(List<Vertex> vertices) {
-        MultivaluedHashMap<String, Object> headers = new MultivaluedHashMap<>();
-        headers.putSingle("Content-Encoding", BATCH_ENCODING);
-        RestResult result = this.client.post(this.batchPath(), vertices,
-                                             headers);
+        RestHeaders headers = new RestHeaders().add(RestHeaders.CONTENT_ENCODING, BATCH_ENCODING);
+        RestResult result = this.client.post(this.batchPath(), vertices, headers);
         List<Object> ids = result.readList(Object.class);
         if (vertices.size() != ids.size()) {
             throw new NotAllCreatedException("Not all vertices are successfully created, " +
@@ -68,17 +64,14 @@
 
     public List<Vertex> update(BatchVertexRequest request) {
         this.client.checkApiVersion("0.45", "batch property update");
-        MultivaluedHashMap<String, Object> headers = new MultivaluedHashMap<>();
-        headers.putSingle("Content-Encoding", BATCH_ENCODING);
-        RestResult result = this.client.put(this.batchPath(), null,
-                                            request, headers);
+        RestHeaders headers = new RestHeaders().add(RestHeaders.CONTENT_ENCODING, BATCH_ENCODING);
+        RestResult result = this.client.put(this.batchPath(), null, request, headers);
         return result.readList(this.type(), Vertex.class);
     }
 
     public int update(BatchOlapPropertyRequest request) {
         this.client.checkApiVersion("0.59", "olap property batch update");
-        MultivaluedHashMap<String, Object> headers = new MultivaluedHashMap<>();
-        headers.putSingle("Content-Encoding", BATCH_ENCODING);
+        RestHeaders headers = new RestHeaders().add(RestHeaders.CONTENT_ENCODING, BATCH_ENCODING);
         String path = String.join("/", this.path(), "olap/batch");
         RestResult result = this.client.put(path, null, request, headers);
         Object size = result.readObject(Map.class).get("size");

hugegraph-client/src/main/java/org/apache/hugegraph/api/graphs/GraphsAPI.java

@@ -20,15 +20,11 @@
 import java.util.List;
 import java.util.Map;
 
-import jakarta.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedHashMap;
-
 import org.apache.commons.lang3.StringUtils;
-
 import org.apache.hugegraph.api.API;
 import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.exception.InvalidResponseException;
+import org.apache.hugegraph.rest.RestHeaders;
 import org.apache.hugegraph.rest.RestResult;
 import org.apache.hugegraph.structure.constant.GraphMode;
 import org.apache.hugegraph.structure.constant.GraphReadMode;
@@ -42,7 +38,6 @@ public class GraphsAPI extends API {
     private static final String MODE = "mode";
     private static final String GRAPH_READ_MODE = "graph_read_mode";
     private static final String CLEAR = "clear";
-
     private static final String CONFIRM_MESSAGE = "confirm_message";
 
     public GraphsAPI(RestClient client) {
@@ -59,8 +54,7 @@ protected String type() {
     public Map<String, String> create(String name, String cloneGraphName,
                                       String configText) {
         this.client.checkApiVersion("0.67", "dynamic graph add");
-        MultivaluedHashMap<String, Object> headers = new MultivaluedHashMap<>();
-        headers.add(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN);
+        RestHeaders headers = new RestHeaders().add(RestHeaders.CONTENT_TYPE, "text/plain");
         Map<String, Object> params = null;
         if (StringUtils.isNotEmpty(cloneGraphName)) {
             params = ImmutableMap.of("clone_graph_name", cloneGraphName);
@@ -118,8 +112,7 @@ public void readMode(String graph, GraphReadMode readMode) {
         // NOTE: Must provide id for PUT. If use "graph/graph_read_mode", "/"
         // will be encoded to "%2F". So use "graph_read_mode" here although
         // inaccurate.
-        this.client.put(joinPath(this.path(), graph, GRAPH_READ_MODE),
-                        null, readMode);
+        this.client.put(joinPath(this.path(), graph, GRAPH_READ_MODE), null, readMode);
     }
 
     public GraphReadMode readMode(String graph) {

hugegraph-client/src/main/java/org/apache/hugegraph/client/RestClient.java

@@ -18,18 +18,18 @@
 package org.apache.hugegraph.client;
 
 import org.apache.hugegraph.exception.ServerException;
-import org.apache.hugegraph.serializer.PathDeserializer;
-import org.apache.hugegraph.structure.graph.Path;
 import org.apache.hugegraph.rest.AbstractRestClient;
 import org.apache.hugegraph.rest.ClientException;
 import org.apache.hugegraph.rest.RestResult;
+import org.apache.hugegraph.serializer.PathDeserializer;
+import org.apache.hugegraph.structure.graph.Path;
 import org.apache.hugegraph.util.E;
 import org.apache.hugegraph.util.VersionUtil;
 import org.apache.hugegraph.util.VersionUtil.Version;
 
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
-import jakarta.ws.rs.core.Response;
+import okhttp3.Response;
 
 public class RestClient extends AbstractRestClient {
 
@@ -43,8 +43,7 @@ public class RestClient extends AbstractRestClient {
         RestResult.registerModule(module);
     }
 
-    public RestClient(String url, String username, String password,
-                      int timeout) {
+    public RestClient(String url, String username, String password, int timeout) {
         super(url, username, password, timeout * SECOND);
     }
 
@@ -73,16 +72,15 @@ public void checkApiVersion(String minVersion, String message) {
     }
 
     public boolean apiVersionLt(String minVersion) {
-        String apiVersion = this.apiVersion == null ?
-                            null : this.apiVersion.get();
+        String apiVersion = this.apiVersion == null ? null : this.apiVersion.get();
         return apiVersion != null && !VersionUtil.gte(apiVersion, minVersion);
     }
 
     @Override
-    protected void checkStatus(Response response, Response.Status... statuses) {
+    protected void checkStatus(Response response, int... statuses) {
         boolean match = false;
-        for (Response.Status status : statuses) {
-            if (status.getStatusCode() == response.getStatus()) {
+        for (int status : statuses) {
+            if (status == response.code()) {
                 match = true;
                 break;
             }

hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java

@@ -19,14 +19,14 @@
 
 import java.io.Closeable;
 
-import org.apache.hugegraph.version.ClientVersion;
 import org.apache.hugegraph.client.RestClient;
-
 import org.apache.hugegraph.rest.ClientException;
 import org.apache.hugegraph.util.VersionUtil;
+import org.apache.hugegraph.version.ClientVersion;
 
-import jakarta.ws.rs.ProcessingException;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class HugeClient implements Closeable {
 
     static {
@@ -60,7 +60,8 @@
                                          builder.maxConnsPerRoute(),
                                          builder.trustStoreFile(),
                                          builder.trustStorePassword());
-        } catch (ProcessingException e) {
+        } catch (Exception e) {
+            log.error("", e);
             throw new ClientException("Failed to connect url '%s'", builder.url());
         }
         try {
@@ -109,7 +110,7 @@
 
     private void checkServerApiVersion() {
         VersionUtil.Version apiVersion = VersionUtil.Version.of(this.version.getApiVersion());
-        VersionUtil.check(apiVersion, "0.38", "0.70", "hugegraph-api in server");
+        VersionUtil.check(apiVersion, "0.38", "0.72", "hugegraph-api in server");
         this.client.apiVersion(apiVersion);
     }