adapt to org.apache package

.github/workflows/client-ci.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       TRAVIS_DIR: hugegraph-client/assembly/travis
-      COMMIT_ID: 8abf3d5524de3d3d5a97bbdce460a75652792b0d
+      COMMIT_ID: b1b12098feb726e46c781a2f171c77558db05fc1
     strategy:
       fail-fast: false
       matrix:

.github/workflows/loader-ci.yml

@@ -24,7 +24,7 @@ jobs:
     env:
       TRAVIS_DIR: hugegraph-loader/assembly/travis
       STATIC_DIR: hugegraph-loader/assembly/static
-      COMMIT_ID: 7621aa71d235374de61139915638c47eea3cdce2
+      COMMIT_ID: b1b12098feb726e46c781a2f171c77558db05fc1
       DB_USER: root
       DB_PASS: root
       DB_DATABASE: load_test

.github/workflows/tools-ci.yml

@@ -23,7 +23,7 @@ jobs:
     env:
       TRAVIS_DIR: hugegraph-tools/assembly/travis
       # TODO: could we use one param to unify it? or use a action template
-      COMMIT_ID: 8abf3d5524de3d3d5a97bbdce460a75652792b0d
+      COMMIT_ID: b1b12098feb726e46c781a2f171c77558db05fc1
     steps:
       - name: Install JDK 8
         uses: actions/setup-java@v3

assembly/static/conf/log4j2.xml

@@ -47,7 +47,7 @@
             <appender-ref ref="file"/>
         </logger>
 
-        <logger name="com.baidu.hugegraph" level="INFO" additivity="false">
+        <logger name="org.apache.hugegraph" level="INFO" additivity="false">
             <appender-ref ref="file"/>
         </logger>
     </loggers>

hugegraph-client/src/main/java/com/baidu/hugegraph/annotation/UnimplementedFeature.java → hugegraph-client/src/main/java/org/apache/hugegraph/annotation/UnimplementedFeature.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.annotation;
+package org.apache.hugegraph.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

hugegraph-client/src/main/java/com/baidu/hugegraph/api/API.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/API.java

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api;
+package org.apache.hugegraph.api;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.util.E;
 
 public abstract class API {

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java

@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.Access;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.Access;
+import org.apache.hugegraph.structure.constant.HugeType;
 
 public class AccessAPI extends AuthAPI {
 

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AuthAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/AuthAPI.java

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
-import com.baidu.hugegraph.api.API;
-import com.baidu.hugegraph.client.RestClient;
-import com.baidu.hugegraph.structure.auth.AuthElement;
+import org.apache.hugegraph.api.API;
+import org.apache.hugegraph.client.RestClient;
+import org.apache.hugegraph.structure.auth.AuthElement;
 
 public abstract class AuthAPI extends API {
 

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java

@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.Belong;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.Belong;
+import org.apache.hugegraph.structure.constant.HugeType;
 
 public class BelongAPI extends AuthAPI {
 

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.Group;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.Group;
+import org.apache.hugegraph.structure.constant.HugeType;
 import com.google.common.collect.ImmutableMap;
 
 public class GroupAPI extends AuthAPI {

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.Login;
-import com.baidu.hugegraph.structure.auth.LoginResult;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.Login;
+import org.apache.hugegraph.structure.auth.LoginResult;
+import org.apache.hugegraph.structure.constant.HugeType;
 
 public class LoginAPI extends AuthAPI {
 

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LogoutAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/LogoutAPI.java

@@ -17,10 +17,10 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
-import com.baidu.hugegraph.client.RestClient;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.client.RestClient;
+import org.apache.hugegraph.structure.constant.HugeType;
 import com.google.common.collect.ImmutableMap;
 
 public class LogoutAPI extends AuthAPI {

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java

@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.Project;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.Project;
+import org.apache.hugegraph.structure.constant.HugeType;
 import com.google.common.collect.ImmutableMap;
 
 public class ProjectAPI extends AuthAPI {

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java

@@ -17,15 +17,15 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.Target;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.Target;
+import org.apache.hugegraph.structure.constant.HugeType;
 import com.google.common.collect.ImmutableMap;
 
 public class TargetAPI extends AuthAPI {

hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TokenAPI.java → hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/TokenAPI.java

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.TokenPayload;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.TokenPayload;
+import org.apache.hugegraph.structure.constant.HugeType;
 
 public class TokenAPI extends AuthAPI {
 

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

@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.auth;
+package org.apache.hugegraph.api.auth;
 
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.auth.User;
-import com.baidu.hugegraph.structure.auth.User.UserRole;
-import com.baidu.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.auth.User;
+import org.apache.hugegraph.structure.auth.User.UserRole;
+import org.apache.hugegraph.structure.constant.HugeType;
 import com.google.common.collect.ImmutableMap;
 
 public class UserAPI extends AuthAPI {

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

@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.graph;
+package org.apache.hugegraph.api.graph;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
-import com.baidu.hugegraph.exception.NotAllCreatedException;
+import org.apache.hugegraph.client.RestClient;
+import org.apache.hugegraph.exception.NotAllCreatedException;
 import org.apache.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.structure.constant.Direction;
-import com.baidu.hugegraph.structure.constant.HugeType;
-import com.baidu.hugegraph.structure.graph.BatchEdgeRequest;
-import com.baidu.hugegraph.structure.graph.Edge;
-import com.baidu.hugegraph.structure.graph.Edges;
+import org.apache.hugegraph.structure.constant.Direction;
+import org.apache.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.graph.BatchEdgeRequest;
+import org.apache.hugegraph.structure.graph.Edge;
+import org.apache.hugegraph.structure.graph.Edges;
 import com.google.common.collect.ImmutableMap;
 import jakarta.ws.rs.core.MultivaluedHashMap;
 

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

@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.graph;
+package org.apache.hugegraph.api.graph;
 
 import java.util.Map;
 import java.util.UUID;
 
 import org.glassfish.jersey.uri.UriComponent;
 import org.glassfish.jersey.uri.UriComponent.Type;
 
-import com.baidu.hugegraph.api.API;
-import com.baidu.hugegraph.client.RestClient;
+import org.apache.hugegraph.api.API;
+import org.apache.hugegraph.client.RestClient;
 import org.apache.hugegraph.util.E;
-import com.baidu.hugegraph.util.JsonUtil;
+import org.apache.hugegraph.util.JsonUtil;
 
 public abstract class GraphAPI extends API {
 

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

@@ -17,20 +17,20 @@
  * under the License.
  */
 
-package com.baidu.hugegraph.api.graph;
+package org.apache.hugegraph.api.graph;
 
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.baidu.hugegraph.client.RestClient;
-import com.baidu.hugegraph.exception.InvalidResponseException;
-import com.baidu.hugegraph.exception.NotAllCreatedException;
-import com.baidu.hugegraph.structure.constant.HugeType;
-import com.baidu.hugegraph.structure.graph.BatchOlapPropertyRequest;
-import com.baidu.hugegraph.structure.graph.BatchVertexRequest;
-import com.baidu.hugegraph.structure.graph.Vertex;
-import com.baidu.hugegraph.structure.graph.Vertices;
+import org.apache.hugegraph.client.RestClient;
+import org.apache.hugegraph.exception.InvalidResponseException;
+import org.apache.hugegraph.exception.NotAllCreatedException;
+import org.apache.hugegraph.structure.constant.HugeType;
+import org.apache.hugegraph.structure.graph.BatchOlapPropertyRequest;
+import org.apache.hugegraph.structure.graph.BatchVertexRequest;
+import org.apache.hugegraph.structure.graph.Vertex;
+import org.apache.hugegraph.structure.graph.Vertices;
 import com.google.common.collect.ImmutableMap;
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import org.apache.hugegraph.rest.RestResult;
@@ -91,21 +91,21 @@ public int update(BatchOlapPropertyRequest request) {
     }
 
     public Vertex append(Vertex vertex) {
-        String id = GraphAPI.formatVertexId(vertex.id());
+        String id = formatVertexId(vertex.id());
         Map<String, Object> params = ImmutableMap.of("action", "append");
         RestResult result = this.client.put(this.path(), id, vertex, params);
         return result.readObject(Vertex.class);
     }
 
     public Vertex eliminate(Vertex vertex) {
-        String id = GraphAPI.formatVertexId(vertex.id());
+        String id = formatVertexId(vertex.id());
         Map<String, Object> params = ImmutableMap.of("action", "eliminate");
         RestResult result = this.client.put(this.path(), id, vertex, params);
         return result.readObject(Vertex.class);
     }
 
     public Vertex get(Object id) {
-        String vertexId = GraphAPI.formatVertexId(id);
+        String vertexId = formatVertexId(id);
         RestResult result = this.client.get(this.path(), vertexId);
         return result.readObject(Vertex.class);
     }
@@ -123,7 +123,7 @@ public Vertices list(String label, Map<String, Object> properties,
                          boolean keepP, int offset, String page, int limit) {
         checkOffset(offset);
         checkLimit(limit, "Limit");
-        String props = GraphAPI.formatProperties(properties);
+        String props = formatProperties(properties);
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("label", label);
         params.put("properties", props);
@@ -136,7 +136,7 @@ public Vertices list(String label, Map<String, Object> properties,
     }
 
     public void delete(Object id) {
-        String vertexId = GraphAPI.formatVertexId(id);
+        String vertexId = formatVertexId(id);
         this.client.delete(this.path(), vertexId);
     }
 }