diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml index 0442a7cf3..2a2143fda 100644 --- a/.github/workflows/client-ci.yml +++ b/.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: diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml index 08b0556a5..703e54c88 100644 --- a/.github/workflows/loader-ci.yml +++ b/.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 diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml index 910fd8ec7..e6edbbef9 100644 --- a/.github/workflows/tools-ci.yml +++ b/.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 diff --git a/assembly/static/conf/log4j2.xml b/assembly/static/conf/log4j2.xml index 47c2e639a..53758f36b 100644 --- a/assembly/static/conf/log4j2.xml +++ b/assembly/static/conf/log4j2.xml @@ -47,7 +47,7 @@ - + diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/annotation/UnimplementedFeature.java b/hugegraph-client/src/main/java/org/apache/hugegraph/annotation/UnimplementedFeature.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/annotation/UnimplementedFeature.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/annotation/UnimplementedFeature.java index a920beba9..8053eb44c 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/annotation/UnimplementedFeature.java +++ b/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; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/API.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/API.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/API.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/API.java index dba7660c6..23d1d988b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/API.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/AccessAPI.java index 28f3e4b26..16c681180 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AccessAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AuthAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/AuthAPI.java similarity index 89% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AuthAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/AuthAPI.java index 646c6b850..7d88e6940 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/AuthAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/BelongAPI.java index 3692114d4..306f5a860 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/BelongAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/GroupAPI.java index 7e40ad137..0853beab5 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/GroupAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java similarity index 83% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/LoginAPI.java index b3a64182d..738c78df7 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LoginAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LogoutAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/LogoutAPI.java similarity index 89% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LogoutAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/LogoutAPI.java index cd53f6b32..9b955f659 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/LogoutAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/ProjectAPI.java index 9ac208fc6..80db3a8e3 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/ProjectAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/TargetAPI.java index 63500863a..baf3f5712 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TargetAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TokenAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/TokenAPI.java similarity index 86% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TokenAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/TokenAPI.java index 2c160ecaa..7117fa8bb 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/TokenAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/auth/UserAPI.java index 823058284..fc36f5832 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/auth/UserAPI.java +++ b/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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java index f7a09e6f7..8b10c5462 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/EdgeAPI.java +++ b/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; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/GraphAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/GraphAPI.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/GraphAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/GraphAPI.java index 41e1aeae6..c7f2b287a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/GraphAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/GraphAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.graph; +package org.apache.hugegraph.api.graph; import java.util.Map; import java.util.UUID; @@ -25,10 +25,10 @@ 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 { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java similarity index 86% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/graph/VertexAPI.java index 9f878a3d5..cb1acf107 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graph/VertexAPI.java +++ b/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 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 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 properties, boolean keepP, int offset, String page, int limit) { checkOffset(offset); checkLimit(limit, "Limit"); - String props = GraphAPI.formatProperties(properties); + String props = formatProperties(properties); Map params = new LinkedHashMap<>(); params.put("label", label); params.put("properties", props); @@ -136,7 +136,7 @@ public Vertices list(String label, Map properties, } public void delete(Object id) { - String vertexId = GraphAPI.formatVertexId(id); + String vertexId = formatVertexId(id); this.client.delete(this.path(), vertexId); } } diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graphs/GraphsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/graphs/GraphsAPI.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/graphs/GraphsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/graphs/GraphsAPI.java index 0ced91bab..ac166ebc8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/graphs/GraphsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/graphs/GraphsAPI.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.graphs; +package org.apache.hugegraph.api.graphs; import java.util.List; import java.util.Map; @@ -27,13 +27,13 @@ import jakarta.ws.rs.core.MultivaluedHashMap; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.InvalidResponseException; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.exception.InvalidResponseException; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.GraphMode; -import com.baidu.hugegraph.structure.constant.GraphReadMode; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.structure.constant.GraphReadMode; +import org.apache.hugegraph.structure.constant.HugeType; import com.google.common.collect.ImmutableMap; public class GraphsAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/CypherAPI.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/CypherAPI.java index 856634de6..a6057ab12 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/CypherAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/CypherAPI.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; -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.rest.RestResult; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.gremlin.Response; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.gremlin.Response; public class CypherAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/GremlinAPI.java similarity index 84% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/GremlinAPI.java index 7af56fbaa..0d633a21b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/GremlinAPI.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; -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.rest.RestResult; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.gremlin.Response; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.gremlin.Response; public class GremlinAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/GremlinRequest.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/GremlinRequest.java index 8c6311b44..a673f407a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/gremlin/GremlinRequest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.gremlin; +package org.apache.hugegraph.api.gremlin; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.driver.GremlinManager; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.driver.GremlinManager; +import org.apache.hugegraph.structure.gremlin.ResultSet; import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/GremlinJobAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/job/GremlinJobAPI.java similarity index 88% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/GremlinJobAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/job/GremlinJobAPI.java index 01ec59378..304614d1d 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/GremlinJobAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/job/GremlinJobAPI.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.util.Map; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.gremlin.GremlinRequest; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; public class GremlinJobAPI extends JobAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/JobAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/job/JobAPI.java similarity index 87% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/JobAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/job/JobAPI.java index 6447759b1..f3489a791 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/JobAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/job/JobAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.structure.constant.HugeType; public abstract class JobAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/RebuildAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java similarity index 86% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/RebuildAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java index 5a22c2de6..72bb1d628 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/job/RebuildAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.job; +package org.apache.hugegraph.api.job; import java.util.Map; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; public class RebuildAPI extends JobAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java index 38bd70290..14ff18e84 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.api.metrics; +package org.apache.hugegraph.api.metrics; import java.util.Map; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.util.CommonUtil; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.util.CommonUtil; +import org.apache.hugegraph.structure.constant.HugeType; public class MetricsAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java index 8f4b284ba..889d009ec 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/EdgeLabelAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.schema.EdgeLabel; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java index abd9c50ba..7987966eb 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/IndexLabelAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.exception.NotSupportException; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.IndexType; -import com.baidu.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.IndexType; +import org.apache.hugegraph.structure.schema.IndexLabel; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java index 7c2bdca3d..43f3d2e49 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/PropertyKeyAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.exception.NotSupportException; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.WriteType; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.WriteType; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/SchemaAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java similarity index 86% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/SchemaAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java index 5502565ba..05c012ac3 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/SchemaAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/SchemaAPI.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.exception.NotSupportException; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.SchemaElement; public class SchemaAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/SchemaElementAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/SchemaElementAPI.java similarity index 86% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/SchemaElementAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/SchemaElementAPI.java index 2bc6135a8..9c9b10639 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/SchemaElementAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/SchemaElementAPI.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.structure.SchemaElement; public abstract class SchemaElementAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java index 953609df0..ca1494e6d 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/schema/VertexLabelAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.schema; +package org.apache.hugegraph.api.schema; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/task/TaskAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/task/TaskAPI.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/task/TaskAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/task/TaskAPI.java index afe0714e5..47dac80aa 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/task/TaskAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/task/TaskAPI.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.api.task; +package org.apache.hugegraph.api.task; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.util.TaskCache; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.ClientException; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.constant.HugeType; import org.apache.hugegraph.util.E; -import com.baidu.hugegraph.util.TaskCache; import com.google.common.collect.ImmutableMap; public class TaskAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/task/TasksWithPage.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/task/TasksWithPage.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/task/TasksWithPage.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/task/TasksWithPage.java index 93f09b434..a5a4b4a55 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/task/TasksWithPage.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/task/TasksWithPage.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.task; +package org.apache.hugegraph.api.task; import java.util.List; -import com.baidu.hugegraph.structure.Task; +import org.apache.hugegraph.structure.Task; import com.fasterxml.jackson.annotation.JsonProperty; public class TasksWithPage { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/AllShortestPathsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/AllShortestPathsAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/AllShortestPathsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/AllShortestPathsAPI.java index e1e751e51..504598c0e 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/AllShortestPathsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/AllShortestPathsAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; public class AllShortestPathsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CountAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CountAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CountAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CountAPI.java index 45bb1bd67..debcf7b14 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CountAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CountAPI.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; 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.traverser.CountRequest; +import org.apache.hugegraph.structure.traverser.CountRequest; import org.apache.hugegraph.util.E; public class CountAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CrosspointsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CrosspointsAPI.java similarity index 89% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CrosspointsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CrosspointsAPI.java index 3c9392ac6..c6d7eb36b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CrosspointsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CrosspointsAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; public class CrosspointsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CustomizedCrosspointsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CustomizedCrosspointsAPI.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CustomizedCrosspointsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CustomizedCrosspointsAPI.java index 7303744c1..03ea80d2c 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CustomizedCrosspointsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CustomizedCrosspointsAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.traverser.CrosspointsRequest; -import com.baidu.hugegraph.structure.traverser.CustomizedCrosspoints; +import org.apache.hugegraph.structure.traverser.CrosspointsRequest; +import org.apache.hugegraph.structure.traverser.CustomizedCrosspoints; public class CustomizedCrosspointsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CustomizedPathsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CustomizedPathsAPI.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CustomizedPathsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CustomizedPathsAPI.java index 2699aa9c8..5b9ce6c7f 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/CustomizedPathsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/CustomizedPathsAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; -import com.baidu.hugegraph.structure.traverser.CustomizedPathsRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.traverser.CustomizedPathsRequest; public class CustomizedPathsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/EdgesAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/EdgesAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/EdgesAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/EdgesAPI.java index 3964cb0f8..41d65fafe 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/EdgesAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/EdgesAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; 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.graph.Edge; -import com.baidu.hugegraph.structure.graph.Edges; -import com.baidu.hugegraph.structure.graph.Shard; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Edges; +import org.apache.hugegraph.structure.graph.Shard; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/FusiformSimilarityAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/FusiformSimilarityAPI.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/FusiformSimilarityAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/FusiformSimilarityAPI.java index c10752b57..7b3738e9b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/FusiformSimilarityAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/FusiformSimilarityAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarity; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarityRequest; +import org.apache.hugegraph.structure.traverser.FusiformSimilarity; +import org.apache.hugegraph.structure.traverser.FusiformSimilarityRequest; public class FusiformSimilarityAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/JaccardSimilarityAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/JaccardSimilarityAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/JaccardSimilarityAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/JaccardSimilarityAPI.java index c733e8b52..9139a491e 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/JaccardSimilarityAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/JaccardSimilarityAPI.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.traverser.SingleSourceJaccardSimilarityRequest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.traverser.SingleSourceJaccardSimilarityRequest; import org.apache.hugegraph.util.E; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/KneighborAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/KneighborAPI.java similarity index 87% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/KneighborAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/KneighborAPI.java index 557ac84e8..3c219e3cc 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/KneighborAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/KneighborAPI.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.traverser.Kneighbor; -import com.baidu.hugegraph.structure.traverser.KneighborRequest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.traverser.Kneighbor; +import org.apache.hugegraph.structure.traverser.KneighborRequest; public class KneighborAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/KoutAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/KoutAPI.java similarity index 88% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/KoutAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/KoutAPI.java index 8184e4080..1652305c8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/KoutAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/KoutAPI.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.traverser.Kout; -import com.baidu.hugegraph.structure.traverser.KoutRequest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.traverser.Kout; +import org.apache.hugegraph.structure.traverser.KoutRequest; public class KoutAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/MultiNodeShortestPathAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/MultiNodeShortestPathAPI.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/MultiNodeShortestPathAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/MultiNodeShortestPathAPI.java index 76190af76..afb6d2b05 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/MultiNodeShortestPathAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/MultiNodeShortestPathAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.traverser.MultiNodeShortestPathRequest; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.traverser.MultiNodeShortestPathRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; public class MultiNodeShortestPathAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/NeighborRankAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/NeighborRankAPI.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/NeighborRankAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/NeighborRankAPI.java index 736c30ae4..27c856831 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/NeighborRankAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/NeighborRankAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.Traverser; -import com.baidu.hugegraph.structure.traverser.Ranks; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.structure.traverser.Ranks; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/PathsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/PathsAPI.java similarity index 86% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/PathsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/PathsAPI.java index d69addbf1..e8b576d21 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/PathsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/PathsAPI.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.traverser.PathsRequest; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.traverser.PathsRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; public class PathsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/PersonalRankAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/PersonalRankAPI.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/PersonalRankAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/PersonalRankAPI.java index 016633222..f20bbfcec 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/PersonalRankAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/PersonalRankAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Traverser; -import com.baidu.hugegraph.structure.traverser.Ranks; +import org.apache.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.structure.traverser.Ranks; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/RaysAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/RaysAPI.java similarity index 89% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/RaysAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/RaysAPI.java index 989f04de3..3412d126e 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/RaysAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/RaysAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; public class RaysAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/RingsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/RingsAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/RingsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/RingsAPI.java index f175066bd..754b6ff77 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/RingsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/RingsAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; public class RingsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/SameNeighborsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/SameNeighborsAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/SameNeighborsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/SameNeighborsAPI.java index fd0dac400..f586272ef 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/SameNeighborsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/SameNeighborsAPI.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Direction; public class SameNeighborsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/ShortestPathAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/ShortestPathAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/ShortestPathAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/ShortestPathAPI.java index 0864aac2b..b5b0be156 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/ShortestPathAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/ShortestPathAPI.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; public class ShortestPathAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/SingleSourceShortestPathAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/SingleSourceShortestPathAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/SingleSourceShortestPathAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/SingleSourceShortestPathAPI.java index d35d61b4f..cdbc22046 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/SingleSourceShortestPathAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/SingleSourceShortestPathAPI.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.traverser.WeightedPaths; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.traverser.WeightedPaths; import org.apache.hugegraph.util.E; public class SingleSourceShortestPathAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/TemplatePathsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/TemplatePathsAPI.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/TemplatePathsAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/TemplatePathsAPI.java index 7b51bbc7c..777120457 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/TemplatePathsAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/TemplatePathsAPI.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; -import com.baidu.hugegraph.structure.traverser.TemplatePathsRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.traverser.TemplatePathsRequest; public class TemplatePathsAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/TraversersAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/TraversersAPI.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/TraversersAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/TraversersAPI.java index a360b5ef1..deaee496a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/TraversersAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/TraversersAPI.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -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; public class TraversersAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/VerticesAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/VerticesAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/VerticesAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/VerticesAPI.java index da2a800c3..be1eb195b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/VerticesAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/VerticesAPI.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.graph.Shard; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.graph.Vertices; +import org.apache.hugegraph.structure.graph.Shard; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertices; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/WeightedShortestPathAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/WeightedShortestPathAPI.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/WeightedShortestPathAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/WeightedShortestPathAPI.java index 3d51a366c..7d4ee418a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/traverser/WeightedShortestPathAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/traverser/WeightedShortestPathAPI.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.LinkedHashMap; import java.util.Map; -import com.baidu.hugegraph.api.graph.GraphAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.graph.GraphAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.traverser.WeightedPath; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.traverser.WeightedPath; import org.apache.hugegraph.util.E; public class WeightedShortestPathAPI extends TraversersAPI { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/variables/VariablesAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/variables/VariablesAPI.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/variables/VariablesAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/variables/VariablesAPI.java index 22fc4ec0f..51216e4cb 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/variables/VariablesAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/variables/VariablesAPI.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api.variables; +package org.apache.hugegraph.api.variables; import java.util.Map; -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.rest.RestResult; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.HugeType; import com.google.common.collect.ImmutableMap; public class VariablesAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/version/VersionAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/version/VersionAPI.java similarity index 84% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/api/version/VersionAPI.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/api/version/VersionAPI.java index 729a23f04..c4b595b63 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/api/version/VersionAPI.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/api/version/VersionAPI.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api.version; +package org.apache.hugegraph.api.version; -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.rest.RestResult; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.version.Versions; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.version.Versions; public class VersionAPI extends API { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/client/RestClient.java b/hugegraph-client/src/main/java/org/apache/hugegraph/client/RestClient.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/client/RestClient.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/client/RestClient.java index 3ca04e9fb..7fd1fa8da 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/client/RestClient.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/client/RestClient.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.client; +package org.apache.hugegraph.client; -import com.baidu.hugegraph.exception.ServerException; +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 com.baidu.hugegraph.serializer.PathDeserializer; -import com.baidu.hugegraph.structure.graph.Path; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.VersionUtil; import org.apache.hugegraph.util.VersionUtil.Version; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/AuthManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/AuthManager.java similarity index 87% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/AuthManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/AuthManager.java index 356d1a438..c9afdf4df 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/AuthManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/AuthManager.java @@ -17,33 +17,32 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.util.List; import java.util.Set; import org.apache.commons.collections.CollectionUtils; -import com.baidu.hugegraph.api.auth.AccessAPI; -import com.baidu.hugegraph.api.auth.BelongAPI; -import com.baidu.hugegraph.api.auth.GroupAPI; -import com.baidu.hugegraph.api.auth.LoginAPI; -import com.baidu.hugegraph.api.auth.LogoutAPI; -import com.baidu.hugegraph.api.auth.ProjectAPI; -import com.baidu.hugegraph.api.auth.TargetAPI; -import com.baidu.hugegraph.api.auth.TokenAPI; -import com.baidu.hugegraph.api.auth.UserAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.auth.Access; -import com.baidu.hugegraph.structure.auth.Belong; -import com.baidu.hugegraph.structure.auth.Group; -import com.baidu.hugegraph.structure.auth.Login; -import com.baidu.hugegraph.structure.auth.LoginResult; -import com.baidu.hugegraph.structure.auth.Project; -import com.baidu.hugegraph.structure.auth.Target; -import com.baidu.hugegraph.structure.auth.TokenPayload; -import com.baidu.hugegraph.structure.auth.User; -import com.baidu.hugegraph.structure.auth.User.UserRole; +import org.apache.hugegraph.api.auth.AccessAPI; +import org.apache.hugegraph.api.auth.BelongAPI; +import org.apache.hugegraph.api.auth.GroupAPI; +import org.apache.hugegraph.api.auth.LoginAPI; +import org.apache.hugegraph.api.auth.LogoutAPI; +import org.apache.hugegraph.api.auth.ProjectAPI; +import org.apache.hugegraph.api.auth.TargetAPI; +import org.apache.hugegraph.api.auth.TokenAPI; +import org.apache.hugegraph.api.auth.UserAPI; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.structure.auth.Access; +import org.apache.hugegraph.structure.auth.Belong; +import org.apache.hugegraph.structure.auth.Group; +import org.apache.hugegraph.structure.auth.Login; +import org.apache.hugegraph.structure.auth.LoginResult; +import org.apache.hugegraph.structure.auth.Project; +import org.apache.hugegraph.structure.auth.Target; +import org.apache.hugegraph.structure.auth.TokenPayload; +import org.apache.hugegraph.structure.auth.User; public class AuthManager { @@ -129,7 +128,7 @@ public User getUser(Object id) { return this.userAPI.get(id); } - public UserRole getUserRole(Object id) { + public User.UserRole getUserRole(Object id) { return this.userAPI.getUserRole(id); } diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/CypherManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/CypherManager.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/CypherManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/CypherManager.java index a39333ce4..3a1430408 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/CypherManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/CypherManager.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; -import com.baidu.hugegraph.api.gremlin.CypherAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.gremlin.Response; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.api.gremlin.CypherAPI; +import org.apache.hugegraph.structure.gremlin.Response; +import org.apache.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.client.RestClient; public class CypherManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GraphManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphManager.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GraphManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphManager.java index 6c0738188..4604acad2 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GraphManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphManager.java @@ -17,26 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.util.Iterator; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.annotation.UnimplementedFeature; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.InvalidOperationException; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.BatchEdgeRequest; -import com.baidu.hugegraph.structure.graph.BatchOlapPropertyRequest; -import com.baidu.hugegraph.structure.graph.BatchVertexRequest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.GraphIterator; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.annotation.UnimplementedFeature; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.structure.graph.BatchEdgeRequest; +import org.apache.hugegraph.structure.graph.BatchOlapPropertyRequest; +import org.apache.hugegraph.structure.graph.BatchVertexRequest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.GraphIterator; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.util.E; public class GraphManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GraphsManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphsManager.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GraphsManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphsManager.java index bbb933ad3..4ab896313 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GraphsManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/GraphsManager.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.graphs.GraphsAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.constant.GraphMode; -import com.baidu.hugegraph.structure.constant.GraphReadMode; +import org.apache.hugegraph.api.graphs.GraphsAPI; +import org.apache.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.structure.constant.GraphReadMode; +import org.apache.hugegraph.client.RestClient; public class GraphsManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GremlinManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/GremlinManager.java similarity index 85% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GremlinManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/GremlinManager.java index e52d1ae89..cc4685135 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/GremlinManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/GremlinManager.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; -import com.baidu.hugegraph.api.gremlin.GremlinAPI; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; -import com.baidu.hugegraph.api.job.GremlinJobAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.gremlin.Response; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.api.gremlin.GremlinAPI; +import org.apache.hugegraph.api.gremlin.GremlinRequest; +import org.apache.hugegraph.api.job.GremlinJobAPI; +import org.apache.hugegraph.structure.gremlin.Response; +import org.apache.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.client.RestClient; public class GremlinManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClient.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClient.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java index 3ce73e29f..887a1086b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClient.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClient.java @@ -17,17 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.io.Closeable; -import com.baidu.hugegraph.client.RestClient; +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 com.baidu.hugegraph.version.ClientVersion; - import jakarta.ws.rs.ProcessingException; public class HugeClient implements Closeable { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClientBuilder.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClientBuilder.java similarity index 99% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClientBuilder.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClientBuilder.java index 6fefb3066..93bd98012 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/HugeClientBuilder.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/HugeClientBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import org.apache.hugegraph.util.E; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/JobManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/JobManager.java similarity index 79% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/JobManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/JobManager.java index 7fb440cfc..fbce5414a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/JobManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/JobManager.java @@ -17,16 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; -import com.baidu.hugegraph.api.job.RebuildAPI; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.VertexLabel; - -import static com.baidu.hugegraph.api.task.TaskAPI.TASK_TIMEOUT; +import org.apache.hugegraph.api.job.RebuildAPI; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.client.RestClient; public class JobManager { @@ -39,7 +37,7 @@ public JobManager(RestClient client, String graph) { } public void rebuild(VertexLabel vertexLabel) { - this.rebuild(vertexLabel, TASK_TIMEOUT); + this.rebuild(vertexLabel, TaskAPI.TASK_TIMEOUT); } public void rebuild(VertexLabel vertexLabel, long seconds) { @@ -52,7 +50,7 @@ public long rebuildAsync(VertexLabel vertexLabel) { } public void rebuild(EdgeLabel edgeLabel) { - this.rebuild(edgeLabel, TASK_TIMEOUT); + this.rebuild(edgeLabel, TaskAPI.TASK_TIMEOUT); } public void rebuild(EdgeLabel edgeLabel, long seconds) { @@ -65,7 +63,7 @@ public long rebuildAsync(EdgeLabel edgeLabel) { } public void rebuild(IndexLabel indexLabel) { - this.rebuild(indexLabel, TASK_TIMEOUT); + this.rebuild(indexLabel, TaskAPI.TASK_TIMEOUT); } public void rebuild(IndexLabel indexLabel, long seconds) { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/MetricsManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/MetricsManager.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/MetricsManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/MetricsManager.java index 474fa2d31..3df1963f1 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/MetricsManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/MetricsManager.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.util.Map; -import com.baidu.hugegraph.api.metrics.MetricsAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.metrics.MetricsAPI; +import org.apache.hugegraph.client.RestClient; public class MetricsManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/SchemaManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/SchemaManager.java similarity index 87% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/SchemaManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/SchemaManager.java index cee6f5d17..15badda6c 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/SchemaManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/SchemaManager.java @@ -17,26 +17,24 @@ * under the License. */ -package com.baidu.hugegraph.driver; - -import static com.baidu.hugegraph.api.task.TaskAPI.TASK_TIMEOUT; +package org.apache.hugegraph.driver; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.schema.EdgeLabelAPI; -import com.baidu.hugegraph.api.schema.IndexLabelAPI; -import com.baidu.hugegraph.api.schema.PropertyKeyAPI; -import com.baidu.hugegraph.api.schema.SchemaAPI; -import com.baidu.hugegraph.api.schema.VertexLabelAPI; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.schema.BuilderProxy; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.api.schema.EdgeLabelAPI; +import org.apache.hugegraph.api.schema.IndexLabelAPI; +import org.apache.hugegraph.api.schema.PropertyKeyAPI; +import org.apache.hugegraph.api.schema.SchemaAPI; +import org.apache.hugegraph.api.schema.VertexLabelAPI; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.structure.schema.BuilderProxy; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; public class SchemaManager { @@ -81,7 +79,7 @@ public IndexLabel.Builder indexLabel(String name) { } public PropertyKey addPropertyKey(PropertyKey propertyKey) { - return this.addPropertyKey(propertyKey, TASK_TIMEOUT); + return this.addPropertyKey(propertyKey, TaskAPI.TASK_TIMEOUT); } public PropertyKey addPropertyKey(PropertyKey propertyKey, long seconds) { @@ -108,7 +106,7 @@ public PropertyKey eliminatePropertyKey(PropertyKey propertyKey) { } public PropertyKey clearPropertyKey(PropertyKey propertyKey) { - return this.clearPropertyKey(propertyKey, TASK_TIMEOUT); + return this.clearPropertyKey(propertyKey, TaskAPI.TASK_TIMEOUT); } public PropertyKey clearPropertyKey(PropertyKey propertyKey, long seconds) { @@ -127,7 +125,7 @@ public long clearPropertyKeyAsync(PropertyKey propertyKey) { } public void removePropertyKey(String name) { - this.removePropertyKey(name, TASK_TIMEOUT); + this.removePropertyKey(name, TaskAPI.TASK_TIMEOUT); } public void removePropertyKey(String name, long seconds) { @@ -165,7 +163,7 @@ public VertexLabel eliminateVertexLabel(VertexLabel vertexLabel) { public void removeVertexLabel(String name) { long task = this.vertexLabelAPI.delete(name); - this.taskAPI.waitUntilTaskSuccess(task, TASK_TIMEOUT); + this.taskAPI.waitUntilTaskSuccess(task, TaskAPI.TASK_TIMEOUT); } public void removeVertexLabel(String name, long seconds) { @@ -202,7 +200,7 @@ public EdgeLabel eliminateEdgeLabel(EdgeLabel edgeLabel) { } public void removeEdgeLabel(String name) { - this.removeEdgeLabel(name, TASK_TIMEOUT); + this.removeEdgeLabel(name, TaskAPI.TASK_TIMEOUT); } public void removeEdgeLabel(String name, long seconds) { @@ -227,7 +225,7 @@ public List getEdgeLabels(List names) { } public IndexLabel addIndexLabel(IndexLabel indexLabel) { - return this.addIndexLabel(indexLabel, TASK_TIMEOUT); + return this.addIndexLabel(indexLabel, TaskAPI.TASK_TIMEOUT); } public IndexLabel addIndexLabel(IndexLabel indexLabel, long seconds) { @@ -254,7 +252,7 @@ public IndexLabel eliminateIndexLabel(IndexLabel indexLabel) { } public void removeIndexLabel(String name) { - this.removeIndexLabel(name, TASK_TIMEOUT); + this.removeIndexLabel(name, TaskAPI.TASK_TIMEOUT); } public void removeIndexLabel(String name, long secondss) { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/TaskManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/TaskManager.java similarity index 89% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/TaskManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/TaskManager.java index 982bd77fa..40c9f73c8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/TaskManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/TaskManager.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.util.List; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.api.task.TasksWithPage; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.Task; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.api.task.TasksWithPage; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.client.RestClient; public class TaskManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/TraverserManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/TraverserManager.java similarity index 80% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/TraverserManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/TraverserManager.java index 1fa96bfa6..fa79d637e 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/TraverserManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/TraverserManager.java @@ -17,69 +17,64 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; import java.util.Iterator; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.traverser.AllShortestPathsAPI; -import com.baidu.hugegraph.api.traverser.CountAPI; -import com.baidu.hugegraph.api.traverser.CrosspointsAPI; -import com.baidu.hugegraph.api.traverser.CustomizedCrosspointsAPI; -import com.baidu.hugegraph.api.traverser.CustomizedPathsAPI; -import com.baidu.hugegraph.api.traverser.EdgesAPI; -import com.baidu.hugegraph.api.traverser.FusiformSimilarityAPI; -import com.baidu.hugegraph.api.traverser.JaccardSimilarityAPI; -import com.baidu.hugegraph.api.traverser.KneighborAPI; -import com.baidu.hugegraph.api.traverser.KoutAPI; -import com.baidu.hugegraph.api.traverser.MultiNodeShortestPathAPI; -import com.baidu.hugegraph.api.traverser.NeighborRankAPI; -import com.baidu.hugegraph.api.traverser.PathsAPI; -import com.baidu.hugegraph.api.traverser.PersonalRankAPI; -import com.baidu.hugegraph.api.traverser.RaysAPI; -import com.baidu.hugegraph.api.traverser.RingsAPI; -import com.baidu.hugegraph.api.traverser.SameNeighborsAPI; -import com.baidu.hugegraph.api.traverser.ShortestPathAPI; -import com.baidu.hugegraph.api.traverser.SingleSourceShortestPathAPI; -import com.baidu.hugegraph.api.traverser.TemplatePathsAPI; -import com.baidu.hugegraph.api.traverser.VerticesAPI; -import com.baidu.hugegraph.api.traverser.WeightedShortestPathAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Edges; -import com.baidu.hugegraph.structure.graph.GraphIterator; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Shard; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.graph.Vertices; -import com.baidu.hugegraph.structure.traverser.CountRequest; -import com.baidu.hugegraph.structure.traverser.CrosspointsRequest; -import com.baidu.hugegraph.structure.traverser.CustomizedCrosspoints; -import com.baidu.hugegraph.structure.traverser.MultiNodeShortestPathRequest; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarity; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarityRequest; -import com.baidu.hugegraph.structure.traverser.SingleSourceJaccardSimilarityRequest; -import com.baidu.hugegraph.structure.traverser.Kneighbor; -import com.baidu.hugegraph.structure.traverser.KneighborRequest; -import com.baidu.hugegraph.structure.traverser.Kout; -import com.baidu.hugegraph.structure.traverser.KoutRequest; -import com.baidu.hugegraph.structure.traverser.CustomizedPathsRequest; -import com.baidu.hugegraph.structure.traverser.PathsRequest; -import com.baidu.hugegraph.structure.traverser.Ranks; -import com.baidu.hugegraph.structure.traverser.TemplatePathsRequest; -import com.baidu.hugegraph.structure.traverser.WeightedPath; -import com.baidu.hugegraph.structure.traverser.WeightedPaths; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.AllShortestPathsAPI; +import org.apache.hugegraph.api.traverser.CountAPI; +import org.apache.hugegraph.api.traverser.CrosspointsAPI; +import org.apache.hugegraph.api.traverser.CustomizedCrosspointsAPI; +import org.apache.hugegraph.api.traverser.CustomizedPathsAPI; +import org.apache.hugegraph.api.traverser.EdgesAPI; +import org.apache.hugegraph.api.traverser.FusiformSimilarityAPI; +import org.apache.hugegraph.api.traverser.JaccardSimilarityAPI; +import org.apache.hugegraph.api.traverser.KneighborAPI; +import org.apache.hugegraph.api.traverser.KoutAPI; +import org.apache.hugegraph.api.traverser.MultiNodeShortestPathAPI; +import org.apache.hugegraph.api.traverser.NeighborRankAPI; +import org.apache.hugegraph.api.traverser.PathsAPI; +import org.apache.hugegraph.api.traverser.PersonalRankAPI; +import org.apache.hugegraph.api.traverser.RaysAPI; +import org.apache.hugegraph.api.traverser.RingsAPI; +import org.apache.hugegraph.api.traverser.SameNeighborsAPI; +import org.apache.hugegraph.api.traverser.ShortestPathAPI; +import org.apache.hugegraph.api.traverser.SingleSourceShortestPathAPI; +import org.apache.hugegraph.api.traverser.TemplatePathsAPI; +import org.apache.hugegraph.api.traverser.VerticesAPI; +import org.apache.hugegraph.api.traverser.WeightedShortestPathAPI; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Edges; +import org.apache.hugegraph.structure.graph.GraphIterator; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Shard; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertices; +import org.apache.hugegraph.structure.traverser.CountRequest; +import org.apache.hugegraph.structure.traverser.CrosspointsRequest; +import org.apache.hugegraph.structure.traverser.CustomizedCrosspoints; +import org.apache.hugegraph.structure.traverser.MultiNodeShortestPathRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.traverser.FusiformSimilarity; +import org.apache.hugegraph.structure.traverser.FusiformSimilarityRequest; +import org.apache.hugegraph.structure.traverser.SingleSourceJaccardSimilarityRequest; +import org.apache.hugegraph.structure.traverser.Kneighbor; +import org.apache.hugegraph.structure.traverser.KneighborRequest; +import org.apache.hugegraph.structure.traverser.Kout; +import org.apache.hugegraph.structure.traverser.KoutRequest; +import org.apache.hugegraph.structure.traverser.CustomizedPathsRequest; +import org.apache.hugegraph.structure.traverser.PathsRequest; +import org.apache.hugegraph.structure.traverser.Ranks; +import org.apache.hugegraph.structure.traverser.TemplatePathsRequest; +import org.apache.hugegraph.structure.traverser.WeightedPath; +import org.apache.hugegraph.structure.traverser.WeightedPaths; import org.apache.hugegraph.util.E; -import static com.baidu.hugegraph.structure.constant.Traverser.DEFAULT_CAPACITY; -import static com.baidu.hugegraph.structure.constant.Traverser.DEFAULT_MAX_DEGREE; -import static com.baidu.hugegraph.structure.constant.Traverser.DEFAULT_ELEMENTS_LIMIT; -import static com.baidu.hugegraph.structure.constant.Traverser.DEFAULT_PAGE_LIMIT; -import static com.baidu.hugegraph.structure.constant.Traverser.DEFAULT_PATHS_LIMIT; - public class TraverserManager { private final GraphManager graphManager; @@ -138,7 +133,7 @@ public TraverserManager(RestClient client, GraphManager graphManager) { } public double jaccardSimilarity(Object vertexId, Object otherId) { - return this.jaccardSimilarity(vertexId, otherId, DEFAULT_MAX_DEGREE); + return this.jaccardSimilarity(vertexId, otherId, Traverser.DEFAULT_MAX_DEGREE); } public double jaccardSimilarity(Object vertexId, Object otherId, @@ -160,7 +155,7 @@ public Map jaccardSimilarity( } public List sameNeighbors(Object vertexId, Object otherId) { - return this.sameNeighbors(vertexId, otherId, DEFAULT_MAX_DEGREE); + return this.sameNeighbors(vertexId, otherId, Traverser.DEFAULT_MAX_DEGREE); } public List sameNeighbors(Object vertexId, Object otherId, @@ -173,7 +168,7 @@ public List sameNeighbors(Object vertexId, Object otherId, Direction direction, String label, long degree) { return this.sameNeighbors(vertexId, otherId, direction, label, - degree, DEFAULT_PATHS_LIMIT); + degree, Traverser.DEFAULT_PATHS_LIMIT); } public List sameNeighbors(Object vertexId, Object otherId, @@ -197,7 +192,7 @@ public Path shortestPath(Object sourceId, Object targetId, public Path shortestPath(Object sourceId, Object targetId, Direction direction, String label, int maxDepth) { return this.shortestPath(sourceId, targetId, direction, label, maxDepth, - DEFAULT_MAX_DEGREE, DEFAULT_CAPACITY); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_CAPACITY); } public Path shortestPath(Object sourceId, Object targetId, @@ -230,8 +225,8 @@ public List allShortestPaths(Object sourceId, Object targetId, Direction direction, String label, int maxDepth) { return this.allShortestPaths(sourceId, targetId, direction, - label, maxDepth, DEFAULT_MAX_DEGREE, - DEFAULT_CAPACITY); + label, maxDepth, Traverser.DEFAULT_MAX_DEGREE, + Traverser.DEFAULT_CAPACITY); } public List allShortestPaths(Object sourceId, Object targetId, @@ -263,9 +258,9 @@ public WeightedPaths singleSourceShortestPath(Object sourceId, String label, String weight, boolean withVertex) { return this.singleSourceShortestPath(sourceId, direction, label, weight, - DEFAULT_MAX_DEGREE, 0L, - DEFAULT_CAPACITY, - DEFAULT_PATHS_LIMIT, withVertex); + Traverser.DEFAULT_MAX_DEGREE, 0L, + Traverser.DEFAULT_CAPACITY, + Traverser.DEFAULT_PATHS_LIMIT, withVertex); } public WeightedPaths singleSourceShortestPath(Object sourceId, @@ -280,7 +275,7 @@ public WeightedPaths singleSourceShortestPath(Object sourceId, withVertex); } - public WeightedPath weightedShortestPath(Object sourceId, Object targetId, + public WeightedPath weightedShortestPath(Object sourceId, Object targetId, String weight, boolean withVertex) { return this.weightedShortestPath(sourceId, targetId, Direction.BOTH, null, weight, withVertex); @@ -291,8 +286,8 @@ public WeightedPath weightedShortestPath(Object sourceId, Object targetId, String weight, boolean withVertex) { return this.weightedShortestPath(sourceId, targetId, direction, label, - weight, DEFAULT_MAX_DEGREE, 0L, - DEFAULT_CAPACITY, withVertex); + weight, Traverser.DEFAULT_MAX_DEGREE, 0L, + Traverser.DEFAULT_CAPACITY, withVertex); } public WeightedPath weightedShortestPath(Object sourceId, Object targetId, @@ -313,7 +308,7 @@ public PathsWithVertices multiNodeShortestPath( public List paths(Object sourceId, Object targetId, int maxDepth) { return this.paths(sourceId, targetId, Direction.BOTH, null, - maxDepth, DEFAULT_PATHS_LIMIT); + maxDepth, Traverser.DEFAULT_PATHS_LIMIT); } public List paths(Object sourceId, Object targetId, @@ -326,7 +321,7 @@ public List paths(Object sourceId, Object targetId, Direction direction, String label, int maxDepth, int limit) { return this.paths(sourceId, targetId, direction, label, maxDepth, - DEFAULT_MAX_DEGREE, DEFAULT_CAPACITY, limit); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_CAPACITY, limit); } public List paths(Object sourceId, Object targetId, @@ -343,7 +338,7 @@ public PathsWithVertices paths(PathsRequest request) { public List crosspoint(Object sourceId, Object targetId, int maxDepth) { return this.crosspoint(sourceId, targetId, Direction.BOTH, null, - maxDepth, DEFAULT_PATHS_LIMIT); + maxDepth, Traverser.DEFAULT_PATHS_LIMIT); } public List crosspoint(Object sourceId, Object targetId, @@ -357,7 +352,7 @@ public List crosspoint(Object sourceId, Object targetId, Direction direction, String label, int maxDepth, int limit) { return this.crosspoint(sourceId, targetId, direction, label, maxDepth, - DEFAULT_MAX_DEGREE, DEFAULT_CAPACITY, limit); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_CAPACITY, limit); } public List crosspoint(Object sourceId, Object targetId, @@ -379,8 +374,8 @@ public List kout(Object sourceId, Direction direction, int depth) { public List kout(Object sourceId, Direction direction, String label, int depth, boolean nearest) { return this.kout(sourceId, direction, label, depth, nearest, - DEFAULT_MAX_DEGREE, DEFAULT_CAPACITY, - DEFAULT_ELEMENTS_LIMIT); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_CAPACITY, + Traverser.DEFAULT_ELEMENTS_LIMIT); } public List kout(Object sourceId, Direction direction, @@ -406,7 +401,7 @@ public List kneighbor(Object sourceId, Direction direction, public List kneighbor(Object sourceId, Direction direction, String label, int depth) { return this.kneighbor(sourceId, direction, label, depth, - DEFAULT_MAX_DEGREE, DEFAULT_ELEMENTS_LIMIT); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_ELEMENTS_LIMIT); } public List kneighbor(Object sourceId, Direction direction, @@ -426,8 +421,8 @@ public long count(CountRequest request) { public List rings(Object sourceId, int depth) { return this.rings(sourceId, Direction.BOTH, null, depth, true, - DEFAULT_MAX_DEGREE, DEFAULT_CAPACITY, - DEFAULT_ELEMENTS_LIMIT); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_CAPACITY, + Traverser.DEFAULT_ELEMENTS_LIMIT); } public List rings(Object sourceId, Direction direction, String label, @@ -439,8 +434,8 @@ public List rings(Object sourceId, Direction direction, String label, public List rays(Object sourceId, int depth) { return this.rays(sourceId, Direction.BOTH, null, depth, - DEFAULT_MAX_DEGREE, DEFAULT_CAPACITY, - DEFAULT_ELEMENTS_LIMIT); + Traverser.DEFAULT_MAX_DEGREE, Traverser.DEFAULT_CAPACITY, + Traverser.DEFAULT_ELEMENTS_LIMIT); } public List rays(Object sourceId, Direction direction, String label, @@ -500,7 +495,7 @@ public Vertices vertices(Shard shard) { public Vertices vertices(Shard shard, String page) { E.checkArgument(page != null, "Page can't be null"); - return this.vertices(shard, page, DEFAULT_PAGE_LIMIT); + return this.vertices(shard, page, Traverser.DEFAULT_PAGE_LIMIT); } public Vertices vertices(Shard shard, String page, long pageLimit) { @@ -537,7 +532,7 @@ public Edges edges(Shard shard) { public Edges edges(Shard shard, String page) { E.checkArgument(page != null, "Page can't be null"); - return this.edges(shard, page, DEFAULT_PAGE_LIMIT); + return this.edges(shard, page, Traverser.DEFAULT_PAGE_LIMIT); } public Edges edges(Shard shard, String page, long pageLimit) { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/VariablesManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/VariablesManager.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/VariablesManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/VariablesManager.java index ee6e1f61a..64a2cb19b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/VariablesManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/VariablesManager.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; -import com.baidu.hugegraph.api.variables.VariablesAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.api.variables.VariablesAPI; +import org.apache.hugegraph.client.RestClient; import java.util.Map; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/VersionManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/VersionManager.java similarity index 88% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/driver/VersionManager.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/driver/VersionManager.java index 2ff9956ce..04897960e 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/driver/VersionManager.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/VersionManager.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.driver; +package org.apache.hugegraph.driver; -import com.baidu.hugegraph.api.version.VersionAPI; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.structure.version.Versions; +import org.apache.hugegraph.api.version.VersionAPI; +import org.apache.hugegraph.structure.version.Versions; +import org.apache.hugegraph.client.RestClient; public class VersionManager { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/example/BatchExample.java b/hugegraph-client/src/main/java/org/apache/hugegraph/example/BatchExample.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/example/BatchExample.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/example/BatchExample.java index 8f2da31fc..fac0d5c84 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/example/BatchExample.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/example/BatchExample.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.util.ArrayList; import java.util.List; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; public class BatchExample { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/example/MovieExample.java b/hugegraph-client/src/main/java/org/apache/hugegraph/example/MovieExample.java similarity index 99% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/example/MovieExample.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/example/MovieExample.java index 4ef44c802..e85d8e774 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/example/MovieExample.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/example/MovieExample.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; public class MovieExample { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/example/SingleExample.java b/hugegraph-client/src/main/java/org/apache/hugegraph/example/SingleExample.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/example/SingleExample.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/example/SingleExample.java index 123ddcde5..504852654 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/example/SingleExample.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/example/SingleExample.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.example; +package org.apache.hugegraph.example; import java.io.IOException; import java.util.Iterator; import java.util.List; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.GremlinManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GremlinManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; public class SingleExample { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/InvalidOperationException.java b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/InvalidOperationException.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/exception/InvalidOperationException.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/exception/InvalidOperationException.java index 0daa135f4..3c2a80081 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/InvalidOperationException.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/InvalidOperationException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; import org.apache.hugegraph.rest.ClientException; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/InvalidResponseException.java b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/InvalidResponseException.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/exception/InvalidResponseException.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/exception/InvalidResponseException.java index 9a2de1735..80e7c833a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/InvalidResponseException.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/InvalidResponseException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; import org.apache.hugegraph.rest.ClientException; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/NotAllCreatedException.java b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/NotAllCreatedException.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/exception/NotAllCreatedException.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/exception/NotAllCreatedException.java index 80e59a87b..28b0d5f8b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/NotAllCreatedException.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/NotAllCreatedException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; import java.util.Collection; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/NotSupportException.java b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/NotSupportException.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/exception/NotSupportException.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/exception/NotSupportException.java index 94b6bdc9b..0f35543eb 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/NotSupportException.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/NotSupportException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; import org.apache.hugegraph.rest.ClientException; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/ServerException.java b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/ServerException.java similarity index 99% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/exception/ServerException.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/exception/ServerException.java index 7cbf39123..14ccd8cac 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/exception/ServerException.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/exception/ServerException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; import java.util.Map; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/PathDeserializer.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/PathDeserializer.java index 264aab17b..9dffd3a15 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/PathDeserializer.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/PathDeserializer.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.serializer; +package org.apache.hugegraph.serializer; import java.io.IOException; import java.util.Iterator; import java.util.List; -import com.baidu.hugegraph.exception.InvalidResponseException; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.exception.InvalidResponseException; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.util.JsonUtil; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/HBaseSerializer.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/HBaseSerializer.java similarity index 88% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/HBaseSerializer.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/HBaseSerializer.java index 024618fa6..36d4a34c8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/HBaseSerializer.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/HBaseSerializer.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct; +package org.apache.hugegraph.serializer.direct; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.serializer.direct.struct.HugeType; -import com.baidu.hugegraph.serializer.direct.util.BytesBuffer; -import com.baidu.hugegraph.serializer.direct.util.GraphSchema; -import com.baidu.hugegraph.serializer.direct.util.Id; -import com.baidu.hugegraph.serializer.direct.util.IdGenerator; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.serializer.direct.struct.HugeType; +import org.apache.hugegraph.serializer.direct.util.BytesBuffer; +import org.apache.hugegraph.serializer.direct.util.GraphSchema; +import org.apache.hugegraph.serializer.direct.util.Id; +import org.apache.hugegraph.serializer.direct.util.IdGenerator; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.schema.PropertyKey; import java.util.Arrays; import java.util.Map; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/RocksDBSerializer.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/RocksDBSerializer.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/RocksDBSerializer.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/RocksDBSerializer.java index de964f3cb..b5bb6adcc 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/RocksDBSerializer.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/RocksDBSerializer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct; +package org.apache.hugegraph.serializer.direct; /** * TODO: review later diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/reuse/BytesDemo.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/reuse/BytesDemo.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/reuse/BytesDemo.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/reuse/BytesDemo.java index dc3d99678..63ce8d064 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/reuse/BytesDemo.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/reuse/BytesDemo.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.reuse; +package org.apache.hugegraph.serializer.direct.reuse; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.serializer.direct.HBaseSerializer; -import com.baidu.hugegraph.serializer.direct.RocksDBSerializer; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.serializer.direct.HBaseSerializer; +import org.apache.hugegraph.serializer.direct.RocksDBSerializer; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; /** * @author jin diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/struct/DataType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/struct/DataType.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/struct/DataType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/struct/DataType.java index 484009948..fc0c39c46 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/struct/DataType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/struct/DataType.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.struct; +package org.apache.hugegraph.serializer.direct.struct; import java.util.Date; import java.util.UUID; -import com.baidu.hugegraph.serializer.direct.util.HugeException; -import com.baidu.hugegraph.serializer.direct.util.StringEncoding; +import org.apache.hugegraph.serializer.direct.util.HugeException; +import org.apache.hugegraph.serializer.direct.util.StringEncoding; import org.apache.hugegraph.util.CollectionUtil; import org.apache.hugegraph.util.DateUtil; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/struct/HugeType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/struct/HugeType.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/struct/HugeType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/struct/HugeType.java index 7c88567a5..d52c85b3b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/struct/HugeType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/struct/HugeType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.struct; +package org.apache.hugegraph.serializer.direct.struct; import java.util.HashMap; import java.util.Map; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/BytesBuffer.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/BytesBuffer.java similarity index 99% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/BytesBuffer.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/BytesBuffer.java index f407701f3..363fc1f74 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/BytesBuffer.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/BytesBuffer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import java.io.OutputStream; import java.nio.ByteBuffer; @@ -25,10 +25,11 @@ import java.util.Date; import java.util.UUID; +import org.apache.hugegraph.serializer.direct.struct.HugeType; import org.apache.hugegraph.util.Bytes; import org.apache.hugegraph.util.E; -import com.baidu.hugegraph.serializer.direct.struct.HugeType; +import org.apache.hugegraph.structure.constant.DataType; /** * class BytesBuffer is an util for read/write binary @@ -719,7 +720,7 @@ private byte[] readBytesWithEnding() { return bytes; } - public void writeProperty(com.baidu.hugegraph.structure.constant.DataType dataType, Object value) { + public void writeProperty(DataType dataType, Object value) { switch (dataType) { case BOOLEAN: this.writeVInt(((Boolean) value) ? 1 : 0); diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/GraphSchema.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/GraphSchema.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/GraphSchema.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/GraphSchema.java index af432f271..bcdeaf960 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/GraphSchema.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/GraphSchema.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import java.util.HashMap; import java.util.Map; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; /** * We could get all graph schema from server and cache/update it in client(subset of SchemaManager) diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/HugeException.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/HugeException.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/HugeException.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/HugeException.java index 143e5ae27..f9e490c68 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/HugeException.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/HugeException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; /** * Used for fix Exception problems, simplify from server diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/Id.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/Id.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/Id.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/Id.java index 769f8840f..8e294dcc7 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/Id.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/Id.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import org.apache.hugegraph.util.E; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/IdGenerator.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/IdGenerator.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/IdGenerator.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/IdGenerator.java index a003edf76..ba0f38f36 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/IdGenerator.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/IdGenerator.java @@ -17,13 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import java.util.Objects; import java.util.UUID; -import com.baidu.hugegraph.serializer.direct.util.Id.IdType; - import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.LongEncoding; import org.apache.hugegraph.util.NumericUtil; @@ -61,7 +59,7 @@ public static Id of(Object id) { return new ObjectId(id); } - public final static Id of(byte[] bytes, IdType type) { + public final static Id of(byte[] bytes, Id.IdType type) { switch (type) { case LONG: return new LongId(bytes); @@ -74,13 +72,13 @@ public final static Id of(byte[] bytes, IdType type) { } } - public final static Id ofStoredString(String id, IdType type) { + public final static Id ofStoredString(String id, Id.IdType type) { switch (type) { case LONG: return of(LongEncoding.decodeSignedB64(id)); case UUID: byte[] bytes = StringEncoding.decodeBase64(id); - return of(bytes, IdType.UUID); + return of(bytes, Id.IdType.UUID); case STRING: return of(id); default: @@ -101,18 +99,18 @@ public final static String asStoredString(Id id) { } } - public final static IdType idType(Id id) { + public final static Id.IdType idType(Id id) { if (id instanceof LongId) { - return IdType.LONG; + return Id.IdType.LONG; } if (id instanceof UuidId) { - return IdType.UUID; + return Id.IdType.UUID; } if (id instanceof StringId) { - return IdType.STRING; + return Id.IdType.STRING; } - return IdType.UNKNOWN; + return Id.IdType.UNKNOWN; } private static int compareType(Id id1, Id id2) { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/LZ4Util.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/LZ4Util.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/LZ4Util.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/LZ4Util.java index a12a55a59..7a2dd96d0 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/LZ4Util.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/LZ4Util.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import net.jpountz.lz4.LZ4BlockOutputStream; import net.jpountz.lz4.LZ4Compressor; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/SplicingIdGenerator.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/SplicingIdGenerator.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/SplicingIdGenerator.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/SplicingIdGenerator.java index ab504fb15..495def672 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/SplicingIdGenerator.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/SplicingIdGenerator.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import java.util.Arrays; import java.util.List; -import com.baidu.hugegraph.util.IdUtil; +import org.apache.hugegraph.util.IdUtil; /** * This class is used for merge / parse id in primaryKey mode, simplify from server diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/StringEncoding.java b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/StringEncoding.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/StringEncoding.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/StringEncoding.java index 18c598a19..8895091b4 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/serializer/direct/util/StringEncoding.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/serializer/direct/util/StringEncoding.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.serializer.direct.util; +package org.apache.hugegraph.serializer.direct.util; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/Element.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/Element.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/Element.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/Element.java index 4ad8a6c8f..ac9263609 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/Element.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/Element.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.Objects; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/GraphElement.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/GraphElement.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/GraphElement.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/GraphElement.java index e74df2e49..4c10cf4f9 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/GraphElement.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/GraphElement.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.Date; import java.util.List; @@ -26,8 +26,8 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.structure.constant.GraphAttachable; +import org.apache.hugegraph.structure.constant.GraphAttachable; +import org.apache.hugegraph.driver.GraphManager; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.ReflectionUtil; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/SchemaElement.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/SchemaElement.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/SchemaElement.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/SchemaElement.java index fe1131b1a..ca007872b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/SchemaElement.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/SchemaElement.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.Map; import java.util.Set; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/Task.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/Task.java similarity index 99% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/Task.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/Task.java index 62b30f911..88ce3ff9c 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/Task.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/Task.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.HashMap; import java.util.Map; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Access.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Access.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Access.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Access.java index 770ccb477..4e14c5a14 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Access.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Access.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Date; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.HugeType; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/AuthElement.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/AuthElement.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/AuthElement.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/AuthElement.java index 840aac334..18944561f 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/AuthElement.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/AuthElement.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Date; -import com.baidu.hugegraph.structure.Element; +import org.apache.hugegraph.structure.Element; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Belong.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Belong.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Belong.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Belong.java index de0b072e3..ded60368b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Belong.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Belong.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Date; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.HugeType; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Group.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Group.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Group.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Group.java index ab53c9b8f..22a21c223 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Group.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Group.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Date; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.HugeType; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugePermission.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugePermission.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugePermission.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugePermission.java index 0bd4782ce..a25ee6c53 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugePermission.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugePermission.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; public enum HugePermission { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugeResource.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugeResource.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugeResource.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugeResource.java index 171f8099d..355a29924 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugeResource.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugeResource.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Map; import java.util.Objects; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.JsonUtil; import com.fasterxml.jackson.annotation.JsonProperty; public class HugeResource { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugeResourceType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugeResourceType.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugeResourceType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugeResourceType.java index 5c2de4bbd..5b55f7207 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/HugeResourceType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/HugeResourceType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; public enum HugeResourceType { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Login.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Login.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Login.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Login.java index f98cd2e2d..ad04f5f17 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Login.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Login.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/LoginResult.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/LoginResult.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/LoginResult.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/LoginResult.java index 7f92df043..12f0e18e4 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/LoginResult.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/LoginResult.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Project.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Project.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Project.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Project.java index 754dcc944..ce99242ad 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Project.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Project.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Date; import java.util.HashSet; import java.util.Set; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.HugeType; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Target.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Target.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Target.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Target.java index e2a872185..207994507 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/Target.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/Target.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.HugeType; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/TokenPayload.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/TokenPayload.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/TokenPayload.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/TokenPayload.java index 925fa63ad..4cb18eec0 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/TokenPayload.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/TokenPayload.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/User.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/User.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/User.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/User.java index c06ebbd82..209d9c4e4 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/auth/User.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/auth/User.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.structure.auth; +package org.apache.hugegraph.structure.auth; import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.util.JsonUtil; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/AggregateType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/AggregateType.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/AggregateType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/AggregateType.java index 7b8bc5f22..52dba368a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/AggregateType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/AggregateType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum AggregateType { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Cardinality.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Cardinality.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Cardinality.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Cardinality.java index 879b0af0d..dcf2be34e 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Cardinality.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Cardinality.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum Cardinality { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/DataType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/DataType.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/DataType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/DataType.java index 380ea27fc..86d693c72 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/DataType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/DataType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; import java.io.Serializable; import java.util.Date; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Direction.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Direction.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Direction.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Direction.java index 676bd8785..d15f84cc8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Direction.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Direction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum Direction { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Frequency.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Frequency.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Frequency.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Frequency.java index 6345143cf..d70441647 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Frequency.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Frequency.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum Frequency { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphAttachable.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphAttachable.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphAttachable.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphAttachable.java index f87c10500..b802f95e4 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphAttachable.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphAttachable.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; -import com.baidu.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GraphManager; public interface GraphAttachable { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphMode.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphMode.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphMode.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphMode.java index 594e738de..751a420e8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphMode.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphMode.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum GraphMode { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphReadMode.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphReadMode.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphReadMode.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphReadMode.java index 73fec4998..61652663f 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/GraphReadMode.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/GraphReadMode.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum GraphReadMode { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/HugeType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/HugeType.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/HugeType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/HugeType.java index fe9de078b..644f9b34d 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/HugeType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/HugeType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum HugeType { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/IdStrategy.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/IdStrategy.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/IdStrategy.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/IdStrategy.java index 4d4280aec..c79a2a384 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/IdStrategy.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/IdStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum IdStrategy { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/IndexType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/IndexType.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/IndexType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/IndexType.java index 9b9bbe8d1..7379014f9 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/IndexType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/IndexType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum IndexType { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/T.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/T.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/T.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/T.java index a5957bf5d..7658d7922 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/T.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/T.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public class T { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Traverser.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Traverser.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Traverser.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Traverser.java index ab76cbfbc..34cc02cb8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/Traverser.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/Traverser.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public class Traverser { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/WriteType.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/WriteType.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/WriteType.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/WriteType.java index 5052033a9..edf50d04b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/constant/WriteType.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/constant/WriteType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.constant; +package org.apache.hugegraph.structure.constant; public enum WriteType { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchEdgeRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchEdgeRequest.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchEdgeRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchEdgeRequest.java index 26bf0d35d..6dfc7a5b3 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchEdgeRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchEdgeRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.HashMap; import java.util.List; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchOlapPropertyRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchOlapPropertyRequest.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchOlapPropertyRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchOlapPropertyRequest.java index 0b65b23a5..8dd62e9ba 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchOlapPropertyRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchOlapPropertyRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.List; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchVertexRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchVertexRequest.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchVertexRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchVertexRequest.java index 8f35f564d..a9608d0b5 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/BatchVertexRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/BatchVertexRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.HashMap; import java.util.List; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Edge.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edge.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Edge.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edge.java index 42556f83a..c0327f2fd 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Edge.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edge.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; -import com.baidu.hugegraph.exception.InvalidOperationException; -import com.baidu.hugegraph.structure.GraphElement; +import org.apache.hugegraph.util.SplicingIdGenerator; +import org.apache.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.structure.GraphElement; import org.apache.hugegraph.util.E; -import com.baidu.hugegraph.util.SplicingIdGenerator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Edges.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edges.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Edges.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edges.java index fe824a7e8..313797313 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Edges.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edges.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.List; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Graph.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Graph.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Graph.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Graph.java index 6c1cb71be..0ad5494d3 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Graph.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Graph.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.ArrayList; import java.util.HashMap; @@ -27,7 +27,7 @@ import org.slf4j.Logger; -import com.baidu.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GraphManager; import org.apache.hugegraph.util.Log; /** diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/GraphIterator.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/GraphIterator.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/GraphIterator.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/GraphIterator.java index 96123839a..3cf6a54bb 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/GraphIterator.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/GraphIterator.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; import java.util.function.Function; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.structure.GraphElement; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.structure.GraphElement; import org.apache.hugegraph.util.E; public class GraphIterator implements Iterator { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Pageable.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Pageable.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Pageable.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Pageable.java index 83ba2736b..9a8b8f025 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Pageable.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Pageable.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.List; -import com.baidu.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.GraphElement; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Path.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Path.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Path.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Path.java index 12002d53b..9da50cc6f 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Path.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Path.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.Arrays; import java.util.Collections; @@ -25,8 +25,8 @@ import java.util.Objects; import java.util.concurrent.CopyOnWriteArrayList; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.structure.constant.GraphAttachable; +import org.apache.hugegraph.structure.constant.GraphAttachable; +import org.apache.hugegraph.driver.GraphManager; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Shard.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Shard.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Shard.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Shard.java index 295d6e6cf..29fea6863 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Shard.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Shard.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/UpdateStrategy.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/UpdateStrategy.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/UpdateStrategy.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/UpdateStrategy.java index 55a8001da..1a3e9e9d2 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/UpdateStrategy.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/UpdateStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; public enum UpdateStrategy { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Vertex.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Vertex.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Vertex.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Vertex.java index d1f00760a..36111d158 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Vertex.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Vertex.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.Map; -import com.baidu.hugegraph.exception.InvalidOperationException; -import com.baidu.hugegraph.structure.GraphElement; +import org.apache.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.structure.GraphElement; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Vertices.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Vertices.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Vertices.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Vertices.java index 10ae84269..7acd33570 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/graph/Vertices.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Vertices.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.graph; +package org.apache.hugegraph.structure.graph; import java.util.List; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/Response.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/Response.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/Response.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/Response.java index 901b687ae..ea0f615fd 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/Response.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/Response.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.gremlin; +package org.apache.hugegraph.structure.gremlin; import java.util.Map; -import com.baidu.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GraphManager; import com.fasterxml.jackson.annotation.JsonProperty; public class Response { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/Result.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/Result.java similarity index 91% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/Result.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/Result.java index 2d5a13eef..2ebc16ab8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/Result.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/Result.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.gremlin; +package org.apache.hugegraph.structure.gremlin; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; public class Result { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/ResultSet.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/ResultSet.java index 02e387076..a3d4881e6 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/gremlin/ResultSet.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/gremlin/ResultSet.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.gremlin; +package org.apache.hugegraph.structure.gremlin; import java.util.Iterator; import java.util.LinkedHashMap; @@ -25,13 +25,13 @@ import java.util.Map; import java.util.NoSuchElementException; -import com.baidu.hugegraph.driver.GraphManager; +import org.apache.hugegraph.serializer.PathDeserializer; +import org.apache.hugegraph.structure.constant.GraphAttachable; +import org.apache.hugegraph.driver.GraphManager; import org.apache.hugegraph.rest.SerializeException; -import com.baidu.hugegraph.serializer.PathDeserializer; -import com.baidu.hugegraph.structure.constant.GraphAttachable; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/BuilderProxy.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/BuilderProxy.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/BuilderProxy.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/BuilderProxy.java index d0460b01a..ac088c2c4 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/BuilderProxy.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/BuilderProxy.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; +package org.apache.hugegraph.structure.schema; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import com.baidu.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.exception.InvalidOperationException; public class BuilderProxy implements InvocationHandler { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/EdgeLabel.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/EdgeLabel.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/EdgeLabel.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/EdgeLabel.java index 5405d1ff7..d6f85f045 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/EdgeLabel.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/EdgeLabel.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; +package org.apache.hugegraph.structure.schema; import java.util.Arrays; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.Frequency; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.Frequency; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.driver.SchemaManager; import org.apache.hugegraph.util.CollectionUtil; import org.apache.hugegraph.util.E; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/IndexLabel.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/IndexLabel.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/IndexLabel.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/IndexLabel.java index 33983729e..336078a7d 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/IndexLabel.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/IndexLabel.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; +package org.apache.hugegraph.structure.schema; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.IndexType; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.IndexType; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.structure.SchemaElement; import org.apache.hugegraph.util.CollectionUtil; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/PropertyKey.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/PropertyKey.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/PropertyKey.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/PropertyKey.java index 98cb39a89..6bb70a9aa 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/PropertyKey.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/PropertyKey.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; - -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.AggregateType; -import com.baidu.hugegraph.structure.constant.Cardinality; -import com.baidu.hugegraph.structure.constant.DataType; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.WriteType; +package org.apache.hugegraph.structure.schema; + +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.constant.AggregateType; +import org.apache.hugegraph.structure.constant.Cardinality; +import org.apache.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.WriteType; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/SchemaBuilder.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/SchemaBuilder.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/SchemaBuilder.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/SchemaBuilder.java index b728275ad..9ec471cde 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/SchemaBuilder.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/SchemaBuilder.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; +package org.apache.hugegraph.structure.schema; -import com.baidu.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.SchemaElement; public interface SchemaBuilder { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/SchemaLabel.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/SchemaLabel.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/SchemaLabel.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/SchemaLabel.java index 89dd4c324..07beecd7d 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/SchemaLabel.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/SchemaLabel.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; +package org.apache.hugegraph.structure.schema; import java.util.Collections; import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; -import com.baidu.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.SchemaElement; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/VertexLabel.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/VertexLabel.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/VertexLabel.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/VertexLabel.java index c60195b47..68cac591a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/schema/VertexLabel.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/schema/VertexLabel.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.structure.schema; +package org.apache.hugegraph.structure.schema; import java.util.Arrays; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.driver.SchemaManager; import org.apache.hugegraph.util.CollectionUtil; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CountRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CountRequest.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CountRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CountRequest.java index 01df539ad..59350875f 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CountRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CountRequest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.ArrayList; import java.util.List; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CrosspointsRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CrosspointsRequest.java similarity index 97% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CrosspointsRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CrosspointsRequest.java index cad36a15a..1ec6a1d62 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CrosspointsRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CrosspointsRequest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CustomizedCrosspoints.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CustomizedCrosspoints.java similarity index 89% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CustomizedCrosspoints.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CustomizedCrosspoints.java index 2d519b306..c22f55b1c 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CustomizedCrosspoints.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CustomizedCrosspoints.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class CustomizedCrosspoints { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CustomizedPathsRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CustomizedPathsRequest.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CustomizedPathsRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CustomizedPathsRequest.java index 2be7dd52e..3beac7d28 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/CustomizedPathsRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/CustomizedPathsRequest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.ArrayList; import java.util.Arrays; @@ -25,14 +25,13 @@ import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; -import static com.baidu.hugegraph.api.API.NO_LIMIT; - public class CustomizedPathsRequest { @JsonProperty("sources") @@ -216,7 +215,7 @@ public Builder degree(long degree) { } public Builder sample(int sample) { - E.checkArgument(sample == NO_LIMIT || sample > 0, + E.checkArgument(sample == API.NO_LIMIT || sample > 0, "The sample must be > 0 or == -1, but got: %s", sample); this.step.sample = sample; @@ -226,10 +225,10 @@ public Builder sample(int sample) { private Step build() { TraversersAPI.checkDegree(this.step.degree); E.checkArgument(this.step.sample > 0 || - this.step.sample == NO_LIMIT, + this.step.sample == API.NO_LIMIT, "The sample must be > 0 or == -1, but got: %s", this.step.sample); - E.checkArgument(this.step.degree == NO_LIMIT || + E.checkArgument(this.step.degree == API.NO_LIMIT || this.step.degree >= this.step.sample, "Degree must be greater than or equal to " + "sample, but got degree %s and sample %s", diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/EdgeStep.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/EdgeStep.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/EdgeStep.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/EdgeStep.java index 2be861a33..a3272926b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/EdgeStep.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/EdgeStep.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Traverser; import com.fasterxml.jackson.annotation.JsonProperty; public class EdgeStep { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/FusiformSimilarity.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/FusiformSimilarity.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/FusiformSimilarity.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/FusiformSimilarity.java index b5ce09c71..dac07d631 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/FusiformSimilarity.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/FusiformSimilarity.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class FusiformSimilarity { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/FusiformSimilarityRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/FusiformSimilarityRequest.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/FusiformSimilarityRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/FusiformSimilarityRequest.java index 9ec41c165..55ff5e011 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/FusiformSimilarityRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/FusiformSimilarityRequest.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Kneighbor.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Kneighbor.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Kneighbor.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Kneighbor.java index 512700fbf..bb6dd6aa7 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Kneighbor.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Kneighbor.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class Kneighbor { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/KneighborRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/KneighborRequest.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/KneighborRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/KneighborRequest.java index c2dad311c..71f34c417 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/KneighborRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/KneighborRequest.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Kout.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Kout.java similarity index 90% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Kout.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Kout.java index ade813f7d..a04ec7fdc 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Kout.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Kout.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class Kout { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/KoutRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/KoutRequest.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/KoutRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/KoutRequest.java index e35ee4803..c3fac8bba 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/KoutRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/KoutRequest.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/MultiNodeShortestPathRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/MultiNodeShortestPathRequest.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/MultiNodeShortestPathRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/MultiNodeShortestPathRequest.java index 425955a59..4dd6b1331 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/MultiNodeShortestPathRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/MultiNodeShortestPathRequest.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/PathsRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/PathsRequest.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/PathsRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/PathsRequest.java index 878fff8b0..7f6cbb261 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/PathsRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/PathsRequest.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/PathsWithVertices.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/PathsWithVertices.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/PathsWithVertices.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/PathsWithVertices.java index 666881622..8d4df2dd9 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/PathsWithVertices.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/PathsWithVertices.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class PathsWithVertices { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Ranks.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Ranks.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Ranks.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Ranks.java index a8bb31570..3de9322d5 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/Ranks.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/Ranks.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.LinkedHashMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/RepeatEdgeStep.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/RepeatEdgeStep.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/RepeatEdgeStep.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/RepeatEdgeStep.java index 1783b7a99..9ae90ad1b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/RepeatEdgeStep.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/RepeatEdgeStep.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Direction; import com.fasterxml.jackson.annotation.JsonProperty; public class RepeatEdgeStep extends EdgeStep { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/SingleSourceJaccardSimilarityRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/SingleSourceJaccardSimilarityRequest.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/SingleSourceJaccardSimilarityRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/SingleSourceJaccardSimilarityRequest.java index 421776fe3..9f0de0e54 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/SingleSourceJaccardSimilarityRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/SingleSourceJaccardSimilarityRequest.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/TemplatePathsRequest.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/TemplatePathsRequest.java similarity index 96% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/TemplatePathsRequest.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/TemplatePathsRequest.java index d83f74ae2..379e9b654 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/TemplatePathsRequest.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/TemplatePathsRequest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.ArrayList; import java.util.List; -import com.baidu.hugegraph.api.traverser.TraversersAPI; -import com.baidu.hugegraph.structure.constant.Traverser; +import org.apache.hugegraph.api.traverser.TraversersAPI; +import org.apache.hugegraph.structure.constant.Traverser; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/VerticesArgs.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/VerticesArgs.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/VerticesArgs.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/VerticesArgs.java index 3b53fa52a..75f0bf7eb 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/VerticesArgs.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/VerticesArgs.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.Arrays; import java.util.HashMap; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/WeightedPath.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/WeightedPath.java similarity index 93% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/WeightedPath.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/WeightedPath.java index 2a50e6237..013f93c21 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/WeightedPath.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/WeightedPath.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class WeightedPath { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/WeightedPaths.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/WeightedPaths.java similarity index 92% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/WeightedPaths.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/WeightedPaths.java index c7ce57232..bec563c20 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/traverser/WeightedPaths.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/traverser/WeightedPaths.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.structure.traverser; +package org.apache.hugegraph.structure.traverser; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; public class WeightedPaths { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/version/Versions.java b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/version/Versions.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/structure/version/Versions.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/structure/version/Versions.java index 632442240..0f2a5ff2a 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/structure/version/Versions.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/structure/version/Versions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure.version; +package org.apache.hugegraph.structure.version; import java.util.Map; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/CommonUtil.java b/hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/util/CommonUtil.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java index 49bc9881d..4b131012b 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/CommonUtil.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/util/CommonUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import org.apache.hugegraph.util.E; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/IdUtil.java b/hugegraph-client/src/main/java/org/apache/hugegraph/util/IdUtil.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/util/IdUtil.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/util/IdUtil.java index 9ebe91d6a..e8a06ba66 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/IdUtil.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/util/IdUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import org.apache.commons.lang3.StringUtils; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/JsonUtil.java b/hugegraph-client/src/main/java/org/apache/hugegraph/util/JsonUtil.java similarity index 98% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/util/JsonUtil.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/util/JsonUtil.java index 1b996116f..a2df68d49 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/JsonUtil.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/util/JsonUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.IOException; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/SplicingIdGenerator.java b/hugegraph-client/src/main/java/org/apache/hugegraph/util/SplicingIdGenerator.java similarity index 99% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/util/SplicingIdGenerator.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/util/SplicingIdGenerator.java index 732258d14..8080891b3 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/SplicingIdGenerator.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/util/SplicingIdGenerator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.Arrays; import java.util.List; diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/TaskCache.java b/hugegraph-client/src/main/java/org/apache/hugegraph/util/TaskCache.java similarity index 95% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/util/TaskCache.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/util/TaskCache.java index a2c36bf85..cd87f7ff8 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/util/TaskCache.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/util/TaskCache.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.ArrayList; import java.util.List; @@ -26,9 +26,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.structure.Task; -import org.apache.hugegraph.util.ExecutorUtil; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.structure.Task; public class TaskCache { diff --git a/hugegraph-client/src/main/java/com/baidu/hugegraph/version/ClientVersion.java b/hugegraph-client/src/main/java/org/apache/hugegraph/version/ClientVersion.java similarity index 94% rename from hugegraph-client/src/main/java/com/baidu/hugegraph/version/ClientVersion.java rename to hugegraph-client/src/main/java/org/apache/hugegraph/version/ClientVersion.java index e18fe19b9..99a535670 100644 --- a/hugegraph-client/src/main/java/com/baidu/hugegraph/version/ClientVersion.java +++ b/hugegraph-client/src/main/java/org/apache/hugegraph/version/ClientVersion.java @@ -17,11 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.version; +package org.apache.hugegraph.version; import org.apache.hugegraph.util.VersionUtil; import org.apache.hugegraph.util.VersionUtil.Version; -import org.apache.hugegraph.version.CommonVersion; public class ClientVersion { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/BaseClientTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/BaseClientTest.java similarity index 92% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/BaseClientTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/BaseClientTest.java index da8162119..454f3565a 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/BaseClientTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/BaseClientTest.java @@ -17,36 +17,36 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import com.baidu.hugegraph.driver.AuthManager; -import com.baidu.hugegraph.driver.CypherManager; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.GraphsManager; -import com.baidu.hugegraph.driver.GremlinManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.MetricsManager; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.driver.TaskManager; -import com.baidu.hugegraph.driver.TraverserManager; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.driver.AuthManager; +import org.apache.hugegraph.driver.CypherManager; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GraphsManager; +import org.apache.hugegraph.driver.GremlinManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.MetricsManager; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.driver.TaskManager; +import org.apache.hugegraph.driver.TraverserManager; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableMap; public class BaseClientTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/ApiTestSuite.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/ApiTestSuite.java similarity index 57% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/ApiTestSuite.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/ApiTestSuite.java index 62329dba9..951fe160b 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/ApiTestSuite.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/ApiTestSuite.java @@ -17,38 +17,38 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import org.junit.runner.RunWith; import org.junit.runners.Suite; -import com.baidu.hugegraph.api.auth.AccessApiTest; -import com.baidu.hugegraph.api.auth.BelongApiTest; -import com.baidu.hugegraph.api.auth.GroupApiTest; -import com.baidu.hugegraph.api.auth.LoginApiTest; -import com.baidu.hugegraph.api.auth.LogoutApiTest; -import com.baidu.hugegraph.api.auth.ProjectApiTest; -import com.baidu.hugegraph.api.auth.TargetApiTest; -import com.baidu.hugegraph.api.auth.TokenApiTest; -import com.baidu.hugegraph.api.auth.UserApiTest; -import com.baidu.hugegraph.api.traverser.AllShortestPathsApiTest; -import com.baidu.hugegraph.api.traverser.CommonTraverserApiTest; -import com.baidu.hugegraph.api.traverser.CountApiTest; -import com.baidu.hugegraph.api.traverser.CustomizedPathsApiTest; -import com.baidu.hugegraph.api.traverser.FusiformSimilarityApiTest; -import com.baidu.hugegraph.api.traverser.JaccardSimilarityApiTest; -import com.baidu.hugegraph.api.traverser.KneighborApiTest; -import com.baidu.hugegraph.api.traverser.KoutApiTest; -import com.baidu.hugegraph.api.traverser.MultiNodeShortestPathApiTest; -import com.baidu.hugegraph.api.traverser.NeighborRankApiTest; -import com.baidu.hugegraph.api.traverser.PathsApiTest; -import com.baidu.hugegraph.api.traverser.PersonalRankApiTest; -import com.baidu.hugegraph.api.traverser.RingsRaysApiTest; -import com.baidu.hugegraph.api.traverser.SameNeighborsApiTest; -import com.baidu.hugegraph.api.traverser.ShortestPathApiTest; -import com.baidu.hugegraph.api.traverser.SingleSourceShortestPathApiTest; -import com.baidu.hugegraph.api.traverser.TemplatePathsApiTest; -import com.baidu.hugegraph.api.traverser.WeightedShortestPathApiTest; +import org.apache.hugegraph.api.auth.AccessApiTest; +import org.apache.hugegraph.api.auth.BelongApiTest; +import org.apache.hugegraph.api.auth.GroupApiTest; +import org.apache.hugegraph.api.auth.LoginApiTest; +import org.apache.hugegraph.api.auth.LogoutApiTest; +import org.apache.hugegraph.api.auth.ProjectApiTest; +import org.apache.hugegraph.api.auth.TargetApiTest; +import org.apache.hugegraph.api.auth.TokenApiTest; +import org.apache.hugegraph.api.auth.UserApiTest; +import org.apache.hugegraph.api.traverser.AllShortestPathsApiTest; +import org.apache.hugegraph.api.traverser.CommonTraverserApiTest; +import org.apache.hugegraph.api.traverser.CountApiTest; +import org.apache.hugegraph.api.traverser.CustomizedPathsApiTest; +import org.apache.hugegraph.api.traverser.FusiformSimilarityApiTest; +import org.apache.hugegraph.api.traverser.JaccardSimilarityApiTest; +import org.apache.hugegraph.api.traverser.KneighborApiTest; +import org.apache.hugegraph.api.traverser.KoutApiTest; +import org.apache.hugegraph.api.traverser.MultiNodeShortestPathApiTest; +import org.apache.hugegraph.api.traverser.NeighborRankApiTest; +import org.apache.hugegraph.api.traverser.PathsApiTest; +import org.apache.hugegraph.api.traverser.PersonalRankApiTest; +import org.apache.hugegraph.api.traverser.RingsRaysApiTest; +import org.apache.hugegraph.api.traverser.SameNeighborsApiTest; +import org.apache.hugegraph.api.traverser.ShortestPathApiTest; +import org.apache.hugegraph.api.traverser.SingleSourceShortestPathApiTest; +import org.apache.hugegraph.api.traverser.TemplatePathsApiTest; +import org.apache.hugegraph.api.traverser.WeightedShortestPathApiTest; @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/BaseApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/BaseApiTest.java similarity index 86% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/BaseApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/BaseApiTest.java index 06dea4985..dd1535862 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/BaseApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/BaseApiTest.java @@ -17,28 +17,28 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.List; +import org.apache.hugegraph.api.graph.EdgeAPI; +import org.apache.hugegraph.api.graph.VertexAPI; +import org.apache.hugegraph.api.graphs.GraphsAPI; +import org.apache.hugegraph.api.job.RebuildAPI; +import org.apache.hugegraph.api.task.TaskAPI; +import org.apache.hugegraph.api.variables.VariablesAPI; +import org.apache.hugegraph.api.version.VersionAPI; import org.junit.AfterClass; import org.junit.BeforeClass; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.api.graph.EdgeAPI; -import com.baidu.hugegraph.api.graph.VertexAPI; -import com.baidu.hugegraph.api.graphs.GraphsAPI; -import com.baidu.hugegraph.api.job.RebuildAPI; -import com.baidu.hugegraph.api.schema.EdgeLabelAPI; -import com.baidu.hugegraph.api.schema.IndexLabelAPI; -import com.baidu.hugegraph.api.schema.PropertyKeyAPI; -import com.baidu.hugegraph.api.schema.SchemaAPI; -import com.baidu.hugegraph.api.schema.VertexLabelAPI; -import com.baidu.hugegraph.api.task.TaskAPI; -import com.baidu.hugegraph.api.variables.VariablesAPI; -import com.baidu.hugegraph.api.version.VersionAPI; -import com.baidu.hugegraph.client.RestClient; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.api.schema.EdgeLabelAPI; +import org.apache.hugegraph.api.schema.IndexLabelAPI; +import org.apache.hugegraph.api.schema.PropertyKeyAPI; +import org.apache.hugegraph.api.schema.SchemaAPI; +import org.apache.hugegraph.api.schema.VertexLabelAPI; +import org.apache.hugegraph.client.RestClient; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.util.VersionUtil; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/BatchUpdateElementApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/BatchUpdateElementApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/BatchUpdateElementApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/BatchUpdateElementApiTest.java index 528c1e870..e3053a9a0 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/BatchUpdateElementApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/BatchUpdateElementApiTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; -import static com.baidu.hugegraph.structure.graph.UpdateStrategy.INTERSECTION; +import static org.apache.hugegraph.structure.graph.UpdateStrategy.INTERSECTION; import java.util.ArrayList; import java.util.Date; @@ -30,15 +30,15 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.BatchEdgeRequest; -import com.baidu.hugegraph.structure.graph.BatchVertexRequest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.UpdateStrategy; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.BatchEdgeRequest; +import org.apache.hugegraph.structure.graph.BatchVertexRequest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.UpdateStrategy; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/CypherApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/CypherApiTest.java similarity index 95% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/CypherApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/CypherApiTest.java index 4657d95f3..700d03a10 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/CypherApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/CypherApiTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.structure.gremlin.ResultSet; import org.apache.hugegraph.testutil.Assert; public class CypherApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/EdgeApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/EdgeApiTest.java index 9b5549f2e..67ee07944 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/EdgeApiTest.java @@ -17,25 +17,25 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/EdgeLabelApiTest.java similarity index 99% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/EdgeLabelApiTest.java index 94b5ea6c7..6a56a4125 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/EdgeLabelApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/EdgeLabelApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.Date; @@ -25,14 +25,14 @@ import java.util.Set; import java.util.function.Function; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Frequency; -import com.baidu.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.constant.Frequency; +import org.apache.hugegraph.structure.schema.EdgeLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/GraphsApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/GraphsApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/GraphsApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/GraphsApiTest.java index 6cbabebc2..b2863c384 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/GraphsApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/GraphsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.io.File; import java.io.IOException; @@ -28,15 +28,14 @@ import org.apache.commons.io.FileUtils; import org.junit.After; -import org.junit.Ignore; import org.junit.Test; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; import org.apache.hugegraph.rest.ClientException; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.ResultSet; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/GremlinApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/GremlinApiTest.java similarity index 94% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/GremlinApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/GremlinApiTest.java index b48511026..7e05e7e1b 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/GremlinApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/GremlinApiTest.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.hugegraph.api.gremlin.GremlinRequest; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.GraphAttachable; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.GraphAttachable; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.gremlin.ResultSet; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/IndexLabelApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/IndexLabelApiTest.java index 9fa6913bb..d09b7752d 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/IndexLabelApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.Date; @@ -25,19 +25,19 @@ import java.util.Map; import java.util.function.Function; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.IndexType; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.IndexType; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.IndexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import org.apache.hugegraph.util.VersionUtil; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/JobApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/JobApiTest.java similarity index 90% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/JobApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/JobApiTest.java index db4be006b..e38d4b69b 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/JobApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/JobApiTest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; public class JobApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/PropertyKeyApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/PropertyKeyApiTest.java index 91fc7182b..b8eb83285 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/PropertyKeyApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/PropertyKeyApiTest.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.AggregateType; -import com.baidu.hugegraph.structure.constant.Cardinality; -import com.baidu.hugegraph.structure.constant.DataType; -import com.baidu.hugegraph.structure.constant.WriteType; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.constant.AggregateType; +import org.apache.hugegraph.structure.constant.Cardinality; +import org.apache.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.constant.WriteType; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/RestoreApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/RestoreApiTest.java similarity index 95% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/RestoreApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/RestoreApiTest.java index 734c1b425..556c6c8c3 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/RestoreApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/RestoreApiTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.structure.constant.GraphMode; import org.apache.hugegraph.testutil.Assert; public class RestoreApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/SchemaApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/SchemaApiTest.java similarity index 95% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/SchemaApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/SchemaApiTest.java index e2d7868d5..8fcd5540e 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/SchemaApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/SchemaApiTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.List; import java.util.Map; import org.junit.Test; -import com.baidu.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.SchemaElement; import org.apache.hugegraph.testutil.Assert; public class SchemaApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/TaskApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/TaskApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/TaskApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/TaskApiTest.java index a36d5b47f..8691f298f 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/TaskApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/TaskApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.HashSet; @@ -25,17 +25,17 @@ import java.util.Map; import java.util.Set; +import org.apache.hugegraph.api.gremlin.GremlinRequest; +import org.apache.hugegraph.api.task.TasksWithPage; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; -import com.baidu.hugegraph.api.task.TasksWithPage; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.gremlin.ResultSet; -import com.baidu.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.structure.schema.IndexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; public class TaskApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VariablesApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/VariablesApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/VariablesApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/VariablesApiTest.java index 278497b1c..25664e3a5 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VariablesApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/VariablesApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.Arrays; import java.util.Collection; @@ -26,12 +26,12 @@ import java.util.Map; import java.util.Set; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; public class VariablesApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/VertexApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/VertexApiTest.java index df5e76063..e74c2c0cf 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/VertexApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.Date; @@ -25,21 +25,21 @@ import java.util.Map; import java.util.UUID; +import org.apache.hugegraph.api.gremlin.GremlinRequest; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.GraphReadMode; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.constant.WriteType; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.ResultSet; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.GraphReadMode; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.constant.WriteType; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/VertexLabelApiTest.java similarity index 99% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/VertexLabelApiTest.java index 90d45bf0f..6251a3848 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/VertexLabelApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/VertexLabelApiTest.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.api; +package org.apache.hugegraph.api; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/AccessApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/AccessApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/AccessApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/AccessApiTest.java index b9948bb29..055e8f7d5 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/AccessApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/AccessApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -27,12 +27,12 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Access; -import com.baidu.hugegraph.structure.auth.Group; -import com.baidu.hugegraph.structure.auth.HugePermission; -import com.baidu.hugegraph.structure.auth.HugeResourceType; -import com.baidu.hugegraph.structure.auth.Target; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Access; +import org.apache.hugegraph.structure.auth.Group; +import org.apache.hugegraph.structure.auth.HugePermission; +import org.apache.hugegraph.structure.auth.HugeResourceType; +import org.apache.hugegraph.structure.auth.Target; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/AuthApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/AuthApiTest.java similarity index 91% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/AuthApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/AuthApiTest.java index 346c33e96..ba1145f8e 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/AuthApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/AuthApiTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class AuthApiTest extends BaseApiTest { } diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/BelongApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/BelongApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/BelongApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/BelongApiTest.java index d808d8433..663e3cce2 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/BelongApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/BelongApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -27,10 +27,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Belong; -import com.baidu.hugegraph.structure.auth.Group; -import com.baidu.hugegraph.structure.auth.User; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Belong; +import org.apache.hugegraph.structure.auth.Group; +import org.apache.hugegraph.structure.auth.User; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/GroupApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/GroupApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/GroupApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/GroupApiTest.java index 489f7a6f5..0a59ed4f6 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/GroupApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/GroupApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -26,8 +26,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Group; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Group; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/LoginApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/LoginApiTest.java similarity index 89% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/LoginApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/LoginApiTest.java index d3a55ce5c..66043b4d5 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/LoginApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/LoginApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -25,10 +25,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Login; -import com.baidu.hugegraph.structure.auth.LoginResult; -import com.baidu.hugegraph.structure.auth.User; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Login; +import org.apache.hugegraph.structure.auth.LoginResult; +import org.apache.hugegraph.structure.auth.User; import org.apache.hugegraph.testutil.Assert; public class LoginApiTest extends AuthApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/LogoutApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/LogoutApiTest.java similarity index 89% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/LogoutApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/LogoutApiTest.java index 39bfcf4ec..54fadcbc2 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/LogoutApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/LogoutApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -25,11 +25,11 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Login; -import com.baidu.hugegraph.structure.auth.LoginResult; -import com.baidu.hugegraph.structure.auth.User; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Login; +import org.apache.hugegraph.structure.auth.LoginResult; +import org.apache.hugegraph.structure.auth.User; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/ProjectApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/ProjectApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/ProjectApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/ProjectApiTest.java index ffdeb3543..460e4cdc6 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/ProjectApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/ProjectApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.HashSet; import java.util.List; @@ -25,14 +25,14 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.hugegraph.api.API; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Project; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Project; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/TargetApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/TargetApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/TargetApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/TargetApiTest.java index fda05e319..692f30d40 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/TargetApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/TargetApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.Arrays; import java.util.List; @@ -27,10 +27,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.HugeResource; -import com.baidu.hugegraph.structure.auth.HugeResourceType; -import com.baidu.hugegraph.structure.auth.Target; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.HugeResource; +import org.apache.hugegraph.structure.auth.HugeResourceType; +import org.apache.hugegraph.structure.auth.Target; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/TokenApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/TokenApiTest.java similarity index 90% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/TokenApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/TokenApiTest.java index 87d4d3db4..5e947dd39 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/TokenApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/TokenApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -25,12 +25,12 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.client.RestClient; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.Login; -import com.baidu.hugegraph.structure.auth.LoginResult; -import com.baidu.hugegraph.structure.auth.TokenPayload; -import com.baidu.hugegraph.structure.auth.User; +import org.apache.hugegraph.client.RestClient; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.Login; +import org.apache.hugegraph.structure.auth.LoginResult; +import org.apache.hugegraph.structure.auth.TokenPayload; +import org.apache.hugegraph.structure.auth.User; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/UserApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/UserApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/UserApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/UserApiTest.java index 5277770f7..2bf790adc 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/auth/UserApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/auth/UserApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.auth; +package org.apache.hugegraph.api.auth; import java.util.List; @@ -26,9 +26,9 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.auth.User; -import com.baidu.hugegraph.structure.auth.User.UserRole; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.auth.User; +import org.apache.hugegraph.structure.auth.User.UserRole; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/AllShortestPathsApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/AllShortestPathsApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/AllShortestPathsApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/AllShortestPathsApiTest.java index a462b79b5..74752cfb6 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/AllShortestPathsApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/AllShortestPathsApiTest.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CommonTraverserApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CommonTraverserApiTest.java similarity index 93% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CommonTraverserApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CommonTraverserApiTest.java index 179c1851b..72991566b 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CommonTraverserApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CommonTraverserApiTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; -import static com.baidu.hugegraph.structure.constant.Traverser.DEFAULT_PAGE_LIMIT; +import static org.apache.hugegraph.structure.constant.Traverser.DEFAULT_PAGE_LIMIT; import java.util.LinkedList; import java.util.List; @@ -27,22 +27,22 @@ import java.util.Set; import java.util.stream.Collectors; +import org.apache.hugegraph.testutil.Utils; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Edges; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Shard; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.graph.Vertices; -import com.baidu.hugegraph.structure.traverser.CrosspointsRequest; -import com.baidu.hugegraph.structure.traverser.CustomizedCrosspoints; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Edges; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Shard; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertices; +import org.apache.hugegraph.structure.traverser.CrosspointsRequest; +import org.apache.hugegraph.structure.traverser.CustomizedCrosspoints; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CountApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CountApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CountApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CountApiTest.java index 4f592474c..8d2a823e8 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CountApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CountApiTest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.CountRequest; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.CountRequest; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CustomizedPathsApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CustomizedPathsApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CustomizedPathsApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CustomizedPathsApiTest.java index f9e5b10fd..5034a5824 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/CustomizedPathsApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/CustomizedPathsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.ArrayList; import java.util.List; @@ -29,14 +29,14 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; -import com.baidu.hugegraph.structure.traverser.CustomizedPathsRequest; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.traverser.CustomizedPathsRequest; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/FusiformSimilarityApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/FusiformSimilarityApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/FusiformSimilarityApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/FusiformSimilarityApiTest.java index dfa260035..74994bfbb 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/FusiformSimilarityApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/FusiformSimilarityApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.Map; import java.util.Set; @@ -26,13 +26,13 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarity; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarity.Similar; -import com.baidu.hugegraph.structure.traverser.FusiformSimilarityRequest; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.FusiformSimilarity; +import org.apache.hugegraph.structure.traverser.FusiformSimilarity.Similar; +import org.apache.hugegraph.structure.traverser.FusiformSimilarityRequest; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/JaccardSimilarityApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/JaccardSimilarityApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/JaccardSimilarityApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/JaccardSimilarityApiTest.java index f54b9fbb5..db2759c6d 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/JaccardSimilarityApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/JaccardSimilarityApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.Map; import java.util.Set; @@ -25,10 +25,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.SingleSourceJaccardSimilarityRequest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.SingleSourceJaccardSimilarityRequest; import org.apache.hugegraph.testutil.Assert; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/KneighborApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/KneighborApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/KneighborApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/KneighborApiTest.java index 515b1f184..b6cb87cd7 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/KneighborApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/KneighborApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import java.util.Set; @@ -25,12 +25,12 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.Kneighbor; -import com.baidu.hugegraph.structure.traverser.KneighborRequest; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.Kneighbor; +import org.apache.hugegraph.structure.traverser.KneighborRequest; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/KoutApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/KoutApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/KoutApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/KoutApiTest.java index c0e7d0ba6..5925c6ac8 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/KoutApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/KoutApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import java.util.Set; @@ -25,13 +25,13 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.Kout; -import com.baidu.hugegraph.structure.traverser.KoutRequest; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.Kout; +import org.apache.hugegraph.structure.traverser.KoutRequest; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/MultiNodeShortestPathApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/MultiNodeShortestPathApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/MultiNodeShortestPathApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/MultiNodeShortestPathApiTest.java index b4f690515..a8d919405 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/MultiNodeShortestPathApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/MultiNodeShortestPathApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.Collections; import java.util.List; @@ -26,11 +26,11 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.MultiNodeShortestPathRequest; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.MultiNodeShortestPathRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/NeighborRankApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/NeighborRankApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/NeighborRankApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/NeighborRankApiTest.java index b9cc9be20..3b582b13f 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/NeighborRankApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/NeighborRankApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.ArrayList; import java.util.List; @@ -26,14 +26,14 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.Ranks; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.Ranks; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/PathsApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/PathsApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/PathsApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/PathsApiTest.java index a06ced97b..bb6a95643 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/PathsApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/PathsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import java.util.Set; @@ -25,14 +25,14 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.PathsRequest; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.PathsRequest; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/PersonalRankApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/PersonalRankApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/PersonalRankApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/PersonalRankApiTest.java index 5c5c2acbc..b902cc509 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/PersonalRankApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/PersonalRankApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.ArrayList; import java.util.List; @@ -27,11 +27,11 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/RingsRaysApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/RingsRaysApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/RingsRaysApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/RingsRaysApiTest.java index 1b207d5ed..fa55be16d 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/RingsRaysApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/RingsRaysApiTest.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.api.BaseApiTest; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/SameNeighborsApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/SameNeighborsApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/SameNeighborsApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/SameNeighborsApiTest.java index 059ca6844..917a8e212 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/SameNeighborsApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/SameNeighborsApiTest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/ShortestPathApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/ShortestPathApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/ShortestPathApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/ShortestPathApiTest.java index 87eba58e2..386c192a6 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/ShortestPathApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/ShortestPathApiTest.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/SingleSourceShortestPathApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/SingleSourceShortestPathApiTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/SingleSourceShortestPathApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/SingleSourceShortestPathApiTest.java index d6e4c4bdd..f763b4dcd 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/SingleSourceShortestPathApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/SingleSourceShortestPathApiTest.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.WeightedPath; -import com.baidu.hugegraph.structure.traverser.WeightedPaths; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.WeightedPath; +import org.apache.hugegraph.structure.traverser.WeightedPaths; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/TemplatePathsApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/TemplatePathsApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/TemplatePathsApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/TemplatePathsApiTest.java index 84deba66b..22be8fd1f 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/TemplatePathsApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/TemplatePathsApiTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import java.util.Set; @@ -25,11 +25,11 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.PathsWithVertices; -import com.baidu.hugegraph.structure.traverser.TemplatePathsRequest; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.PathsWithVertices; +import org.apache.hugegraph.structure.traverser.TemplatePathsRequest; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/TraverserApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/TraverserApiTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/TraverserApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/TraverserApiTest.java index 510079807..a2e94a047 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/TraverserApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/TraverserApiTest.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import org.junit.BeforeClass; -import com.baidu.hugegraph.api.BaseApiTest; +import org.apache.hugegraph.api.BaseApiTest; public class TraverserApiTest extends BaseApiTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/WeightedShortestPathApiTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/WeightedShortestPathApiTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/WeightedShortestPathApiTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/WeightedShortestPathApiTest.java index aaa175850..c6504cd37 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/api/traverser/WeightedShortestPathApiTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/api/traverser/WeightedShortestPathApiTest.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.api.traverser; +package org.apache.hugegraph.api.traverser; import java.util.List; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.traverser.WeightedPath; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.traverser.WeightedPath; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/AuthManagerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/AuthManagerTest.java similarity index 86% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/AuthManagerTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/AuthManagerTest.java index e3f43a0b9..830fa7073 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/AuthManagerTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/AuthManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.List; import java.util.Set; @@ -27,20 +27,20 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.structure.auth.Access; -import com.baidu.hugegraph.structure.auth.Belong; -import com.baidu.hugegraph.structure.auth.Group; -import com.baidu.hugegraph.structure.auth.HugePermission; -import com.baidu.hugegraph.structure.auth.HugeResource; -import com.baidu.hugegraph.structure.auth.HugeResourceType; -import com.baidu.hugegraph.structure.auth.Login; -import com.baidu.hugegraph.structure.auth.LoginResult; -import com.baidu.hugegraph.structure.auth.Project; -import com.baidu.hugegraph.structure.auth.Target; -import com.baidu.hugegraph.structure.auth.TokenPayload; -import com.baidu.hugegraph.structure.auth.User; -import com.baidu.hugegraph.structure.auth.User.UserRole; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.structure.auth.Access; +import org.apache.hugegraph.structure.auth.Belong; +import org.apache.hugegraph.structure.auth.Group; +import org.apache.hugegraph.structure.auth.HugePermission; +import org.apache.hugegraph.structure.auth.HugeResource; +import org.apache.hugegraph.structure.auth.HugeResourceType; +import org.apache.hugegraph.structure.auth.Login; +import org.apache.hugegraph.structure.auth.LoginResult; +import org.apache.hugegraph.structure.auth.Project; +import org.apache.hugegraph.structure.auth.Target; +import org.apache.hugegraph.structure.auth.TokenPayload; +import org.apache.hugegraph.structure.auth.User; +import org.apache.hugegraph.structure.auth.User.UserRole; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/BaseFuncTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/BaseFuncTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/BaseFuncTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/BaseFuncTest.java index 301f3e8d2..9606f067a 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/BaseFuncTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/BaseFuncTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; -import com.baidu.hugegraph.BaseClientTest; +import org.apache.hugegraph.BaseClientTest; public class BaseFuncTest extends BaseClientTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/BatchInsertTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/BatchInsertTest.java similarity index 94% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/BatchInsertTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/BatchInsertTest.java index cdad64612..44fcb4235 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/BatchInsertTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/BatchInsertTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.ArrayList; import java.util.List; @@ -26,10 +26,10 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.exception.InvalidOperationException; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; public class BatchInsertTest extends BaseFuncTest { @@ -45,7 +45,7 @@ public void setup() { @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/EdgeLabelTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/EdgeLabelTest.java index 3c472d856..aba625f67 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeLabelTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/EdgeLabelTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Date; import java.util.List; @@ -26,14 +26,14 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.schema.EdgeLabel; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.util.DateUtil; -import com.baidu.hugegraph.testutil.Utils; +import org.apache.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableList; public class EdgeLabelTest extends BaseFuncTest { @@ -46,7 +46,7 @@ public void setup() { @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/EdgeTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/EdgeTest.java index f0ff3371e..fc990a326 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/EdgeTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/EdgeTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.text.ParseException; import java.util.Date; @@ -29,18 +29,18 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.InvalidOperationException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.gremlin.ResultSet; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; +import org.apache.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/FuncTestSuite.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/FuncTestSuite.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/FuncTestSuite.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/FuncTestSuite.java index 05351f98e..974268371 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/FuncTestSuite.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/FuncTestSuite.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/GraphManagerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/GraphManagerTest.java similarity index 92% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/GraphManagerTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/GraphManagerTest.java index d8bb09ef0..f139c55e2 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/GraphManagerTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/GraphManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Iterator; import java.util.List; @@ -27,9 +27,9 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; public class GraphManagerTest extends BaseFuncTest { @@ -45,7 +45,7 @@ public void setup() { @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/GraphModeTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/GraphModeTest.java similarity index 92% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/GraphModeTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/GraphModeTest.java index 8910dcfe7..b034d0d0d 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/GraphModeTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/GraphModeTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.GraphsManager; -import com.baidu.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.driver.GraphsManager; +import org.apache.hugegraph.structure.constant.GraphMode; import org.apache.hugegraph.testutil.Assert; public class GraphModeTest extends BaseFuncTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/HugeClientHttpsTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/HugeClientHttpsTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/HugeClientHttpsTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/HugeClientHttpsTest.java index d3b29df0d..08c464046 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/HugeClientHttpsTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/HugeClientHttpsTest.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Map; import org.junit.After; import org.junit.Test; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/HugeClientTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/HugeClientTest.java similarity index 94% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/HugeClientTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/HugeClientTest.java index e63b4282b..901d1c3f8 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/HugeClientTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/HugeClientTest.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import org.junit.Test; -import com.baidu.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.HugeClient; import org.apache.hugegraph.testutil.Assert; public class HugeClientTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/IndexLabelTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/IndexLabelTest.java index bbe33f9bc..72c597eaf 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/IndexLabelTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/IndexLabelTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Date; import java.util.List; @@ -26,13 +26,13 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.schema.IndexLabel; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.util.DateUtil; -import com.baidu.hugegraph.testutil.Utils; +import org.apache.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableList; public class IndexLabelTest extends BaseFuncTest { @@ -44,7 +44,7 @@ public void setup() { @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/MetricsManagerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/MetricsManagerTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/MetricsManagerTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/MetricsManagerTest.java index 233d1598b..9894cf742 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/MetricsManagerTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/MetricsManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Map; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/PropertyKeyTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/PropertyKeyTest.java index 28736d7d4..069d106b6 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/PropertyKeyTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/PropertyKeyTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Date; import java.util.List; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.constant.WriteType; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.constant.WriteType; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/SchemaTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/SchemaTest.java similarity index 92% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/SchemaTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/SchemaTest.java index b3edb1c53..a06409e4a 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/SchemaTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/SchemaTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.List; import java.util.Map; import org.junit.Test; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.structure.SchemaElement; import org.apache.hugegraph.testutil.Assert; public class SchemaTest extends BaseFuncTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/TraverserManagerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/TraverserManagerTest.java similarity index 89% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/TraverserManagerTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/TraverserManagerTest.java index 3de718e12..38130fa58 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/TraverserManagerTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/TraverserManagerTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Iterator; import java.util.LinkedList; @@ -27,10 +27,10 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Shard; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Shard; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; public class TraverserManagerTest extends BaseFuncTest { @@ -46,7 +46,7 @@ public void setup() { @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/VertexLabelTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/VertexLabelTest.java index 8be820a6e..0cebfc269 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexLabelTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/VertexLabelTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Date; import java.util.List; @@ -26,14 +26,14 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.util.DateUtil; -import com.baidu.hugegraph.testutil.Utils; +import org.apache.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableList; public class VertexLabelTest extends BaseFuncTest { @@ -45,7 +45,7 @@ public void setup() { @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/VertexTest.java similarity index 98% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/functional/VertexTest.java index d974271e4..98d6b7f25 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/functional/VertexTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/VertexTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.functional; +package org.apache.hugegraph.functional; import java.util.Iterator; import java.util.List; @@ -28,13 +28,13 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.BaseClientTest; -import com.baidu.hugegraph.exception.InvalidOperationException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.BaseClientTest; +import org.apache.hugegraph.exception.InvalidOperationException; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; +import org.apache.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterators; @@ -52,7 +52,7 @@ public void setup() { @Override @After public void teardown() throws Exception { - BaseFuncTest.clearData(); + clearData(); } @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java b/hugegraph-client/src/test/java/org/apache/hugegraph/testutil/Utils.java similarity index 94% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/testutil/Utils.java index 267b786ea..2d1df3c19 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/testutil/Utils.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/testutil/Utils.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.testutil; +package org.apache.hugegraph.testutil; import java.util.Arrays; import java.util.Date; @@ -30,16 +30,15 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.hugegraph.date.SafeDateFormat; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; -import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert.ThrowableRunnable; import org.apache.hugegraph.util.DateUtil; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java similarity index 93% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java index a76856c3b..11be2d430 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.JsonUtil; public class BaseUnitTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/BatchElementRequestTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/BatchElementRequestTest.java similarity index 93% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/BatchElementRequestTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/BatchElementRequestTest.java index 3d687414c..9972e196a 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/BatchElementRequestTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/BatchElementRequestTest.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; -import static com.baidu.hugegraph.structure.graph.UpdateStrategy.INTERSECTION; +import static org.apache.hugegraph.structure.graph.UpdateStrategy.INTERSECTION; import java.util.List; import java.util.Map; import org.junit.Test; -import com.baidu.hugegraph.structure.graph.BatchEdgeRequest; -import com.baidu.hugegraph.structure.graph.BatchVertexRequest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.UpdateStrategy; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.BatchEdgeRequest; +import org.apache.hugegraph.structure.graph.BatchVertexRequest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.UpdateStrategy; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/CommonUtilTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/CommonUtilTest.java similarity index 95% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/CommonUtilTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/CommonUtilTest.java index bc3180fa2..48112df91 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/CommonUtilTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/CommonUtilTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; +import org.apache.hugegraph.util.CommonUtil; import org.junit.Test; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.CommonUtil; import com.google.common.collect.ImmutableMap; public class CommonUtilTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/IdUtilTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/IdUtilTest.java similarity index 95% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/IdUtilTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/IdUtilTest.java index 6bd0fd800..d81557f86 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/IdUtilTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/IdUtilTest.java @@ -17,13 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; +import org.apache.hugegraph.util.IdUtil; import org.junit.Assert; import org.junit.Test; -import com.baidu.hugegraph.util.IdUtil; - public class IdUtilTest { @Test diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/IndexLabelTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/IndexLabelTest.java similarity index 94% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/IndexLabelTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/IndexLabelTest.java index f1993658e..f2f389657 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/IndexLabelTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/IndexLabelTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import org.junit.Test; -import com.baidu.hugegraph.exception.NotSupportException; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.exception.NotSupportException; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.schema.IndexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.JsonUtil; public class IndexLabelTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/PathSerializerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/PathSerializerTest.java similarity index 94% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/PathSerializerTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/PathSerializerTest.java index 0a35f4ccc..807a52351 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/PathSerializerTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/PathSerializerTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; +import org.apache.hugegraph.testutil.Utils; import org.junit.Test; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import com.google.common.collect.ImmutableList; public class PathSerializerTest extends BaseUnitTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/PropertyKeyTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/PropertyKeyTest.java similarity index 93% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/PropertyKeyTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/PropertyKeyTest.java index 3ee417b9f..80ed916f7 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/PropertyKeyTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/PropertyKeyTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import org.junit.Test; -import com.baidu.hugegraph.structure.constant.Cardinality; -import com.baidu.hugegraph.structure.constant.DataType; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.constant.Cardinality; +import org.apache.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.testutil.Assert; public class PropertyKeyTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/RestResultTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/RestResultTest.java index a8dcd9136..ae5772e98 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/RestResultTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/RestResultTest.java @@ -17,39 +17,39 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.apache.hugegraph.testutil.Utils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.Mockito; -import com.baidu.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GraphManager; import org.apache.hugegraph.rest.RestResult; -import com.baidu.hugegraph.serializer.PathDeserializer; -import com.baidu.hugegraph.structure.constant.Cardinality; -import com.baidu.hugegraph.structure.constant.DataType; -import com.baidu.hugegraph.structure.constant.Frequency; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.constant.IndexType; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.Response; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.serializer.PathDeserializer; +import org.apache.hugegraph.structure.constant.Cardinality; +import org.apache.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.constant.Frequency; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.constant.IndexType; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.Response; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.testutil.Utils; import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/SplicingIdGeneratorTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/SplicingIdGeneratorTest.java similarity index 96% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/SplicingIdGeneratorTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/SplicingIdGeneratorTest.java index bd9e23114..bc5eb36f6 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/SplicingIdGeneratorTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/SplicingIdGeneratorTest.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import java.util.List; +import org.apache.hugegraph.util.SplicingIdGenerator; import org.junit.Assert; import org.junit.Test; -import com.baidu.hugegraph.util.SplicingIdGenerator; import com.google.common.collect.ImmutableList; public class SplicingIdGeneratorTest { diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java index dcc54179b..fe2047093 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/VertexSerializerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/VertexSerializerTest.java similarity index 97% rename from hugegraph-client/src/test/java/com/baidu/hugegraph/unit/VertexSerializerTest.java rename to hugegraph-client/src/test/java/org/apache/hugegraph/unit/VertexSerializerTest.java index 4e7705536..616aed5da 100644 --- a/hugegraph-client/src/test/java/com/baidu/hugegraph/unit/VertexSerializerTest.java +++ b/hugegraph-client/src/test/java/org/apache/hugegraph/unit/VertexSerializerTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import java.util.Map; import org.junit.Test; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-hubble/hubble-be/pom.xml b/hugegraph-hubble/hubble-be/pom.xml index 37b1f9bcb..28a8821aa 100644 --- a/hugegraph-hubble/hubble-be/pom.xml +++ b/hugegraph-hubble/hubble-be/pom.xml @@ -130,7 +130,7 @@ true lib/ - com.baidu.hugegraph.HugeGraphHubble + org.apache.hugegraph.HugeGraphHubble @@ -145,7 +145,7 @@ true lib/ - com.baidu.hugegraph.HugeGraphHubble + org.apache.hugegraph.HugeGraphHubble diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/HugeGraphHubble.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/HugeGraphHubble.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/HugeGraphHubble.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/HugeGraphHubble.java index e5c2c7fdf..762e4f848 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/HugeGraphHubble.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/HugeGraphHubble.java @@ -17,9 +17,10 @@ * under the License. */ -package com.baidu.hugegraph; +package org.apache.hugegraph; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.util.Ex; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -27,11 +28,9 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.scheduling.annotation.EnableScheduling; -import com.baidu.hugegraph.util.Ex; - @SpringBootApplication @EnableScheduling -@MapperScan("com.baidu.hugegraph.mapper") +@MapperScan("org.apache.hugegraph.mapper") public class HugeGraphHubble extends SpringBootServletInitializer { public static void main(String[] args) { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/annotation/MergeProperty.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/annotation/MergeProperty.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/annotation/MergeProperty.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/annotation/MergeProperty.java index 1676db32b..4a438239b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/annotation/MergeProperty.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/annotation/MergeProperty.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; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Constant.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Constant.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Constant.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Constant.java index c7600a2c0..494258128 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Constant.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Constant.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.common; +package org.apache.hugegraph.common; import static java.nio.charset.StandardCharsets.UTF_8; @@ -40,7 +40,7 @@ public final class Constant { public static final String CONFIG_FILE = "hugegraph-hubble.properties"; public static final String CONTROLLER_PACKAGE = - "com.baidu.hugegraph.controller"; + "org.apache.hugegraph.controller"; public static final String COOKIE_USER = "user"; public static final String API_V1_1 = "/api/v1.1/"; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Identifiable.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Identifiable.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Identifiable.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Identifiable.java index 4d085105d..a6a04e866 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Identifiable.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Identifiable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.common; +package org.apache.hugegraph.common; public interface Identifiable { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Mergeable.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Mergeable.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Mergeable.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Mergeable.java index c43a17efd..203fe319c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Mergeable.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Mergeable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.common; +package org.apache.hugegraph.common; public interface Mergeable { } diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Response.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Response.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Response.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Response.java index 9f9644aec..273daf05d 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/common/Response.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/common/Response.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.common; +package org.apache.hugegraph.common; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/AsyncConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/AsyncConfig.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/AsyncConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/AsyncConfig.java index 28136b3df..32d02664b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/AsyncConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/AsyncConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import java.util.concurrent.Executor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/CacheConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/CacheConfig.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/CacheConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/CacheConfig.java index 634df4012..3612b5408 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/CacheConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/CacheConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import java.util.ArrayList; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/GlobalCorsConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/GlobalCorsConfig.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/GlobalCorsConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/GlobalCorsConfig.java index 48a72713d..35c710334 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/GlobalCorsConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/GlobalCorsConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/HubbleConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/HubbleConfig.java similarity index 88% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/HubbleConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/HubbleConfig.java index 75412f004..669c9ee2c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/HubbleConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/HubbleConfig.java @@ -17,20 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import java.io.File; -import org.apache.hugegraph.config.HugeConfig; -import org.apache.hugegraph.config.OptionSpace; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.options.HubbleOptions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.common.Constant; @Configuration public class HubbleConfig { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/JacksonConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/JacksonConfig.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/JacksonConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/JacksonConfig.java index df6906354..07295e834 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/JacksonConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/JacksonConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import java.io.IOException; import java.util.Map; @@ -26,9 +26,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; -import com.baidu.hugegraph.common.Response; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.common.Response; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/MybatisPlusConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/MybatisPlusConfig.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/MybatisPlusConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/MybatisPlusConfig.java index ee6389de4..37acd7398 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/MybatisPlusConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/MybatisPlusConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/TomcatServletConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/TomcatServletConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java index ff107bbd3..a39b3e7d9 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/TomcatServletConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java @@ -17,21 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; import java.net.InetAddress; import java.net.UnknownHostException; -import org.apache.hugegraph.config.HugeConfig; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.options.HubbleOptions; import org.apache.tomcat.util.http.LegacyCookieProcessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.options.HubbleOptions; - /** * Reference http://www.zizhixiaoshe.com/article/invalidcookie.html */ diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/WebMvcConfig.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/WebMvcConfig.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/WebMvcConfig.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/WebMvcConfig.java index 9aa39e44d..6ced26e8f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/config/WebMvcConfig.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/WebMvcConfig.java @@ -17,16 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.config; +package org.apache.hugegraph.config; +import org.apache.hugegraph.handler.CustomInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.baidu.hugegraph.handler.CustomInterceptor; - @Configuration public class WebMvcConfig implements WebMvcConfigurer { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/AboutController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/AboutController.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/AboutController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/AboutController.java index 77d42b788..f4b6e42ea 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/AboutController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/AboutController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller; +package org.apache.hugegraph.controller; import java.util.LinkedHashMap; import java.util.Map; @@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.handler.MessageSourceHandler; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.handler.MessageSourceHandler; @RestController @RequestMapping("about") diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/BaseController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/BaseController.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/BaseController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/BaseController.java index 9b356386d..ec646cc5a 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/BaseController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/BaseController.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.controller; +package org.apache.hugegraph.controller; import java.util.List; import org.springframework.util.StringUtils; -import com.baidu.hugegraph.common.Identifiable; -import com.baidu.hugegraph.common.Mergeable; -import com.baidu.hugegraph.util.EntityUtil; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.common.Identifiable; +import org.apache.hugegraph.common.Mergeable; +import org.apache.hugegraph.util.EntityUtil; +import org.apache.hugegraph.util.Ex; public abstract class BaseController { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/GraphConnectionController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/GraphConnectionController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/GraphConnectionController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/GraphConnectionController.java index 1c14c02a8..6a6000130 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/GraphConnectionController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/GraphConnectionController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller; +package org.apache.hugegraph.controller; import java.net.InetAddress; import java.net.UnknownHostException; @@ -36,19 +36,19 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.common.Response; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.common.Response; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.options.HubbleOptions; -import com.baidu.hugegraph.service.GraphConnectionService; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.service.SettingSSLService; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; -import com.baidu.hugegraph.util.HugeClientUtil; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.service.GraphConnectionService; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.service.SettingSSLService; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.HugeClientUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/SettingController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/SettingController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/SettingController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/SettingController.java index 351b68bd6..aa845a421 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/SettingController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/SettingController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller; +package org.apache.hugegraph.controller; import java.util.concurrent.TimeUnit; @@ -31,9 +31,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.UserInfo; -import com.baidu.hugegraph.service.UserInfoService; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.UserInfo; +import org.apache.hugegraph.service.UserInfoService; import org.apache.hugegraph.util.E; @RestController diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/algorithm/OltpAlgoController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/algorithm/OltpAlgoController.java similarity index 85% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/algorithm/OltpAlgoController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/algorithm/OltpAlgoController.java index ef7e27eeb..1ce7d35bb 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/algorithm/OltpAlgoController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/algorithm/OltpAlgoController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.algorithm; +package org.apache.hugegraph.controller.algorithm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -26,10 +26,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.algorithm.ShortestPath; -import com.baidu.hugegraph.entity.query.GremlinResult; -import com.baidu.hugegraph.service.algorithm.OltpAlgoService; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.algorithm.ShortestPath; +import org.apache.hugegraph.entity.query.GremlinResult; +import org.apache.hugegraph.service.algorithm.OltpAlgoService; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/graph/GraphController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/graph/GraphController.java similarity index 87% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/graph/GraphController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/graph/GraphController.java index ab03de11b..a765096c4 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/graph/GraphController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/graph/GraphController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.graph; +package org.apache.hugegraph.controller.graph; import java.util.Map; import java.util.Set; @@ -32,20 +32,20 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.util.UriUtils; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.controller.BaseController; -import com.baidu.hugegraph.entity.graph.EdgeEntity; -import com.baidu.hugegraph.entity.graph.VertexEntity; -import com.baidu.hugegraph.entity.query.GraphView; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.service.graph.GraphService; -import com.baidu.hugegraph.service.schema.EdgeLabelService; -import com.baidu.hugegraph.service.schema.VertexLabelService; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.controller.BaseController; +import org.apache.hugegraph.entity.graph.EdgeEntity; +import org.apache.hugegraph.entity.graph.VertexEntity; +import org.apache.hugegraph.entity.query.GraphView; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.service.graph.GraphService; +import org.apache.hugegraph.service.schema.EdgeLabelService; +import org.apache.hugegraph.service.schema.VertexLabelService; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.util.Ex; @RestController @RequestMapping(Constant.API_VERSION + "graph-connections/{connId}/graph") diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/FileMappingController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/FileMappingController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/FileMappingController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/FileMappingController.java index ee563b2cd..221661bfd 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/FileMappingController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/FileMappingController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.load; +package org.apache.hugegraph.controller.load; import java.util.List; import java.util.Set; @@ -35,26 +35,26 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.controller.BaseController; -import com.baidu.hugegraph.entity.enums.JobStatus; -import com.baidu.hugegraph.entity.load.EdgeMapping; -import com.baidu.hugegraph.entity.load.ElementMapping; -import com.baidu.hugegraph.entity.load.FileMapping; -import com.baidu.hugegraph.entity.load.FileSetting; -import com.baidu.hugegraph.entity.load.JobManager; -import com.baidu.hugegraph.entity.load.LoadParameter; -import com.baidu.hugegraph.entity.load.VertexMapping; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.load.FileMappingService; -import com.baidu.hugegraph.service.load.JobManagerService; -import com.baidu.hugegraph.service.schema.EdgeLabelService; -import com.baidu.hugegraph.service.schema.VertexLabelService; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.controller.BaseController; +import org.apache.hugegraph.entity.enums.JobStatus; +import org.apache.hugegraph.entity.load.EdgeMapping; +import org.apache.hugegraph.entity.load.ElementMapping; +import org.apache.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.FileSetting; +import org.apache.hugegraph.entity.load.JobManager; +import org.apache.hugegraph.entity.load.LoadParameter; +import org.apache.hugegraph.entity.load.VertexMapping; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.load.FileMappingService; +import org.apache.hugegraph.service.load.JobManagerService; +import org.apache.hugegraph.service.schema.EdgeLabelService; +import org.apache.hugegraph.service.schema.VertexLabelService; import org.apache.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/FileUploadController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/FileUploadController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/FileUploadController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/FileUploadController.java index c495fe05e..211314d9c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/FileUploadController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/FileUploadController.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.controller.load; +package org.apache.hugegraph.controller.load; -import static com.baidu.hugegraph.service.load.FileMappingService.CONN_PREIFX; -import static com.baidu.hugegraph.service.load.FileMappingService.JOB_PREIFX; +import static org.apache.hugegraph.service.load.FileMappingService.CONN_PREIFX; +import static org.apache.hugegraph.service.load.FileMappingService.JOB_PREIFX; import java.io.File; import java.io.IOException; @@ -45,21 +45,21 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.baidu.hugegraph.common.Constant; +import org.apache.hugegraph.common.Constant; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.entity.enums.FileMappingStatus; -import com.baidu.hugegraph.entity.enums.JobStatus; -import com.baidu.hugegraph.entity.load.FileMapping; -import com.baidu.hugegraph.entity.load.FileUploadResult; -import com.baidu.hugegraph.entity.load.JobManager; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.options.HubbleOptions; -import com.baidu.hugegraph.service.load.FileMappingService; -import com.baidu.hugegraph.service.load.JobManagerService; +import org.apache.hugegraph.entity.enums.FileMappingStatus; +import org.apache.hugegraph.entity.enums.JobStatus; +import org.apache.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.FileUploadResult; +import org.apache.hugegraph.entity.load.JobManager; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.service.load.FileMappingService; +import org.apache.hugegraph.service.load.JobManagerService; import org.apache.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.FileUtil; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.FileUtil; +import org.apache.hugegraph.util.HubbleUtil; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/JobManagerController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/JobManagerController.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/JobManagerController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/JobManagerController.java index e6997d6fe..f4b5052a5 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/JobManagerController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/JobManagerController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.load; +package org.apache.hugegraph.controller.load; import java.util.ArrayList; import java.util.List; @@ -34,21 +34,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.common.Response; -import com.baidu.hugegraph.entity.enums.JobStatus; -import com.baidu.hugegraph.entity.enums.LoadStatus; -import com.baidu.hugegraph.entity.load.FileMapping; -import com.baidu.hugegraph.entity.load.JobManager; -import com.baidu.hugegraph.entity.load.JobManagerReasonResult; -import com.baidu.hugegraph.entity.load.LoadTask; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.service.load.FileMappingService; -import com.baidu.hugegraph.service.load.JobManagerService; -import com.baidu.hugegraph.service.load.LoadTaskService; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.common.Response; +import org.apache.hugegraph.entity.enums.JobStatus; +import org.apache.hugegraph.entity.enums.LoadStatus; +import org.apache.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.JobManager; +import org.apache.hugegraph.entity.load.JobManagerReasonResult; +import org.apache.hugegraph.entity.load.LoadTask; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.service.load.FileMappingService; +import org.apache.hugegraph.service.load.JobManagerService; +import org.apache.hugegraph.service.load.LoadTaskService; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/LoadTaskController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/LoadTaskController.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/LoadTaskController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/LoadTaskController.java index cdde4830b..d05600242 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/load/LoadTaskController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/load/LoadTaskController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.load; +package org.apache.hugegraph.controller.load; import java.util.ArrayList; import java.util.List; @@ -32,21 +32,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.common.Response; -import com.baidu.hugegraph.controller.BaseController; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.entity.enums.JobStatus; -import com.baidu.hugegraph.entity.load.FileMapping; -import com.baidu.hugegraph.entity.load.JobManager; -import com.baidu.hugegraph.entity.load.LoadTask; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.GraphConnectionService; -import com.baidu.hugegraph.service.load.FileMappingService; -import com.baidu.hugegraph.service.load.JobManagerService; -import com.baidu.hugegraph.service.load.LoadTaskService; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.common.Response; +import org.apache.hugegraph.controller.BaseController; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.entity.enums.JobStatus; +import org.apache.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.JobManager; +import org.apache.hugegraph.entity.load.LoadTask; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.GraphConnectionService; +import org.apache.hugegraph.service.load.FileMappingService; +import org.apache.hugegraph.service.load.JobManagerService; +import org.apache.hugegraph.service.load.LoadTaskService; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/ExecuteHistoryController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/ExecuteHistoryController.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/ExecuteHistoryController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/ExecuteHistoryController.java index a23cb6814..75e8eb303 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/ExecuteHistoryController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/ExecuteHistoryController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.query; +package org.apache.hugegraph.controller.query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.query.ExecuteHistory; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.query.ExecuteHistoryService; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.query.ExecuteHistory; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.query.ExecuteHistoryService; import com.baomidou.mybatisplus.core.metadata.IPage; @RestController diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinCollectionController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinCollectionController.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinCollectionController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinCollectionController.java index da6fadd41..ac9f9215f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinCollectionController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinCollectionController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.query; +package org.apache.hugegraph.controller.query; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -31,12 +31,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.query.GremlinCollection; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.query.GremlinCollectionService; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.query.GremlinCollection; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.query.GremlinCollectionService; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; @RestController diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinController.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinController.java index d37df9d47..e914e67f1 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinController.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.controller.query; +package org.apache.hugegraph.controller.query; import java.util.regex.Pattern; -import com.baidu.hugegraph.controller.BaseController; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.controller.BaseController; +import org.apache.hugegraph.util.Ex; public abstract class GremlinController extends BaseController { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinQueryController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinQueryController.java similarity index 89% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinQueryController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinQueryController.java index ac863c18c..d6a7c1fbc 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/query/GremlinQueryController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/query/GremlinQueryController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.query; +package org.apache.hugegraph.controller.query; import java.util.Date; import java.util.Set; @@ -33,19 +33,19 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.enums.AsyncTaskStatus; -import com.baidu.hugegraph.entity.enums.ExecuteStatus; -import com.baidu.hugegraph.entity.enums.ExecuteType; -import com.baidu.hugegraph.entity.query.AdjacentQuery; -import com.baidu.hugegraph.entity.query.ExecuteHistory; -import com.baidu.hugegraph.entity.query.GremlinQuery; -import com.baidu.hugegraph.entity.query.GremlinResult; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.query.ExecuteHistoryService; -import com.baidu.hugegraph.service.query.GremlinQueryService; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.enums.AsyncTaskStatus; +import org.apache.hugegraph.entity.enums.ExecuteStatus; +import org.apache.hugegraph.entity.enums.ExecuteType; +import org.apache.hugegraph.entity.query.AdjacentQuery; +import org.apache.hugegraph.entity.query.ExecuteHistory; +import org.apache.hugegraph.entity.query.GremlinQuery; +import org.apache.hugegraph.entity.query.GremlinResult; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.query.ExecuteHistoryService; +import org.apache.hugegraph.service.query.GremlinQueryService; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.google.common.collect.ImmutableSet; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/EdgeLabelController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/EdgeLabelController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/EdgeLabelController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/EdgeLabelController.java index a835c229f..3f9e769bb 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/EdgeLabelController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/EdgeLabelController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.schema; +package org.apache.hugegraph.controller.schema; import java.util.HashSet; import java.util.List; @@ -36,20 +36,20 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.schema.ConflictCheckEntity; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.EdgeLabelStyle; -import com.baidu.hugegraph.entity.schema.EdgeLabelUpdateEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.service.schema.EdgeLabelService; -import com.baidu.hugegraph.service.schema.PropertyIndexService; -import com.baidu.hugegraph.service.schema.PropertyKeyService; -import com.baidu.hugegraph.service.schema.VertexLabelService; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.schema.ConflictCheckEntity; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.EdgeLabelStyle; +import org.apache.hugegraph.entity.schema.EdgeLabelUpdateEntity; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.service.schema.EdgeLabelService; +import org.apache.hugegraph.service.schema.PropertyIndexService; +import org.apache.hugegraph.service.schema.PropertyKeyService; +import org.apache.hugegraph.service.schema.VertexLabelService; import org.apache.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/PropertyIndexController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/PropertyIndexController.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/PropertyIndexController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/PropertyIndexController.java index 1949e310a..d2d6a73c4 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/PropertyIndexController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/PropertyIndexController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.schema; +package org.apache.hugegraph.controller.schema; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; @@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.schema.PropertyIndex; -import com.baidu.hugegraph.service.schema.PropertyIndexService; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.schema.PropertyIndex; +import org.apache.hugegraph.service.schema.PropertyIndexService; +import org.apache.hugegraph.structure.constant.HugeType; import com.baomidou.mybatisplus.core.metadata.IPage; @RestController diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/PropertyKeyController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/PropertyKeyController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/PropertyKeyController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/PropertyKeyController.java index d92646e8f..70f9dfb4d 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/PropertyKeyController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/PropertyKeyController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.schema; +package org.apache.hugegraph.controller.schema; import java.util.LinkedHashMap; import java.util.List; @@ -34,15 +34,15 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.schema.ConflictCheckEntity; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.PropertyKeyEntity; -import com.baidu.hugegraph.entity.schema.UsingCheckEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.schema.PropertyKeyService; -import com.baidu.hugegraph.util.HubbleUtil; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.schema.ConflictCheckEntity; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.PropertyKeyEntity; +import org.apache.hugegraph.entity.schema.UsingCheckEntity; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.schema.PropertyKeyService; +import org.apache.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.Ex; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/SchemaController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/SchemaController.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/SchemaController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/SchemaController.java index fa31f708e..4a88eec30 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/SchemaController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/SchemaController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.schema; +package org.apache.hugegraph.controller.schema; import java.util.ArrayList; import java.util.Comparator; @@ -36,24 +36,24 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.controller.BaseController; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.LabelUpdateEntity; -import com.baidu.hugegraph.entity.schema.Property; -import com.baidu.hugegraph.entity.schema.PropertyIndex; -import com.baidu.hugegraph.entity.schema.PropertyKeyEntity; -import com.baidu.hugegraph.entity.schema.SchemaEntity; -import com.baidu.hugegraph.entity.schema.SchemaLabelEntity; -import com.baidu.hugegraph.entity.schema.Timefiable; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.service.schema.EdgeLabelService; -import com.baidu.hugegraph.service.schema.PropertyKeyService; -import com.baidu.hugegraph.service.schema.VertexLabelService; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.PageUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.controller.BaseController; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.LabelUpdateEntity; +import org.apache.hugegraph.entity.schema.Property; +import org.apache.hugegraph.entity.schema.PropertyIndex; +import org.apache.hugegraph.entity.schema.PropertyKeyEntity; +import org.apache.hugegraph.entity.schema.SchemaEntity; +import org.apache.hugegraph.entity.schema.SchemaLabelEntity; +import org.apache.hugegraph.entity.schema.Timefiable; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.service.schema.EdgeLabelService; +import org.apache.hugegraph.service.schema.PropertyKeyService; +import org.apache.hugegraph.service.schema.VertexLabelService; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.PageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/VertexLabelController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/VertexLabelController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/VertexLabelController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/VertexLabelController.java index 13fdacaec..993e68f0e 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/schema/VertexLabelController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/schema/VertexLabelController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.schema; +package org.apache.hugegraph.controller.schema; import java.util.HashSet; import java.util.LinkedHashMap; @@ -38,21 +38,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.schema.ConflictCheckEntity; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.UsingCheckEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelStyle; -import com.baidu.hugegraph.entity.schema.VertexLabelUpdateEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.schema.PropertyIndexService; -import com.baidu.hugegraph.service.schema.PropertyKeyService; -import com.baidu.hugegraph.service.schema.VertexLabelService; -import com.baidu.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.schema.ConflictCheckEntity; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.UsingCheckEntity; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.entity.schema.VertexLabelStyle; +import org.apache.hugegraph.entity.schema.VertexLabelUpdateEntity; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.schema.PropertyIndexService; +import org.apache.hugegraph.service.schema.PropertyKeyService; +import org.apache.hugegraph.service.schema.VertexLabelService; +import org.apache.hugegraph.structure.constant.IdStrategy; import org.apache.hugegraph.util.CollectionUtil; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/task/AsyncTaskController.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/task/AsyncTaskController.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/task/AsyncTaskController.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/task/AsyncTaskController.java index 5cba1f0e8..48e2c1007 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/controller/task/AsyncTaskController.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/controller/task/AsyncTaskController.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.controller.task; +package org.apache.hugegraph.controller.task; import java.util.List; @@ -30,11 +30,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.controller.BaseController; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.service.algorithm.AsyncTaskService; -import com.baidu.hugegraph.structure.Task; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.controller.BaseController; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.algorithm.AsyncTaskService; +import org.apache.hugegraph.structure.Task; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/GraphConnection.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/GraphConnection.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/GraphConnection.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/GraphConnection.java index 1da361e6e..5d667747a 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/GraphConnection.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/GraphConnection.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.entity; +package org.apache.hugegraph.entity; import java.util.Date; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Identifiable; -import com.baidu.hugegraph.common.Mergeable; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Identifiable; +import org.apache.hugegraph.common.Mergeable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/UserInfo.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/UserInfo.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/UserInfo.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/UserInfo.java index d1fdac931..52ae138e6 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/UserInfo.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/UserInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity; +package org.apache.hugegraph.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/algorithm/ShortestPath.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/algorithm/ShortestPath.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/algorithm/ShortestPath.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/algorithm/ShortestPath.java index 1d07a22c1..55d64095f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/algorithm/ShortestPath.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/algorithm/ShortestPath.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.entity.algorithm; +package org.apache.hugegraph.entity.algorithm; -import com.baidu.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.Direction; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/AsyncTaskStatus.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/AsyncTaskStatus.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/AsyncTaskStatus.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/AsyncTaskStatus.java index 55ad62a6f..472e4a690 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/AsyncTaskStatus.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/AsyncTaskStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/ExecuteStatus.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/ExecuteStatus.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/ExecuteStatus.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/ExecuteStatus.java index 3709aa199..05d666224 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/ExecuteStatus.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/ExecuteStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/ExecuteType.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/ExecuteType.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/ExecuteType.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/ExecuteType.java index 135bc61c2..745f96f1e 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/ExecuteType.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/ExecuteType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/FileMappingStatus.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/FileMappingStatus.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/FileMappingStatus.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/FileMappingStatus.java index 785e1285c..7608ea32f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/FileMappingStatus.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/FileMappingStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/JobStatus.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/JobStatus.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/JobStatus.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/JobStatus.java index d737d321a..14828e12a 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/JobStatus.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/JobStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/LoadAction.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/LoadAction.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/LoadAction.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/LoadAction.java index ed7ce164d..90a72fd24 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/LoadAction.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/LoadAction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/LoadStatus.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/LoadStatus.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/LoadStatus.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/LoadStatus.java index 0846ca520..169e8499e 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/enums/LoadStatus.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/enums/LoadStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.enums; +package org.apache.hugegraph.entity.enums; import com.baomidou.mybatisplus.core.enums.IEnum; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/graph/EdgeEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/graph/EdgeEntity.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/graph/EdgeEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/graph/EdgeEntity.java index 37630a379..a449c6c15 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/graph/EdgeEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/graph/EdgeEntity.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.entity.graph; +package org.apache.hugegraph.entity.graph; import java.util.Map; -import com.baidu.hugegraph.common.Identifiable; +import org.apache.hugegraph.common.Identifiable; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/graph/VertexEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/graph/VertexEntity.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/graph/VertexEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/graph/VertexEntity.java index df6e1b16c..4a7ea1765 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/graph/VertexEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/graph/VertexEntity.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.entity.graph; +package org.apache.hugegraph.entity.graph; import java.util.Map; -import com.baidu.hugegraph.common.Identifiable; +import org.apache.hugegraph.common.Identifiable; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/EdgeMapping.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/EdgeMapping.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/EdgeMapping.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/EdgeMapping.java index 863e76aac..962d6f285 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/EdgeMapping.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/EdgeMapping.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.List; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ElementMapping.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ElementMapping.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ElementMapping.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ElementMapping.java index c07c4bff3..ad4ee86b5 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ElementMapping.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ElementMapping.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Mergeable; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Mergeable; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FieldMappingItem.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FieldMappingItem.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FieldMappingItem.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FieldMappingItem.java index c5e7bcb8a..aecf151eb 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FieldMappingItem.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FieldMappingItem.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileMapping.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileMapping.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileMapping.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileMapping.java index 7585c54c8..b162e5408 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileMapping.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileMapping.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.Date; import java.util.HashSet; @@ -25,12 +25,12 @@ import java.util.Set; import java.util.stream.Collectors; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.entity.enums.FileMappingStatus; -import com.baidu.hugegraph.handler.EdgeMappingTypeHandler; -import com.baidu.hugegraph.handler.VertexMappingTypeHandler; -import com.baidu.hugegraph.util.HubbleUtil; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.entity.enums.FileMappingStatus; +import org.apache.hugegraph.handler.EdgeMappingTypeHandler; +import org.apache.hugegraph.handler.VertexMappingTypeHandler; +import org.apache.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.SerializeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileSetting.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileSetting.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileSetting.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileSetting.java index 85febb947..15f33d526 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileSetting.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileSetting.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.io.IOException; import java.util.List; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.common.Mergeable; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.common.Mergeable; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileUploadResult.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileUploadResult.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileUploadResult.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileUploadResult.java index 53b26f717..36536d680 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/FileUploadResult.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/FileUploadResult.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.util.SerializeUtil; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManager.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManager.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManager.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManager.java index 40c8c909e..f23cdc6be 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManager.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManager.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.Date; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.entity.enums.JobStatus; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.entity.enums.JobStatus; +import org.apache.hugegraph.util.SerializeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManagerItem.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManagerItem.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManagerItem.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManagerItem.java index 852fa1e6c..397c85f85 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManagerItem.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManagerItem.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.util.SerializeUtil; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManagerReasonResult.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManagerReasonResult.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManagerReasonResult.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManagerReasonResult.java index 0cfdd7f6d..722b5d3ed 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/JobManagerReasonResult.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/JobManagerReasonResult.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ListFormat.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ListFormat.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ListFormat.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ListFormat.java index 8869d1701..830bd0c08 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ListFormat.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ListFormat.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import com.baidu.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.Constants; import com.fasterxml.jackson.annotation.JsonProperty; public final class ListFormat { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/LoadParameter.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/LoadParameter.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/LoadParameter.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/LoadParameter.java index 723348549..4739539d1 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/LoadParameter.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/LoadParameter.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Mergeable; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Mergeable; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/LoadTask.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/LoadTask.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/LoadTask.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/LoadTask.java index 2f5376cce..3d18892fc 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/LoadTask.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/LoadTask.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.Date; import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.entity.enums.LoadStatus; -import com.baidu.hugegraph.loader.HugeGraphLoader; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.entity.enums.LoadStatus; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.loader.HugeGraphLoader; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.SerializeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/NullValues.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/NullValues.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/NullValues.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/NullValues.java index f8ce4ed8b..3395cea5a 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/NullValues.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/NullValues.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.Set; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ValueMappingItem.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ValueMappingItem.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ValueMappingItem.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ValueMappingItem.java index 31995f77c..fe31aed94 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/ValueMappingItem.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/ValueMappingItem.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.List; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/VertexMapping.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/VertexMapping.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/VertexMapping.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/VertexMapping.java index 2c2362949..f614acfb7 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/load/VertexMapping.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/load/VertexMapping.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.entity.load; +package org.apache.hugegraph.entity.load; import java.util.List; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/AdjacentQuery.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/AdjacentQuery.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/AdjacentQuery.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/AdjacentQuery.java index 970a58b01..d45d36b63 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/AdjacentQuery.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/AdjacentQuery.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/ExecuteHistory.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/ExecuteHistory.java similarity index 86% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/ExecuteHistory.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/ExecuteHistory.java index da41cec44..e701457ee 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/ExecuteHistory.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/ExecuteHistory.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.Date; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Identifiable; -import com.baidu.hugegraph.common.Mergeable; -import com.baidu.hugegraph.entity.enums.AsyncTaskStatus; -import com.baidu.hugegraph.entity.enums.ExecuteStatus; -import com.baidu.hugegraph.entity.enums.ExecuteType; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Identifiable; +import org.apache.hugegraph.common.Mergeable; +import org.apache.hugegraph.entity.enums.AsyncTaskStatus; +import org.apache.hugegraph.entity.enums.ExecuteStatus; +import org.apache.hugegraph.entity.enums.ExecuteType; +import org.apache.hugegraph.util.SerializeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GraphView.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GraphView.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GraphView.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GraphView.java index 2a546102a..a9126c5e5 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GraphView.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GraphView.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.Collection; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinCollection.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinCollection.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinCollection.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinCollection.java index 3c6310afb..fd0dced4c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinCollection.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinCollection.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.Date; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Identifiable; -import com.baidu.hugegraph.common.Mergeable; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Identifiable; +import org.apache.hugegraph.common.Mergeable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinQuery.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinQuery.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinQuery.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinQuery.java index 442352975..75abbd72c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinQuery.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinResult.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinResult.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinResult.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinResult.java index 29a2212e4..d37222403 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/GremlinResult.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/GremlinResult.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/JsonView.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/JsonView.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/JsonView.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/JsonView.java index 6aa09f9cc..5cf4d2185 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/JsonView.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/JsonView.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/TableView.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/TableView.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/TableView.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/TableView.java index 06577fa2e..9b24e7e1c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/TableView.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/TableView.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/TypedResult.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/TypedResult.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/TypedResult.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/TypedResult.java index 15f7c7c3b..5b7d64055 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/query/TypedResult.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/query/TypedResult.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.query; +package org.apache.hugegraph.entity.query; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictCheckEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictCheckEntity.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictCheckEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictCheckEntity.java index 96c6ddb29..65ec7e957 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictCheckEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictCheckEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictDetail.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictDetail.java similarity index 99% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictDetail.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictDetail.java index ebdd75895..e2b4d0176 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictDetail.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictDetail.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.ArrayList; import java.util.Collection; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictStatus.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictStatus.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictStatus.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictStatus.java index d85492664..f4d38852e 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/ConflictStatus.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/ConflictStatus.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; public enum ConflictStatus { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelEntity.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelEntity.java index 6a56a47d1..1d2b38cb4 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelEntity.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.Date; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.HubbleUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelStyle.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelStyle.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelStyle.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelStyle.java index c4fc61184..4b858b2a9 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelStyle.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelStyle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelUpdateEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelUpdateEntity.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelUpdateEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelUpdateEntity.java index d23d9a859..1667b7510 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/EdgeLabelUpdateEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/EdgeLabelUpdateEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/LabelUpdateEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/LabelUpdateEntity.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/LabelUpdateEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/LabelUpdateEntity.java index 29ee98295..9a3bb077d 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/LabelUpdateEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/LabelUpdateEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.Collections; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Property.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Property.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Property.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Property.java index 8f0ea1ba2..7dff3b34c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Property.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Property.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/PropertyIndex.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/PropertyIndex.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/PropertyIndex.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/PropertyIndex.java index 8be71993e..3bcad6313 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/PropertyIndex.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/PropertyIndex.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.List; -import com.baidu.hugegraph.structure.constant.IndexType; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.structure.constant.IndexType; +import org.apache.hugegraph.util.HubbleUtil; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/PropertyKeyEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/PropertyKeyEntity.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/PropertyKeyEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/PropertyKeyEntity.java index ca09e008a..6e22e48fd 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/PropertyKeyEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/PropertyKeyEntity.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.Date; -import com.baidu.hugegraph.structure.constant.Cardinality; -import com.baidu.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.constant.Cardinality; +import org.apache.hugegraph.structure.constant.DataType; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaConflict.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaConflict.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java index 1e11c6055..6970ed97f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaConflict.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaConflict.java @@ -2,7 +2,7 @@ * Copyright (C) 2019 Baidu, Inc. All Rights Reserved. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaEntity.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaEntity.java index 1a733de4e..6a8eff0f9 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; public interface SchemaEntity extends Typifiable { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaLabelEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaLabelEntity.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaLabelEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaLabelEntity.java index 753229845..6ed9a7b0f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaLabelEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaLabelEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.Collections; import java.util.HashSet; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaStyle.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaStyle.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaStyle.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaStyle.java index 15a5a38aa..889564c0a 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaStyle.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaStyle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; public class SchemaStyle { } diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaType.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaType.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaType.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaType.java index 4e0709455..3b588280b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/SchemaType.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/SchemaType.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.structure.constant.HugeType; public enum SchemaType { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Timefiable.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Timefiable.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Timefiable.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Timefiable.java index 089f36370..5b69ba7d1 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Timefiable.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Timefiable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.Date; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Typifiable.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Typifiable.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Typifiable.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Typifiable.java index 2ace2a010..10c774a27 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/Typifiable.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/Typifiable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/UsingCheckEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/UsingCheckEntity.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/UsingCheckEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/UsingCheckEntity.java index 02191164b..09e1435a8 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/UsingCheckEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/UsingCheckEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelEntity.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelEntity.java index 4e0f020fa..dd09203af 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelEntity.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.Date; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.util.HubbleUtil; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelStyle.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelStyle.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelStyle.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelStyle.java index 1771a8000..b5df2969f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelStyle.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelStyle.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelUpdateEntity.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelUpdateEntity.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelUpdateEntity.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelUpdateEntity.java index 6d99b9706..dbfa9f1db 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/schema/VertexLabelUpdateEntity.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/schema/VertexLabelUpdateEntity.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.entity.schema; +package org.apache.hugegraph.entity.schema; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/task/AsyncTask.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/task/AsyncTask.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/task/AsyncTask.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/task/AsyncTask.java index 6e278e17e..a0fa9520c 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/task/AsyncTask.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/task/AsyncTask.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.entity.task; +package org.apache.hugegraph.entity.task; import java.util.Date; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.util.SerializeUtil; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.util.SerializeUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/task/AsyncTaskResult.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/task/AsyncTaskResult.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/task/AsyncTaskResult.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/task/AsyncTaskResult.java index aa26fbd9f..10287947b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/entity/task/AsyncTaskResult.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/entity/task/AsyncTaskResult.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.entity.task; +package org.apache.hugegraph.entity.task; -import com.baidu.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.annotation.MergeProperty; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/ExternalException.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/ExternalException.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/ExternalException.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/ExternalException.java index 02f9d86a8..b2fc81b24 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/ExternalException.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/ExternalException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; public class ExternalException extends ParameterizedException { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/IllegalGremlinException.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/IllegalGremlinException.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/IllegalGremlinException.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/IllegalGremlinException.java index de2755fc7..9c8f81247 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/IllegalGremlinException.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/IllegalGremlinException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; public class IllegalGremlinException extends RuntimeException { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/InternalException.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/InternalException.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/InternalException.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/InternalException.java index 3904bf35c..4c0965bfe 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/InternalException.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/InternalException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; public class InternalException extends ParameterizedException { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/ParameterizedException.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/ParameterizedException.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/ParameterizedException.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/ParameterizedException.java index 195fe8ad7..1cb456271 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/exception/ParameterizedException.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/exception/ParameterizedException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; public class ParameterizedException extends RuntimeException { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/CustomApplicationRunner.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/CustomApplicationRunner.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/CustomApplicationRunner.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/CustomApplicationRunner.java index 4d5dac0d8..bca5db960 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/CustomApplicationRunner.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/CustomApplicationRunner.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; +import org.apache.hugegraph.license.ServerInfo; +import org.apache.hugegraph.options.HubbleOptions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.license.ServerInfo; -import com.baidu.hugegraph.options.HubbleOptions; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/CustomInterceptor.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/CustomInterceptor.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/CustomInterceptor.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/CustomInterceptor.java index 1f9dab895..5c2c6b7a6 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/CustomInterceptor.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/CustomInterceptor.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; import java.util.regex.Pattern; @@ -25,13 +25,12 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.service.license.LicenseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.service.license.LicenseService; - import lombok.extern.log4j.Log4j2; @Log4j2 diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/EdgeMappingTypeHandler.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/EdgeMappingTypeHandler.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/EdgeMappingTypeHandler.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/EdgeMappingTypeHandler.java index 2599b3e02..c2ef8dfb8 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/EdgeMappingTypeHandler.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/EdgeMappingTypeHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -30,8 +30,8 @@ import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import com.baidu.hugegraph.entity.load.EdgeMapping; -import com.baidu.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.entity.load.EdgeMapping; +import org.apache.hugegraph.loader.util.JsonUtil; @MappedTypes(value = {EdgeMapping.class}) @MappedJdbcTypes(value = {JdbcType.VARCHAR}) diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/ExceptionAdvisor.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/ExceptionAdvisor.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/ExceptionAdvisor.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/ExceptionAdvisor.java index 436d963eb..0b2a9bd78 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/ExceptionAdvisor.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/ExceptionAdvisor.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.exception.IllegalGremlinException; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.exception.ParameterizedException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.common.Response; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.IllegalGremlinException; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.exception.ParameterizedException; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.common.Response; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/HubbleDisposableBean.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/HubbleDisposableBean.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/HubbleDisposableBean.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/HubbleDisposableBean.java index ef9c2fcde..752423378 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/HubbleDisposableBean.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/HubbleDisposableBean.java @@ -17,14 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; +import org.apache.hugegraph.service.load.LoadTaskService; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.service.load.LoadTaskService; - import lombok.extern.log4j.Log4j2; @Log4j2 diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/LoadTaskExecutor.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/LoadTaskExecutor.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/LoadTaskExecutor.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/LoadTaskExecutor.java index febac01e1..9db76cba4 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/LoadTaskExecutor.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/LoadTaskExecutor.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.load.LoadTask; +import org.apache.hugegraph.entity.load.LoadTask; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/MessageSourceHandler.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/MessageSourceHandler.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/MessageSourceHandler.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/MessageSourceHandler.java index cf07c1ddb..5bfe2b854 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/MessageSourceHandler.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/MessageSourceHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; import java.util.Locale; @@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.LocaleUtils; +import org.apache.hugegraph.service.UserInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.MessageSource; import org.springframework.context.NoSuchMessageException; @@ -34,9 +35,8 @@ import org.springframework.web.servlet.support.RequestContextUtils; import org.springframework.web.util.WebUtils; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.entity.UserInfo; -import com.baidu.hugegraph.service.UserInfoService; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.UserInfo; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/ResponseAdvisor.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/ResponseAdvisor.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/ResponseAdvisor.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/ResponseAdvisor.java index 21ecb5958..5add980a2 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/ResponseAdvisor.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/ResponseAdvisor.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; import org.springframework.core.MethodParameter; import org.springframework.http.HttpStatus; @@ -28,9 +28,9 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; -import com.baidu.hugegraph.common.Response; +import org.apache.hugegraph.common.Response; -@RestControllerAdvice(basePackages = "com.baidu.hugegraph.controller") +@RestControllerAdvice(basePackages = "org.apache.hugegraph.controller") public class ResponseAdvisor implements ResponseBodyAdvice { @Override diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/VertexMappingTypeHandler.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/VertexMappingTypeHandler.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/VertexMappingTypeHandler.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/VertexMappingTypeHandler.java index 6d9a514de..02e902953 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/handler/VertexMappingTypeHandler.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/handler/VertexMappingTypeHandler.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.handler; +package org.apache.hugegraph.handler; import java.sql.CallableStatement; import java.sql.PreparedStatement; @@ -30,8 +30,8 @@ import org.apache.ibatis.type.MappedJdbcTypes; import org.apache.ibatis.type.MappedTypes; -import com.baidu.hugegraph.entity.load.VertexMapping; -import com.baidu.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.entity.load.VertexMapping; +import org.apache.hugegraph.loader.util.JsonUtil; @MappedTypes(value = {VertexMapping.class}) @MappedJdbcTypes(value = {JdbcType.VARCHAR}) diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/license/ServerInfo.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/license/ServerInfo.java similarity index 97% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/license/ServerInfo.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/license/ServerInfo.java index 07d2a1076..b5b5adc5b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/license/ServerInfo.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/license/ServerInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.license; +package org.apache.hugegraph.license; import org.apache.hugegraph.license.MachineInfo; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/GraphConnectionMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/GraphConnectionMapper.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/GraphConnectionMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/GraphConnectionMapper.java index 345091de4..d25c568d4 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/GraphConnectionMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/GraphConnectionMapper.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.mapper; +package org.apache.hugegraph.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.entity.GraphConnection; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/UserInfoMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/UserInfoMapper.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/UserInfoMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/UserInfoMapper.java index 6c5e6ca57..ae2bec3c0 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/UserInfoMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/UserInfoMapper.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.mapper; +package org.apache.hugegraph.mapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.UserInfo; +import org.apache.hugegraph.entity.UserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/algorithm/AsyncTaskMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/algorithm/AsyncTaskMapper.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/algorithm/AsyncTaskMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/algorithm/AsyncTaskMapper.java index 177751903..184f279da 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/algorithm/AsyncTaskMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/algorithm/AsyncTaskMapper.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.mapper.algorithm; +package org.apache.hugegraph.mapper.algorithm; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.task.AsyncTask; +import org.apache.hugegraph.entity.task.AsyncTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/FileMappingMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/FileMappingMapper.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/FileMappingMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/FileMappingMapper.java index 184a6e43d..925a944ea 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/FileMappingMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/FileMappingMapper.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.mapper.load; +package org.apache.hugegraph.mapper.load; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.FileMapping; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/JobManagerMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/JobManagerMapper.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/JobManagerMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/JobManagerMapper.java index 9e234da23..9f4dc0bf7 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/JobManagerMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/JobManagerMapper.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.mapper.load; +package org.apache.hugegraph.mapper.load; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.load.JobManager; -import com.baidu.hugegraph.entity.load.JobManagerItem; +import org.apache.hugegraph.entity.load.JobManager; +import org.apache.hugegraph.entity.load.JobManagerItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/LoadTaskMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/LoadTaskMapper.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/LoadTaskMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/LoadTaskMapper.java index 8101ebdbc..df6e5996d 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/load/LoadTaskMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/load/LoadTaskMapper.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.mapper.load; +package org.apache.hugegraph.mapper.load; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.load.LoadTask; +import org.apache.hugegraph.entity.load.LoadTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/query/ExecuteHistoryMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/query/ExecuteHistoryMapper.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/query/ExecuteHistoryMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/query/ExecuteHistoryMapper.java index c813f3ba7..cfe127187 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/query/ExecuteHistoryMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/query/ExecuteHistoryMapper.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.mapper.query; +package org.apache.hugegraph.mapper.query; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.query.ExecuteHistory; +import org.apache.hugegraph.entity.query.ExecuteHistory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/query/GremlinCollectionMapper.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/query/GremlinCollectionMapper.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/query/GremlinCollectionMapper.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/query/GremlinCollectionMapper.java index df8cc182c..8b354e385 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/mapper/query/GremlinCollectionMapper.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/mapper/query/GremlinCollectionMapper.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.mapper.query; +package org.apache.hugegraph.mapper.query; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Component; -import com.baidu.hugegraph.entity.query.GremlinCollection; +import org.apache.hugegraph.entity.query.GremlinCollection; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/options/HubbleOptions.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/options/HubbleOptions.java similarity index 99% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/options/HubbleOptions.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/options/HubbleOptions.java index 3c8a902a8..76d7fa251 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/options/HubbleOptions.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/options/HubbleOptions.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.options; +package org.apache.hugegraph.options; import static org.apache.hugegraph.config.OptionChecker.allowValues; import static org.apache.hugegraph.config.OptionChecker.disallowEmpty; @@ -30,7 +30,7 @@ import org.apache.hugegraph.config.ConfigOption; import org.apache.hugegraph.config.OptionHolder; import org.apache.hugegraph.util.Bytes; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.util.HubbleUtil; public class HubbleOptions extends OptionHolder { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/GraphConnectionService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/GraphConnectionService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/GraphConnectionService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/GraphConnectionService.java index 3073acf3e..feba5f02b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/GraphConnectionService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/GraphConnectionService.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.service; +package org.apache.hugegraph.service; import java.util.List; +import org.apache.hugegraph.exception.InternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.mapper.GraphConnectionMapper; -import com.baidu.hugegraph.util.SQLUtil; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.mapper.GraphConnectionMapper; +import org.apache.hugegraph.util.SQLUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/HugeClientPoolService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/HugeClientPoolService.java similarity index 89% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/HugeClientPoolService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/HugeClientPoolService.java index 0f9b9cb99..59700cbc3 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/HugeClientPoolService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/HugeClientPoolService.java @@ -17,21 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.service; +package org.apache.hugegraph.service; import java.util.concurrent.ConcurrentHashMap; import javax.annotation.PreDestroy; +import org.apache.hugegraph.exception.ExternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.options.HubbleOptions; -import com.baidu.hugegraph.util.HugeClientUtil; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.util.HugeClientUtil; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/SettingSSLService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/SettingSSLService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/SettingSSLService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/SettingSSLService.java index 089a4e69e..e6a80546a 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/SettingSSLService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/SettingSSLService.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.service; +package org.apache.hugegraph.service; import org.springframework.stereotype.Service; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.options.HubbleOptions; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/UserInfoService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/UserInfoService.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/UserInfoService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/UserInfoService.java index 5c79e0c7d..f2536b373 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/UserInfoService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/UserInfoService.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.service; +package org.apache.hugegraph.service; +import org.apache.hugegraph.exception.InternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.entity.UserInfo; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.mapper.UserInfoMapper; +import org.apache.hugegraph.entity.UserInfo; +import org.apache.hugegraph.mapper.UserInfoMapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/algorithm/AsyncTaskService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/algorithm/AsyncTaskService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/algorithm/AsyncTaskService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/algorithm/AsyncTaskService.java index 76cb1a99c..e810b8279 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/algorithm/AsyncTaskService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/algorithm/AsyncTaskService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.algorithm; +package org.apache.hugegraph.service.algorithm; import java.util.ArrayList; import java.util.Comparator; @@ -26,10 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.util.PageUtil; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.util.PageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/algorithm/OltpAlgoService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/algorithm/OltpAlgoService.java similarity index 81% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/algorithm/OltpAlgoService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/algorithm/OltpAlgoService.java index 865525cc9..4ae065289 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/algorithm/OltpAlgoService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/algorithm/OltpAlgoService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.algorithm; +package org.apache.hugegraph.service.algorithm; import java.util.ArrayList; import java.util.Date; @@ -28,23 +28,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.TraverserManager; -import com.baidu.hugegraph.entity.algorithm.ShortestPath; -import com.baidu.hugegraph.entity.enums.AsyncTaskStatus; -import com.baidu.hugegraph.entity.enums.ExecuteStatus; -import com.baidu.hugegraph.entity.enums.ExecuteType; -import com.baidu.hugegraph.entity.query.ExecuteHistory; -import com.baidu.hugegraph.entity.query.GraphView; -import com.baidu.hugegraph.entity.query.GremlinResult; -import com.baidu.hugegraph.entity.query.JsonView; -import com.baidu.hugegraph.entity.query.TableView; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.service.query.ExecuteHistoryService; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.TraverserManager; +import org.apache.hugegraph.entity.algorithm.ShortestPath; +import org.apache.hugegraph.entity.enums.AsyncTaskStatus; +import org.apache.hugegraph.entity.enums.ExecuteStatus; +import org.apache.hugegraph.entity.enums.ExecuteType; +import org.apache.hugegraph.entity.query.ExecuteHistory; +import org.apache.hugegraph.entity.query.GraphView; +import org.apache.hugegraph.entity.query.GremlinResult; +import org.apache.hugegraph.entity.query.JsonView; +import org.apache.hugegraph.entity.query.TableView; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.service.query.ExecuteHistoryService; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.util.HubbleUtil; import com.google.common.collect.ImmutableMap; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/graph/GraphService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/graph/GraphService.java similarity index 84% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/graph/GraphService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/graph/GraphService.java index 8ef486ef7..e755662f5 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/graph/GraphService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/graph/GraphService.java @@ -17,37 +17,37 @@ * under the License. */ -package com.baidu.hugegraph.service.graph; +package org.apache.hugegraph.service.graph; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.service.schema.EdgeLabelService; +import org.apache.hugegraph.service.schema.PropertyKeyService; +import org.apache.hugegraph.service.schema.VertexLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.graph.EdgeEntity; -import com.baidu.hugegraph.entity.graph.VertexEntity; -import com.baidu.hugegraph.entity.query.GraphView; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.PropertyKeyEntity; -import com.baidu.hugegraph.entity.schema.SchemaLabelEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.source.file.ListFormat; -import com.baidu.hugegraph.loader.util.DataTypeUtil; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.service.schema.EdgeLabelService; -import com.baidu.hugegraph.service.schema.PropertyKeyService; -import com.baidu.hugegraph.service.schema.VertexLabelService; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.graph.EdgeEntity; +import org.apache.hugegraph.entity.graph.VertexEntity; +import org.apache.hugegraph.entity.query.GraphView; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.PropertyKeyEntity; +import org.apache.hugegraph.entity.schema.SchemaLabelEntity; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.file.ListFormat; +import org.apache.hugegraph.loader.util.DataTypeUtil; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.util.Ex; import com.google.common.collect.ImmutableSet; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/license/LicenseService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/license/LicenseService.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/license/LicenseService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/license/LicenseService.java index 22c7fcaeb..ca51f0cf0 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/license/LicenseService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/license/LicenseService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.license; +package org.apache.hugegraph.service.license; import java.util.ArrayList; import java.util.List; @@ -30,12 +30,12 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.handler.MessageSourceHandler; -import com.baidu.hugegraph.service.GraphConnectionService; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.handler.MessageSourceHandler; +import org.apache.hugegraph.service.GraphConnectionService; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.util.Ex; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/FileMappingService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/FileMappingService.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/FileMappingService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/FileMappingService.java index a4fd3ff13..b5123fdef 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/FileMappingService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/FileMappingService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.load; +package org.apache.hugegraph.service.load; import java.io.BufferedReader; import java.io.File; @@ -41,6 +41,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.exception.InternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; @@ -50,15 +51,14 @@ import org.springframework.web.multipart.MultipartFile; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.entity.enums.FileMappingStatus; -import com.baidu.hugegraph.entity.load.FileMapping; -import com.baidu.hugegraph.entity.load.FileSetting; -import com.baidu.hugegraph.entity.load.FileUploadResult; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.mapper.load.FileMappingMapper; -import com.baidu.hugegraph.options.HubbleOptions; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.entity.enums.FileMappingStatus; +import org.apache.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.FileSetting; +import org.apache.hugegraph.entity.load.FileUploadResult; +import org.apache.hugegraph.mapper.load.FileMappingMapper; +import org.apache.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.HubbleUtil; import org.apache.hugegraph.util.StringUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/JobManagerService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/JobManagerService.java similarity index 91% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/JobManagerService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/JobManagerService.java index c77aa9087..bc78a1f2e 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/JobManagerService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/JobManagerService.java @@ -17,23 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.service.load; +package org.apache.hugegraph.service.load; import java.util.Date; import java.util.List; +import org.apache.hugegraph.exception.InternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; -import com.baidu.hugegraph.entity.enums.JobStatus; -import com.baidu.hugegraph.entity.enums.LoadStatus; -import com.baidu.hugegraph.entity.load.JobManager; -import com.baidu.hugegraph.entity.load.LoadTask; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.mapper.load.JobManagerMapper; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.entity.enums.JobStatus; +import org.apache.hugegraph.entity.enums.LoadStatus; +import org.apache.hugegraph.entity.load.JobManager; +import org.apache.hugegraph.entity.load.LoadTask; +import org.apache.hugegraph.mapper.load.JobManagerMapper; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/LoadTaskService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/LoadTaskService.java similarity index 89% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/LoadTaskService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/LoadTaskService.java index a3563d488..9c87fda1b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/load/LoadTaskService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/load/LoadTaskService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.load; +package org.apache.hugegraph.service.load; import java.io.File; import java.io.IOException; @@ -30,6 +30,10 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.service.schema.EdgeLabelService; +import org.apache.hugegraph.service.schema.VertexLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; @@ -37,34 +41,30 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; -import com.baidu.hugegraph.common.Constant; +import org.apache.hugegraph.common.Constant; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.entity.enums.LoadStatus; -import com.baidu.hugegraph.entity.load.EdgeMapping; -import com.baidu.hugegraph.entity.load.FileMapping; -import com.baidu.hugegraph.entity.load.FileSetting; -import com.baidu.hugegraph.entity.load.ListFormat; -import com.baidu.hugegraph.entity.load.LoadParameter; -import com.baidu.hugegraph.entity.load.LoadTask; -import com.baidu.hugegraph.entity.load.VertexMapping; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.handler.LoadTaskExecutor; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import com.baidu.hugegraph.loader.source.file.FileFormat; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.util.MappingUtil; -import com.baidu.hugegraph.mapper.load.LoadTaskMapper; -import com.baidu.hugegraph.service.SettingSSLService; -import com.baidu.hugegraph.service.schema.EdgeLabelService; -import com.baidu.hugegraph.service.schema.VertexLabelService; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.entity.enums.LoadStatus; +import org.apache.hugegraph.entity.load.EdgeMapping; +import org.apache.hugegraph.entity.load.FileMapping; +import org.apache.hugegraph.entity.load.FileSetting; +import org.apache.hugegraph.entity.load.ListFormat; +import org.apache.hugegraph.entity.load.LoadParameter; +import org.apache.hugegraph.entity.load.LoadTask; +import org.apache.hugegraph.entity.load.VertexMapping; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.handler.LoadTaskExecutor; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.LoadMapping; +import org.apache.hugegraph.loader.source.file.FileFormat; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.util.MappingUtil; +import org.apache.hugegraph.mapper.load.LoadTaskMapper; +import org.apache.hugegraph.service.SettingSSLService; +import org.apache.hugegraph.util.Ex; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -385,9 +385,9 @@ private LoadMapping buildLoadMapping(GraphConnection connection, FileMapping fileMapping) { FileSource source = this.buildFileSource(fileMapping); - List vMappings; + List vMappings; vMappings = this.buildVertexMappings(connection, fileMapping); - List eMappings; + List eMappings; eMappings = this.buildEdgeMappings(connection, fileMapping); InputStruct inputStruct = new InputStruct(vMappings, eMappings); @@ -413,7 +413,7 @@ private FileSource buildFileSource(FileMapping fileMapping) { source.timeZone(setting.getTimeZone()); source.skippedLine().regex(setting.getSkippedLine()); // Set list format - source.listFormat(new com.baidu.hugegraph.loader.source.file.ListFormat()); + source.listFormat(new org.apache.hugegraph.loader.source.file.ListFormat()); ListFormat listFormat = setting.getListFormat(); source.listFormat().startSymbol(listFormat.getStartSymbol()); source.listFormat().endSymbol(listFormat.getEndSymbol()); @@ -421,23 +421,22 @@ private FileSource buildFileSource(FileMapping fileMapping) { return source; } - private List + private List buildVertexMappings(GraphConnection connection, FileMapping fileMapping) { int connId = connection.getId(); - List vMappings = + List vMappings = new ArrayList<>(); for (VertexMapping mapping : fileMapping.getVertexMappings()) { VertexLabelEntity vl = this.vlService.get(mapping.getLabel(), connId); List idFields = mapping.getIdFields(); Map fieldMappings = mapping.fieldMappingToMap(); - com.baidu.hugegraph.loader.mapping.VertexMapping vMapping; + org.apache.hugegraph.loader.mapping.VertexMapping vMapping; if (vl.getIdStrategy().isCustomize()) { Ex.check(idFields.size() == 1, "When the ID strategy is CUSTOMIZED, you must " + "select a column in the file as the id"); - vMapping = new com.baidu.hugegraph.loader.mapping - .VertexMapping(idFields.get(0), true); + vMapping = new org.apache.hugegraph.loader.mapping.VertexMapping(idFields.get(0), true); } else { assert vl.getIdStrategy().isPrimaryKey(); List primaryKeys = vl.getPrimaryKeys(); @@ -451,8 +450,7 @@ private FileSource buildFileSource(FileMapping fileMapping) { * when primarykeys contains just one field */ boolean unfold = idFields.size() == 1; - vMapping = new com.baidu.hugegraph.loader.mapping - .VertexMapping(null, unfold); + vMapping = new org.apache.hugegraph.loader.mapping.VertexMapping(null, unfold); for (int i = 0; i < primaryKeys.size(); i++) { fieldMappings.put(idFields.get(i), primaryKeys.get(i)); } @@ -477,11 +475,11 @@ private FileSource buildFileSource(FileMapping fileMapping) { return vMappings; } - private List + private List buildEdgeMappings(GraphConnection connection, FileMapping fileMapping) { int connId = connection.getId(); - List eMappings = + List eMappings = new ArrayList<>(); for (EdgeMapping mapping : fileMapping.getEdgeMappings()) { List sourceFields = mapping.getSourceFields(); @@ -527,8 +525,8 @@ private FileSource buildFileSource(FileMapping fileMapping) { } } - com.baidu.hugegraph.loader.mapping.EdgeMapping eMapping; - eMapping = new com.baidu.hugegraph.loader.mapping.EdgeMapping( + org.apache.hugegraph.loader.mapping.EdgeMapping eMapping; + eMapping = new org.apache.hugegraph.loader.mapping.EdgeMapping( sourceFields, unfoldSource, targetFields, unfoldTarget); // set label eMapping.label(mapping.getLabel()); diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/ExecuteHistoryService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/ExecuteHistoryService.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/ExecuteHistoryService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/ExecuteHistoryService.java index 4b8be8dab..91322dc3b 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/ExecuteHistoryService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/ExecuteHistoryService.java @@ -17,11 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.service.query; +package org.apache.hugegraph.service.query; import java.time.Instant; import java.time.temporal.ChronoField; +import org.apache.hugegraph.exception.InternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; @@ -30,16 +31,15 @@ import org.springframework.transaction.annotation.Transactional; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.enums.AsyncTaskStatus; -import com.baidu.hugegraph.entity.enums.ExecuteType; -import com.baidu.hugegraph.entity.query.ExecuteHistory; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.mapper.query.ExecuteHistoryMapper; -import com.baidu.hugegraph.options.HubbleOptions; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.enums.AsyncTaskStatus; +import org.apache.hugegraph.entity.enums.ExecuteType; +import org.apache.hugegraph.entity.query.ExecuteHistory; +import org.apache.hugegraph.mapper.query.ExecuteHistoryMapper; +import org.apache.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.util.HubbleUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/GremlinCollectionService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/GremlinCollectionService.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/GremlinCollectionService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/GremlinCollectionService.java index 8e9aa019e..a99d386fa 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/GremlinCollectionService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/GremlinCollectionService.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.service.query; +package org.apache.hugegraph.service.query; +import org.apache.hugegraph.exception.InternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.baidu.hugegraph.entity.query.GremlinCollection; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.mapper.query.GremlinCollectionMapper; -import com.baidu.hugegraph.util.SQLUtil; +import org.apache.hugegraph.entity.query.GremlinCollection; +import org.apache.hugegraph.mapper.query.GremlinCollectionMapper; +import org.apache.hugegraph.util.SQLUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/GremlinQueryService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/GremlinQueryService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/GremlinQueryService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/GremlinQueryService.java index 2a481759c..3f35f00a7 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/query/GremlinQueryService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/query/GremlinQueryService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.query; +package org.apache.hugegraph.service.query; import java.util.ArrayList; import java.util.Collections; @@ -32,39 +32,39 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.exception.IllegalGremlinException; +import org.apache.hugegraph.exception.InternalException; +import org.apache.hugegraph.service.schema.VertexLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; +import org.apache.hugegraph.api.gremlin.GremlinRequest; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.query.AdjacentQuery; -import com.baidu.hugegraph.entity.query.GraphView; -import com.baidu.hugegraph.entity.query.GremlinQuery; -import com.baidu.hugegraph.entity.query.GremlinResult; -import com.baidu.hugegraph.entity.query.GremlinResult.Type; -import com.baidu.hugegraph.entity.query.JsonView; -import com.baidu.hugegraph.entity.query.TableView; -import com.baidu.hugegraph.entity.query.TypedResult; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.IllegalGremlinException; -import com.baidu.hugegraph.exception.InternalException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.options.HubbleOptions; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.query.AdjacentQuery; +import org.apache.hugegraph.entity.query.GraphView; +import org.apache.hugegraph.entity.query.GremlinQuery; +import org.apache.hugegraph.entity.query.GremlinResult; +import org.apache.hugegraph.entity.query.GremlinResult.Type; +import org.apache.hugegraph.entity.query.JsonView; +import org.apache.hugegraph.entity.query.TableView; +import org.apache.hugegraph.entity.query.TypedResult; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.options.HubbleOptions; import org.apache.hugegraph.rest.ClientException; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.service.schema.VertexLabelService; -import com.baidu.hugegraph.structure.constant.Direction; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Path; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.gremlin.ResultSet; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.GremlinUtil; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.structure.constant.Direction; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Path; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.GremlinUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/EdgeLabelService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/EdgeLabelService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/EdgeLabelService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/EdgeLabelService.java index 1aa2f7138..02585d7af 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/EdgeLabelService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/EdgeLabelService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.schema; +package org.apache.hugegraph.service.schema; import java.util.ArrayList; import java.util.Collection; @@ -31,33 +31,33 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.apache.hugegraph.exception.ExternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.schema.ConflictCheckEntity; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.ConflictStatus; -import com.baidu.hugegraph.entity.schema.EdgeLabelEntity; -import com.baidu.hugegraph.entity.schema.EdgeLabelStyle; -import com.baidu.hugegraph.entity.schema.EdgeLabelUpdateEntity; -import com.baidu.hugegraph.entity.schema.Property; -import com.baidu.hugegraph.entity.schema.PropertyIndex; -import com.baidu.hugegraph.entity.schema.SchemaConflict; -import com.baidu.hugegraph.entity.schema.SchemaEntity; -import com.baidu.hugegraph.entity.schema.SchemaType; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.constant.Frequency; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.schema.ConflictCheckEntity; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.ConflictStatus; +import org.apache.hugegraph.entity.schema.EdgeLabelEntity; +import org.apache.hugegraph.entity.schema.EdgeLabelStyle; +import org.apache.hugegraph.entity.schema.EdgeLabelUpdateEntity; +import org.apache.hugegraph.entity.schema.Property; +import org.apache.hugegraph.entity.schema.PropertyIndex; +import org.apache.hugegraph.entity.schema.SchemaConflict; +import org.apache.hugegraph.entity.schema.SchemaEntity; +import org.apache.hugegraph.entity.schema.SchemaType; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.constant.Frequency; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.JsonUtil; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/PropertyIndexService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/PropertyIndexService.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/PropertyIndexService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/PropertyIndexService.java index 684ba1144..acaace04d 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/PropertyIndexService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/PropertyIndexService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.schema; +package org.apache.hugegraph.service.schema; import java.util.ArrayList; import java.util.Collection; @@ -33,18 +33,18 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.ConflictStatus; -import com.baidu.hugegraph.entity.schema.PropertyIndex; -import com.baidu.hugegraph.entity.schema.SchemaConflict; -import com.baidu.hugegraph.entity.schema.SchemaEntity; -import com.baidu.hugegraph.entity.schema.SchemaType; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.util.PageUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.ConflictStatus; +import org.apache.hugegraph.entity.schema.PropertyIndex; +import org.apache.hugegraph.entity.schema.SchemaConflict; +import org.apache.hugegraph.entity.schema.SchemaEntity; +import org.apache.hugegraph.entity.schema.SchemaType; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.util.PageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/PropertyKeyService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/PropertyKeyService.java similarity index 90% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/PropertyKeyService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/PropertyKeyService.java index a02d8383c..b880dc363 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/PropertyKeyService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/PropertyKeyService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.schema; +package org.apache.hugegraph.service.schema; import java.util.ArrayList; import java.util.Collection; @@ -28,24 +28,24 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; +import org.apache.hugegraph.exception.ExternalException; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.schema.ConflictCheckEntity; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.ConflictStatus; -import com.baidu.hugegraph.entity.schema.PropertyKeyEntity; -import com.baidu.hugegraph.entity.schema.SchemaConflict; -import com.baidu.hugegraph.entity.schema.SchemaEntity; -import com.baidu.hugegraph.entity.schema.SchemaType; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; -import com.baidu.hugegraph.util.Ex; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.schema.ConflictCheckEntity; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.ConflictStatus; +import org.apache.hugegraph.entity.schema.PropertyKeyEntity; +import org.apache.hugegraph.entity.schema.SchemaConflict; +import org.apache.hugegraph.entity.schema.SchemaEntity; +import org.apache.hugegraph.entity.schema.SchemaType; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.util.Ex; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/SchemaService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/SchemaService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/SchemaService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/SchemaService.java index c378fe5da..3d31fc186 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/SchemaService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/SchemaService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.schema; +package org.apache.hugegraph.service.schema; import java.util.ArrayList; import java.util.Collection; @@ -35,21 +35,21 @@ import org.springframework.util.CollectionUtils; import org.apache.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.ConflictStatus; -import com.baidu.hugegraph.entity.schema.Property; -import com.baidu.hugegraph.entity.schema.PropertyIndex; -import com.baidu.hugegraph.entity.schema.SchemaConflict; -import com.baidu.hugegraph.entity.schema.SchemaEntity; -import com.baidu.hugegraph.entity.schema.SchemaLabelEntity; -import com.baidu.hugegraph.entity.schema.SchemaType; -import com.baidu.hugegraph.service.HugeClientPoolService; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.SchemaLabel; -import com.baidu.hugegraph.util.HubbleUtil; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.ConflictStatus; +import org.apache.hugegraph.entity.schema.Property; +import org.apache.hugegraph.entity.schema.PropertyIndex; +import org.apache.hugegraph.entity.schema.SchemaConflict; +import org.apache.hugegraph.entity.schema.SchemaEntity; +import org.apache.hugegraph.entity.schema.SchemaLabelEntity; +import org.apache.hugegraph.entity.schema.SchemaType; +import org.apache.hugegraph.service.HugeClientPoolService; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.SchemaLabel; +import org.apache.hugegraph.util.HubbleUtil; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/VertexLabelService.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/VertexLabelService.java similarity index 92% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/VertexLabelService.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/VertexLabelService.java index dbea72df7..0ab04b0b5 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/service/schema/VertexLabelService.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/service/schema/VertexLabelService.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.service.schema; +package org.apache.hugegraph.service.schema; import java.util.ArrayList; import java.util.Collection; @@ -31,32 +31,32 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; +import org.apache.hugegraph.exception.ExternalException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.schema.ConflictCheckEntity; -import com.baidu.hugegraph.entity.schema.ConflictDetail; -import com.baidu.hugegraph.entity.schema.ConflictStatus; -import com.baidu.hugegraph.entity.schema.Property; -import com.baidu.hugegraph.entity.schema.PropertyIndex; -import com.baidu.hugegraph.entity.schema.SchemaConflict; -import com.baidu.hugegraph.entity.schema.SchemaEntity; -import com.baidu.hugegraph.entity.schema.SchemaType; -import com.baidu.hugegraph.entity.schema.VertexLabelEntity; -import com.baidu.hugegraph.entity.schema.VertexLabelStyle; -import com.baidu.hugegraph.entity.schema.VertexLabelUpdateEntity; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.structure.SchemaElement; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; -import com.baidu.hugegraph.util.Ex; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.entity.schema.ConflictCheckEntity; +import org.apache.hugegraph.entity.schema.ConflictDetail; +import org.apache.hugegraph.entity.schema.ConflictStatus; +import org.apache.hugegraph.entity.schema.Property; +import org.apache.hugegraph.entity.schema.PropertyIndex; +import org.apache.hugegraph.entity.schema.SchemaConflict; +import org.apache.hugegraph.entity.schema.SchemaEntity; +import org.apache.hugegraph.entity.schema.SchemaType; +import org.apache.hugegraph.entity.schema.VertexLabelEntity; +import org.apache.hugegraph.entity.schema.VertexLabelStyle; +import org.apache.hugegraph.entity.schema.VertexLabelUpdateEntity; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.structure.SchemaElement; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.util.Ex; +import org.apache.hugegraph.util.JsonUtil; import lombok.extern.log4j.Log4j2; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/EntityUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/EntityUtil.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/EntityUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/EntityUtil.java index 3221b0645..9a22e8fd7 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/EntityUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/EntityUtil.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.lang.reflect.Field; -import com.baidu.hugegraph.annotation.MergeProperty; -import com.baidu.hugegraph.common.Mergeable; -import com.baidu.hugegraph.exception.InternalException; +import org.apache.hugegraph.annotation.MergeProperty; +import org.apache.hugegraph.common.Mergeable; +import org.apache.hugegraph.exception.InternalException; public final class EntityUtil { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/Ex.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/Ex.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/Ex.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/Ex.java index 4842c0841..3d16c3ba4 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/Ex.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/Ex.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.concurrent.Callable; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.InternalException; +import org.apache.hugegraph.exception.ExternalException; +import org.apache.hugegraph.exception.InternalException; public final class Ex { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/FileUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/FileUtil.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/FileUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/FileUtil.java index 01fcca178..2739def20 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/FileUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/FileUtil.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import com.baidu.hugegraph.exception.InternalException; +import org.apache.hugegraph.exception.InternalException; public final class FileUtil { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/GremlinUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/GremlinUtil.java similarity index 99% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/GremlinUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/GremlinUtil.java index ee7a06252..4a2c0de39 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/GremlinUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/GremlinUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/HubbleUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/HubbleUtil.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/HubbleUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/HubbleUtil.java index 2db097256..fb2b7f0ba 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/HubbleUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/HubbleUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.time.Instant; import java.util.Collection; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/HugeClientUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/HugeClientUtil.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/HugeClientUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/HugeClientUtil.java index 6d6e93bc4..e53a04d05 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/HugeClientUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/HugeClientUtil.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.Set; +import org.apache.hugegraph.common.Constant; +import org.apache.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.exception.ExternalException; import org.springframework.web.util.UriComponentsBuilder; -import com.baidu.hugegraph.common.Constant; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.entity.GraphConnection; -import com.baidu.hugegraph.exception.ExternalException; -import com.baidu.hugegraph.exception.ServerException; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.exception.ServerException; import org.apache.hugegraph.rest.ClientException; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.gremlin.ResultSet; import com.google.common.collect.ImmutableSet; public final class HugeClientUtil { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/PageUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/PageUtil.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/PageUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/PageUtil.java index 9e5e17846..dc3c8e11f 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/PageUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/PageUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.Collections; import java.util.List; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/SQLUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/SQLUtil.java similarity index 93% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/SQLUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/SQLUtil.java index 079fff054..53d298beb 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/SQLUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/SQLUtil.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.common.Constant; +import org.apache.hugegraph.common.Constant; public final class SQLUtil { diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/SerializeUtil.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/SerializeUtil.java similarity index 98% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/SerializeUtil.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/SerializeUtil.java index ca04793a5..503db2a17 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/util/SerializeUtil.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/util/SerializeUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.io.IOException; diff --git a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/version/HubbleVersion.java b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/version/HubbleVersion.java similarity index 95% rename from hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/version/HubbleVersion.java rename to hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/version/HubbleVersion.java index c9e21c613..c3a4d9ece 100644 --- a/hugegraph-hubble/hubble-be/src/main/java/com/baidu/hugegraph/version/HubbleVersion.java +++ b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/version/HubbleVersion.java @@ -17,11 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.version; +package org.apache.hugegraph.version; import org.apache.hugegraph.util.VersionUtil; import org.apache.hugegraph.util.VersionUtil.Version; -import org.apache.hugegraph.version.CommonVersion; public final class HubbleVersion { diff --git a/hugegraph-hubble/hubble-be/src/main/resources/application.properties b/hugegraph-hubble/hubble-be/src/main/resources/application.properties index ba4c2416b..1804a9eab 100644 --- a/hugegraph-hubble/hubble-be/src/main/resources/application.properties +++ b/hugegraph-hubble/hubble-be/src/main/resources/application.properties @@ -35,8 +35,8 @@ spring.servlet.multipart.resolve-lazily=false mybatis-plus.global-config.banner=false mybatis-plus.mapper-locations=classpath*:/mapper/**/*.xml -mybatis-plus.type-enums-package=com.baidu.hugegraph.entity.enums -mybatis.type-aliases-package=com.baidu.hugegraph.entity +mybatis-plus.type-enums-package=org.apache.hugegraph.entity.enums +mybatis.type-aliases-package=org.apache.hugegraph.entity mybatis.configuration.cache-enabled=false mybatis.configuration.map-underscore-to-camel-case=true mybatis.configuration.use-generated-keys=true @@ -46,7 +46,7 @@ mybatis.configuration.default-statement-timeout=600 management.endpoints.web.exposure.include=* logging.level.org.springframework=WARN -logging.level.com.baidu.hugegraph.mapper=INFO -logging.level.com.baidu.hugegraph.service=INFO +logging.level.org.apache.hugegraph.mapper=INFO +logging.level.org.apache.hugegraph.service=INFO logging.file=logs/hugegraph-hubble.log logging.file.max-size=10MB diff --git a/hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/EntityUtilTest.java b/hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/EntityUtilTest.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/EntityUtilTest.java rename to hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/EntityUtilTest.java index 3034b423b..f6d319dfe 100644 --- a/hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/EntityUtilTest.java +++ b/hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/EntityUtilTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import java.util.Date; import org.junit.Test; -import com.baidu.hugegraph.entity.GraphConnection; +import org.apache.hugegraph.entity.GraphConnection; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.EntityUtil; +import org.apache.hugegraph.util.EntityUtil; public class EntityUtilTest { diff --git a/hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/FileUtilTest.java b/hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/FileUtilTest.java similarity index 94% rename from hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/FileUtilTest.java rename to hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/FileUtilTest.java index 5420f49f1..847d63e6e 100644 --- a/hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/FileUtilTest.java +++ b/hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/FileUtilTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import org.junit.Test; import org.apache.hugegraph.testutil.Assert; -import com.baidu.hugegraph.util.FileUtil; +import org.apache.hugegraph.util.FileUtil; public class FileUtilTest { diff --git a/hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java b/hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java similarity index 96% rename from hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java rename to hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java index 8488f6b05..d1c4172b5 100644 --- a/hugegraph-hubble/hubble-be/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java +++ b/hugegraph-hubble/hubble-be/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.unit; +package org.apache.hugegraph.unit; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/hugegraph-hubble/hubble-be/src/test/resources/application.properties b/hugegraph-hubble/hubble-be/src/test/resources/application.properties index 6fc3bfd58..6efb9e8b5 100644 --- a/hugegraph-hubble/hubble-be/src/test/resources/application.properties +++ b/hugegraph-hubble/hubble-be/src/test/resources/application.properties @@ -20,8 +20,8 @@ spring.datasource.hikari.connection-test-query=SELECT 1 spring.messages.encoding=UTF-8 spring.messages.basename=i18n/messages -mybatis.type-aliases-package=com.baidu.hugegraph.entity -mybatis-plus.type-enums-package=com.baidu.hugegraph.entity.enums +mybatis.type-aliases-package=org.apache.hugegraph.entity +mybatis-plus.type-enums-package=org.apache.hugegraph.entity.enums mybatis.configuration.cache-enabled=false mybatis.configuration.map-underscore-to-camel-case=true mybatis.configuration.use-generated-keys=true @@ -29,7 +29,7 @@ mybatis.configuration.default-executor-type=reuse mybatis.configuration.default-statement-timeout=600 logging.level.org.springframework=WARN -logging.level.com.baidu.hugegraph.mapper=DEBUG -logging.level.com.baidu.hugegraph.service=INFO +logging.level.org.apache.hugegraph.mapper=DEBUG +logging.level.org.apache.hugegraph.service=INFO logging.file=logs/hugegraph-hubble.log logging.file.max-size=10MB diff --git a/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh b/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh index 2b47360f7..e9c9c9d77 100644 --- a/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh +++ b/hugegraph-hubble/hubble-dist/assembly/static/bin/start-hubble.sh @@ -73,7 +73,7 @@ if [[ -f ${PID_FILE} ]] ; then fi fi -main_class="com.baidu.hugegraph.HugeGraphHubble" +main_class="org.apache.hugegraph.HugeGraphHubble" args=${CONF_PATH}/hugegraph-hubble.properties log=${LOG_PATH}/hugegraph-hubble.log diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/build-report.sh b/hugegraph-hubble/hubble-dist/assembly/travis/build-report.sh index 8651e163d..008ababd7 100755 --- a/hugegraph-hubble/hubble-dist/assembly/travis/build-report.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/build-report.sh @@ -23,4 +23,4 @@ cd hubble-be mvn jacoco:dump@pull-test-data -Dapp.host=localhost -Dapp.port=36320 -Dskip.dump=false cd ../ java -jar "${TRAVIS_DIR}"/jacococli.jar report hubble-be/target/jacoco-it.exec \ - --classfiles hubble-be/target/classes/com/baidu/hugegraph --xml report.xml + --classfiles hubble-be/target/classes/org/apache/hugegraph --xml report.xml diff --git a/hugegraph-hubble/hubble-dist/assembly/travis/start-hubble.sh b/hugegraph-hubble/hubble-dist/assembly/travis/start-hubble.sh index 53cd2240e..a806a0f60 100644 --- a/hugegraph-hubble/hubble-dist/assembly/travis/start-hubble.sh +++ b/hugegraph-hubble/hubble-dist/assembly/travis/start-hubble.sh @@ -75,7 +75,7 @@ fi # for collecting codecov agent_opts="-javaagent:${LIB_PATH}/jacocoagent.jar=includes=*,port=36320,destfile=jacoco-it.exec,output=tcpserver" -main_class="com.baidu.hugegraph.HugeGraphHubble" +main_class="org.apache.hugegraph.HugeGraphHubble" args=${CONF_PATH}/hugegraph-hubble.properties log=${LOG_PATH}/hugegraph-hubble.log diff --git a/hugegraph-loader/assembly/static/bin/hugegraph-flinkcdc-loader.sh b/hugegraph-loader/assembly/static/bin/hugegraph-flinkcdc-loader.sh index d179d459a..e424dd98a 100755 --- a/hugegraph-loader/assembly/static/bin/hugegraph-flinkcdc-loader.sh +++ b/hugegraph-loader/assembly/static/bin/hugegraph-flinkcdc-loader.sh @@ -28,7 +28,7 @@ echo "hugegraph_params: $HUGEGRAPH_PARAMS" CMD=${FLINK_HOME}/bin/flink run \ ${ENGINE_PARAMS} \ - -c com.baidu.hugegraph.loader.flink.HugeGraphFlinkCDCLoader \ + -c org.apache.hugegraph.loader.flink.HugeGraphFlinkCDCLoader \ ${ASSEMBLY_JAR_NAME} ${HUGEGRAPH_PARAMS} echo ${CMD} diff --git a/hugegraph-loader/assembly/static/bin/hugegraph-loader.sh b/hugegraph-loader/assembly/static/bin/hugegraph-loader.sh index c06cf64f7..4bc896527 100755 --- a/hugegraph-loader/assembly/static/bin/hugegraph-loader.sh +++ b/hugegraph-loader/assembly/static/bin/hugegraph-loader.sh @@ -78,4 +78,4 @@ export JVM_OPTS="$JVM_OPTS -Xmx10g -cp $LOADER_CLASSPATH" exec ${JAVA} -Dname="HugeGraphLoader" -Dloader.home.path=${TOP} -Dlog4j.configurationFile=${CONF}/log4j2.xml \ -Djava.library.path=${NATIVE} \ -${JVM_OPTS} com.baidu.hugegraph.loader.HugeGraphLoader ${VARS} +${JVM_OPTS} org.apache.hugegraph.loader.HugeGraphLoader ${VARS} diff --git a/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh b/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh index 2df0f9062..fc258eeae 100755 --- a/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh +++ b/hugegraph-loader/assembly/static/bin/hugegraph-spark-loader.sh @@ -32,7 +32,7 @@ DEFAULT_APP_NAME="hugegraph-spark-loader" APP_NAME=${APP_NAME:-$DEFAULT_APP_NAME} CMD="${SPARK_HOME}/bin/spark-submit - --class com.baidu.hugegraph.loader.spark.HugeGraphSparkLoader \ + --class org.apache.hugegraph.loader.spark.HugeGraphSparkLoader \ ${ENGINE_PARAMS} --jars $(echo ${LIB_DIR}/*.jar | tr ' ' ',') ${ASSEMBLY_JAR_NAME} ${HUGEGRAPH_PARAMS}" diff --git a/hugegraph-loader/assembly/static/bin/mapping-convert.sh b/hugegraph-loader/assembly/static/bin/mapping-convert.sh index ce07f83b7..64f55dd0a 100755 --- a/hugegraph-loader/assembly/static/bin/mapping-convert.sh +++ b/hugegraph-loader/assembly/static/bin/mapping-convert.sh @@ -43,6 +43,6 @@ for jar in `ls ${LIB_PATH}/*.jar`; do done args=$1 -main_class="com.baidu.hugegraph.loader.MappingConverter" +main_class="org.apache.hugegraph.loader.MappingConverter" exec java -Dlog4j.configurationFile=${CONF_PATH}/log4j2.xml \ -cp ${class_path} ${main_class} ${args} diff --git a/hugegraph-loader/assembly/static/conf/log4j2.xml b/hugegraph-loader/assembly/static/conf/log4j2.xml index 47c2e639a..53758f36b 100644 --- a/hugegraph-loader/assembly/static/conf/log4j2.xml +++ b/hugegraph-loader/assembly/static/conf/log4j2.xml @@ -47,7 +47,7 @@ - + diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/HugeGraphLoader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/HugeGraphLoader.java similarity index 90% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/HugeGraphLoader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/HugeGraphLoader.java index e92394b00..fbfb3f5e9 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/HugeGraphLoader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/HugeGraphLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader; +package org.apache.hugegraph.loader; import java.io.File; import java.io.IOException; @@ -27,31 +27,30 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.loader.task.ParseTaskBuilder; +import org.apache.hugegraph.loader.task.TaskManager; +import org.apache.hugegraph.loader.util.HugeClientHolder; +import org.apache.hugegraph.loader.util.LoadUtil; +import org.apache.hugegraph.loader.util.Printer; import org.slf4j.Logger; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.loader.builder.Record; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.exception.InitException; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.exception.ReadException; -import com.baidu.hugegraph.loader.executor.GroovyExecutor; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import com.baidu.hugegraph.loader.metrics.LoadMetrics; -import com.baidu.hugegraph.loader.metrics.LoadSummary; -import com.baidu.hugegraph.loader.reader.InputReader; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.task.ParseTaskBuilder; -import com.baidu.hugegraph.loader.task.ParseTaskBuilder.ParseTask; -import com.baidu.hugegraph.loader.task.TaskManager; -import com.baidu.hugegraph.loader.util.HugeClientHolder; -import com.baidu.hugegraph.loader.util.LoadUtil; -import com.baidu.hugegraph.loader.util.Printer; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.loader.builder.Record; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.exception.InitException; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.ReadException; +import org.apache.hugegraph.loader.executor.GroovyExecutor; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.LoadMapping; +import org.apache.hugegraph.loader.metrics.LoadMetrics; +import org.apache.hugegraph.loader.metrics.LoadSummary; +import org.apache.hugegraph.loader.reader.InputReader; +import org.apache.hugegraph.loader.reader.line.Line; import org.apache.hugegraph.util.Log; public final class HugeGraphLoader { @@ -258,8 +257,8 @@ private void loadStruct(InputStruct struct, InputReader reader) { finished = true; } if (lines.size() >= batchSize || finished) { - List tasks = taskBuilder.build(lines); - for (ParseTask task : tasks) { + List tasks = taskBuilder.build(lines); + for (ParseTaskBuilder.ParseTask task : tasks) { this.executeParseTask(struct, task.mapping(), task); } // Confirm offset to avoid lost records diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/MappingConverter.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/MappingConverter.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/MappingConverter.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/MappingConverter.java index 0ec106011..43f2b4cc3 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/MappingConverter.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/MappingConverter.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.loader; +package org.apache.hugegraph.loader; import java.io.File; import java.nio.file.Paths; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.loader.util.MappingUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import com.baidu.hugegraph.loader.util.MappingUtil; +import org.apache.hugegraph.loader.mapping.LoadMapping; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/EdgeBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/EdgeBuilder.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/EdgeBuilder.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/EdgeBuilder.java index e384e2084..617079059 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/EdgeBuilder.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/EdgeBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.builder; +package org.apache.hugegraph.loader.builder; import java.util.ArrayList; import java.util.Arrays; @@ -27,14 +27,14 @@ import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.SchemaLabel; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.SchemaLabel; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; import org.apache.spark.sql.Row; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/ElementBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/ElementBuilder.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/ElementBuilder.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/ElementBuilder.java index 72002336c..3090b92a8 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/ElementBuilder.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/ElementBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.builder; +package org.apache.hugegraph.loader.builder; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -38,19 +38,19 @@ import org.apache.commons.collections.ListUtils; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.util.DataTypeUtil; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.SchemaLabel; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.util.DataTypeUtil; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.SchemaLabel; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.LongEncoding; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/Record.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/Record.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/Record.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/Record.java index 9f335cc9a..abed1d0ee 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/Record.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/Record.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.loader.builder; +package org.apache.hugegraph.loader.builder; -import com.baidu.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.GraphElement; public class Record { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/SchemaCache.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/SchemaCache.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/SchemaCache.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/SchemaCache.java index 7253e0598..64cd28789 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/SchemaCache.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/SchemaCache.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.loader.builder; +package org.apache.hugegraph.loader.builder; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/VertexBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/VertexBuilder.java similarity index 90% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/VertexBuilder.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/VertexBuilder.java index 633bdea53..fde60464f 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/builder/VertexBuilder.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/builder/VertexBuilder.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.loader.builder; +package org.apache.hugegraph.loader.builder; import java.util.Collection; import java.util.List; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.VertexMapping; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.SchemaLabel; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.SchemaLabel; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.spark.sql.Row; import org.apache.hugegraph.util.E; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/AutoCloseableIterator.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/AutoCloseableIterator.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/AutoCloseableIterator.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/AutoCloseableIterator.java index e4ca5ea5d..f1485b0b1 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/AutoCloseableIterator.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/AutoCloseableIterator.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.constant; +package org.apache.hugegraph.loader.constant; import java.util.Iterator; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Checkable.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Checkable.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Checkable.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Checkable.java index da39d2770..1840e058f 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Checkable.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Checkable.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.constant; +package org.apache.hugegraph.loader.constant; public interface Checkable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Constants.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Constants.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Constants.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Constants.java index fb42312ae..58457e680 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Constants.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Constants.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.constant; +package org.apache.hugegraph.loader.constant; import java.nio.charset.Charset; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/ElemType.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/ElemType.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/ElemType.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/ElemType.java index 80e573159..d928baf2a 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/ElemType.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/ElemType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.constant; +package org.apache.hugegraph.loader.constant; public enum ElemType { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Unique.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Unique.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Unique.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Unique.java index b781e87be..78f3fc81e 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/constant/Unique.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/constant/Unique.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.constant; +package org.apache.hugegraph.loader.constant; public interface Unique { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/loader/DirectLoader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/loader/DirectLoader.java similarity index 82% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/loader/DirectLoader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/loader/DirectLoader.java index c197f90bc..18aeca952 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/loader/DirectLoader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/loader/DirectLoader.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.loader.direct.loader; +package org.apache.hugegraph.loader.direct.loader; -import com.baidu.hugegraph.loader.builder.EdgeBuilder; -import com.baidu.hugegraph.loader.builder.ElementBuilder; -import com.baidu.hugegraph.loader.builder.VertexBuilder; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.loader.builder.EdgeBuilder; +import org.apache.hugegraph.loader.builder.ElementBuilder; +import org.apache.hugegraph.loader.builder.VertexBuilder; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.VertexMapping; import org.apache.spark.api.java.JavaPairRDD; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/loader/HBaseDirectLoader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/loader/HBaseDirectLoader.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/loader/HBaseDirectLoader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/loader/HBaseDirectLoader.java index a5f1ce2b7..55152a047 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/loader/HBaseDirectLoader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/loader/HBaseDirectLoader.java @@ -17,20 +17,21 @@ * under the License. */ -package com.baidu.hugegraph.loader.direct.loader; +package org.apache.hugegraph.loader.direct.loader; -import com.baidu.hugegraph.loader.builder.ElementBuilder; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.direct.util.SinkToHBase; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.metrics.LoadDistributeMetrics; -import com.baidu.hugegraph.loader.util.HugeClientHolder; -import com.baidu.hugegraph.serializer.direct.HBaseSerializer; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.loader.builder.ElementBuilder; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.direct.util.SinkToHBase; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.util.HugeClientHolder; +import org.apache.hugegraph.loader.metrics.LoadDistributeMetrics; +import org.apache.hugegraph.serializer.direct.HBaseSerializer; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.util.Log; import org.apache.hadoop.conf.Configuration; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/util/SinkToHBase.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/util/SinkToHBase.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/util/SinkToHBase.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/util/SinkToHBase.java index b0f772178..2c063cd37 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/direct/util/SinkToHBase.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/direct/util/SinkToHBase.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.direct.util; +package org.apache.hugegraph.loader.direct.util; import java.io.IOException; import java.io.Serializable; @@ -41,12 +41,11 @@ import org.apache.hadoop.hbase.tool.BulkLoadHFilesTool; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; +import org.apache.hugegraph.loader.executor.LoadOptions; import org.apache.hugegraph.util.Log; import org.apache.spark.Partitioner; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.executor.LoadOptions; - import scala.Tuple2; public class SinkToHBase implements Serializable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/InitException.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/InitException.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/InitException.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/InitException.java index 19107eb59..0e8675b21 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/InitException.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/InitException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.exception; +package org.apache.hugegraph.loader.exception; public class InitException extends LoadException { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/InsertException.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/InsertException.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/InsertException.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/InsertException.java index 9bf3a0e6f..e65ebfef0 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/InsertException.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/InsertException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.exception; +package org.apache.hugegraph.loader.exception; public class InsertException extends IllegalArgumentException { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/LoadException.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/LoadException.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/LoadException.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/LoadException.java index 04020db69..8d69bc0b4 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/LoadException.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/LoadException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.exception; +package org.apache.hugegraph.loader.exception; public class LoadException extends RuntimeException { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/ParseException.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/ParseException.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/ParseException.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/ParseException.java index ae77be3a2..696e736d4 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/ParseException.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/ParseException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.exception; +package org.apache.hugegraph.loader.exception; public class ParseException extends IllegalArgumentException { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/ReadException.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/ReadException.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/ReadException.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/ReadException.java index ec274001a..3eea401a9 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/exception/ReadException.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/exception/ReadException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.exception; +package org.apache.hugegraph.loader.exception; public class ReadException extends ParseException { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/ComputerLoadOptions.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/ComputerLoadOptions.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/ComputerLoadOptions.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/ComputerLoadOptions.java index aacebdd5b..6b2557ddd 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/ComputerLoadOptions.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/ComputerLoadOptions.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.loader.executor; +package org.apache.hugegraph.loader.executor; -import com.baidu.hugegraph.loader.builder.SchemaCache; +import org.apache.hugegraph.loader.builder.SchemaCache; public class ComputerLoadOptions extends LoadOptions { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/GroovyExecutor.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/GroovyExecutor.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/GroovyExecutor.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/GroovyExecutor.java index 337e66315..b5959145d 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/GroovyExecutor.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/GroovyExecutor.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.executor; +package org.apache.hugegraph.loader.executor; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; import groovy.lang.Binding; import groovy.lang.GroovyShell; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/LoadContext.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadContext.java similarity index 89% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/LoadContext.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadContext.java index a3eb5dc96..f67d99078 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/LoadContext.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadContext.java @@ -17,26 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.loader.executor; +package org.apache.hugegraph.loader.executor; import java.io.IOException; import java.io.Serializable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.progress.LoadProgress; +import org.apache.hugegraph.loader.util.DateUtil; +import org.apache.hugegraph.loader.util.HugeClientHolder; import org.slf4j.Logger; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.loader.builder.SchemaCache; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.failure.FailLogger; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.metrics.LoadSummary; -import com.baidu.hugegraph.loader.progress.LoadProgress; -import com.baidu.hugegraph.loader.util.DateUtil; -import com.baidu.hugegraph.loader.util.HugeClientHolder; -import com.baidu.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.loader.builder.SchemaCache; +import org.apache.hugegraph.loader.failure.FailLogger; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.metrics.LoadSummary; +import org.apache.hugegraph.structure.constant.GraphMode; import org.apache.hugegraph.util.Log; public final class LoadContext implements Serializable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/LoadOptions.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadOptions.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/LoadOptions.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadOptions.java index 6843d8cf7..0d6d5317f 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/executor/LoadOptions.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/executor/LoadOptions.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.loader.executor; +package org.apache.hugegraph.loader.executor; import java.io.File; import java.io.Serializable; import java.util.Set; -import com.baidu.hugegraph.loader.mapping.BackendStoreInfo; +import org.apache.hugegraph.loader.util.LoadUtil; +import org.apache.hugegraph.loader.mapping.BackendStoreInfo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.util.LoadUtil; +import org.apache.hugegraph.loader.constant.Constants; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; import com.beust.jcommander.IParameterValidator; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/failure/FailLogger.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailLogger.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/failure/FailLogger.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailLogger.java index cfe3d4008..9c82907fe 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/failure/FailLogger.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailLogger.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.failure; +package org.apache.hugegraph.loader.failure; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -37,18 +37,18 @@ import java.util.Set; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.InsertException; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.ParseException; +import org.apache.hugegraph.loader.exception.ReadException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.util.LoadUtil; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.InsertException; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.exception.ParseException; -import com.baidu.hugegraph.loader.exception.ReadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.util.LoadUtil; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.util.JsonUtil; import org.apache.hugegraph.util.Log; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/failure/FailWriter.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailWriter.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/failure/FailWriter.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailWriter.java index 8f27474ef..8a7d4af43 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/failure/FailWriter.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/failure/FailWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.failure; +package org.apache.hugegraph.loader.failure; import java.io.BufferedWriter; import java.io.File; @@ -28,12 +28,12 @@ import java.io.Writer; import org.apache.commons.io.IOUtils; +import org.apache.hugegraph.loader.exception.InsertException; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.ParseException; +import org.apache.hugegraph.loader.exception.ReadException; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.exception.InsertException; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.exception.ParseException; -import com.baidu.hugegraph.loader.exception.ReadException; import org.apache.hugegraph.util.Log; public final class FailWriter { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphDeserialization.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphDeserialization.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphDeserialization.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphDeserialization.java index 2ffb9356e..31dafcb9f 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphDeserialization.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphDeserialization.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.flink; +package org.apache.hugegraph.loader.flink; import java.util.List; @@ -30,7 +30,7 @@ import org.apache.kafka.connect.source.SourceRecord; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.Constants; import org.apache.hugegraph.util.Log; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphFlinkCDCLoader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphFlinkCDCLoader.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphFlinkCDCLoader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphFlinkCDCLoader.java index eec6c541a..71de57e56 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphFlinkCDCLoader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphFlinkCDCLoader.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.flink; +package org.apache.hugegraph.loader.flink; import java.net.URISyntaxException; import java.util.List; @@ -26,14 +26,14 @@ import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.http.client.utils.URIBuilder; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.LoadMapping; +import org.apache.hugegraph.loader.source.jdbc.JDBCSource; +import org.apache.hugegraph.loader.util.Printer; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import com.baidu.hugegraph.loader.source.jdbc.JDBCSource; -import com.baidu.hugegraph.loader.util.Printer; import org.apache.hugegraph.util.Log; import com.ververica.cdc.connectors.mysql.source.MySqlSource; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphOutputFormat.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphOutputFormat.java similarity index 88% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphOutputFormat.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphOutputFormat.java index 2a72002d9..9b5a9e898 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphOutputFormat.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphOutputFormat.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.flink; +package org.apache.hugegraph.loader.flink; import java.util.ArrayList; import java.util.HashMap; @@ -36,26 +36,26 @@ import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.hugegraph.loader.builder.EdgeBuilder; +import org.apache.hugegraph.loader.builder.ElementBuilder; +import org.apache.hugegraph.loader.builder.VertexBuilder; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.VertexMapping; import org.slf4j.Logger; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.loader.builder.EdgeBuilder; -import com.baidu.hugegraph.loader.builder.ElementBuilder; -import com.baidu.hugegraph.loader.builder.VertexBuilder; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.VertexMapping; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.BatchEdgeRequest; -import com.baidu.hugegraph.structure.graph.BatchVertexRequest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.UpdateStrategy; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.BatchEdgeRequest; +import org.apache.hugegraph.structure.graph.BatchVertexRequest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.UpdateStrategy; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.util.Log; import io.debezium.data.Envelope; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphSinkFunction.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphSinkFunction.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphSinkFunction.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphSinkFunction.java index e4fa47d78..7e14e3107 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/flink/HugeGraphSinkFunction.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/flink/HugeGraphSinkFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.flink; +package org.apache.hugegraph.loader.flink; import javax.annotation.Nonnull; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/BackendStoreInfo.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/BackendStoreInfo.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/BackendStoreInfo.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/BackendStoreInfo.java index 1b533262d..1b7049854 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/BackendStoreInfo.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/BackendStoreInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.mapping; +package org.apache.hugegraph.loader.mapping; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/EdgeMapping.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/EdgeMapping.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/EdgeMapping.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/EdgeMapping.java index 8a0d34ad5..c9340b9ce 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/EdgeMapping.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/EdgeMapping.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.mapping; +package org.apache.hugegraph.loader.mapping; import java.util.List; -import com.baidu.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.constant.ElemType; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/ElementMapping.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/ElementMapping.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/ElementMapping.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/ElementMapping.java index 67d7925bf..66108703f 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/ElementMapping.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/ElementMapping.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.mapping; +package org.apache.hugegraph.loader.mapping; import java.io.Serializable; import java.util.Arrays; @@ -27,11 +27,11 @@ import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.loader.constant.Checkable; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.structure.graph.UpdateStrategy; +import org.apache.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.structure.graph.UpdateStrategy; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/InputStruct.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/InputStruct.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/InputStruct.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/InputStruct.java index 25cb5997f..b545fc01c 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/InputStruct.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/InputStruct.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.mapping; +package org.apache.hugegraph.loader.mapping; import java.io.Serializable; import java.util.ArrayList; @@ -25,8 +25,8 @@ import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.loader.constant.Checkable; -import com.baidu.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.source.InputSource; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/LoadMapping.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/LoadMapping.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/LoadMapping.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/LoadMapping.java index 9a23905c6..a83fd8352 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/LoadMapping.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/LoadMapping.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.mapping; +package org.apache.hugegraph.loader.mapping; import java.io.File; import java.io.IOException; @@ -33,14 +33,14 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.loader.constant.Checkable; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.util.JsonUtil; -import com.baidu.hugegraph.loader.util.LoadUtil; -import com.baidu.hugegraph.loader.util.MappingUtil; +import org.apache.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.util.LoadUtil; +import org.apache.hugegraph.loader.util.MappingUtil; +import org.apache.hugegraph.loader.source.file.FileSource; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/VertexMapping.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/VertexMapping.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/VertexMapping.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/VertexMapping.java index f05d3cfd1..5b12d3f24 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/mapping/VertexMapping.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/mapping/VertexMapping.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.loader.mapping; +package org.apache.hugegraph.loader.mapping; -import com.baidu.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.constant.ElemType; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadDistributeMetrics.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadDistributeMetrics.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadDistributeMetrics.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadDistributeMetrics.java index 3345cd169..232fdeacd 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadDistributeMetrics.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadDistributeMetrics.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.metrics; +package org.apache.hugegraph.loader.metrics; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.VertexMapping; import org.apache.spark.SparkContext; import org.apache.spark.util.LongAccumulator; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadMetrics.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadMetrics.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadMetrics.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadMetrics.java index 1105ea7dc..1ca532ee3 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadMetrics.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadMetrics.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.loader.metrics; +package org.apache.hugegraph.loader.metrics; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.LongAdder; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.VertexMapping; public final class LoadMetrics { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadReport.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadReport.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadReport.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadReport.java index 19018406e..1b4670ae2 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadReport.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadReport.java @@ -17,9 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.metrics; - -import static com.baidu.hugegraph.loader.metrics.LoadMetrics.Metrics; +package org.apache.hugegraph.loader.metrics; public final class LoadReport { @@ -88,13 +86,13 @@ public static LoadReport collect(LoadSummary summary) { for (LoadMetrics metrics : summary.inputMetricsMap().values()) { report.readSuccess += metrics.readSuccess(); report.readFailure += metrics.readFailure(); - for (Metrics labelMetrics : metrics.vertexMetrics().values()) { + for (LoadMetrics.Metrics labelMetrics : metrics.vertexMetrics().values()) { report.vertexParseSuccess += labelMetrics.parseSuccess(); report.vertexParseFailure += labelMetrics.parseFailure(); report.vertexInsertSuccess += labelMetrics.insertSuccess(); report.vertexInsertFailure += labelMetrics.insertFailure(); } - for (Metrics labelMetrics : metrics.edgeMetrics().values()) { + for (LoadMetrics.Metrics labelMetrics : metrics.edgeMetrics().values()) { report.edgeParseSuccess += labelMetrics.parseSuccess(); report.edgeParseFailure += labelMetrics.parseFailure(); report.edgeInsertSuccess += labelMetrics.insertSuccess(); diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadSummary.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadSummary.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadSummary.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadSummary.java index 1c54e3c54..b2349d996 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/LoadSummary.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/LoadSummary.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.metrics; +package org.apache.hugegraph.loader.metrics; import java.util.Collection; import java.util.Map; @@ -26,11 +26,12 @@ import org.apache.commons.lang3.time.StopWatch; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import org.apache.hugegraph.util.InsertionOrderUtil;; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.LoadMapping; +import org.apache.hugegraph.util.InsertionOrderUtil; +; public final class LoadSummary { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/RangesTimer.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/RangesTimer.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/RangesTimer.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/RangesTimer.java index 468ce46a7..d1855ff97 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/metrics/RangesTimer.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/metrics/RangesTimer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.metrics; +package org.apache.hugegraph.loader.metrics; import java.util.ArrayList; import java.util.List; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/CsvLineParser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/CsvLineParser.java similarity index 90% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/CsvLineParser.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/CsvLineParser.java index aa5992bd7..8eb869a06 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/CsvLineParser.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/CsvLineParser.java @@ -17,16 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.loader.parser; +package org.apache.hugegraph.loader.parser; import java.io.IOException; import java.util.NoSuchElementException; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.ReadException; import org.simpleflatmapper.csv.CsvParser; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.ReadException; - public class CsvLineParser extends TextLineParser { private final CsvParser.DSL dsl; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/JsonLineParser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/JsonLineParser.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/JsonLineParser.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/JsonLineParser.java index 6d9f84660..f6606ca85 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/JsonLineParser.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/JsonLineParser.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.parser; +package org.apache.hugegraph.loader.parser; import java.util.Map; -import com.baidu.hugegraph.loader.exception.ReadException; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.exception.ReadException; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.util.JsonUtil; import org.apache.hugegraph.rest.SerializeException; public class JsonLineParser implements LineParser { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/LineParser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/LineParser.java similarity index 86% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/LineParser.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/LineParser.java index 3097f2c55..ce3667edb 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/LineParser.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/LineParser.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.loader.parser; +package org.apache.hugegraph.loader.parser; -import com.baidu.hugegraph.loader.exception.ReadException; -import com.baidu.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.exception.ReadException; +import org.apache.hugegraph.loader.reader.line.Line; public interface LineParser { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/TextLineParser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/TextLineParser.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/TextLineParser.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/TextLineParser.java index d2fb1fbd5..108ea01ec 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/parser/TextLineParser.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/parser/TextLineParser.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.parser; +package org.apache.hugegraph.loader.parser; import java.util.Arrays; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.ReadException; -import com.baidu.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.ReadException; +import org.apache.hugegraph.loader.reader.line.Line; import org.apache.hugegraph.util.StringUtil; public class TextLineParser implements LineParser { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/FileItemProgress.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/FileItemProgress.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/FileItemProgress.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/FileItemProgress.java index 0a7bcb591..778ec4cd8 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/FileItemProgress.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/FileItemProgress.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.progress; +package org.apache.hugegraph.loader.progress; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/InputItemProgress.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/InputItemProgress.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/InputItemProgress.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/InputItemProgress.java index 20d0924f8..bb87481f8 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/InputItemProgress.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/InputItemProgress.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.progress; +package org.apache.hugegraph.loader.progress; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/InputProgress.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/InputProgress.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/InputProgress.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/InputProgress.java index 5aa681d6b..37829b5f0 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/InputProgress.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/InputProgress.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.loader.progress; +package org.apache.hugegraph.loader.progress; import java.util.Set; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.source.SourceType; import org.apache.hugegraph.util.InsertionOrderUtil;; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/LoadProgress.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/LoadProgress.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/LoadProgress.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/LoadProgress.java index 09f67a5e5..0de174119 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/progress/LoadProgress.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/progress/LoadProgress.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.progress; +package org.apache.hugegraph.loader.progress; import java.io.File; import java.io.IOException; @@ -31,13 +31,13 @@ import org.apache.commons.io.FileUtils; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.util.JsonUtil; -import com.baidu.hugegraph.loader.util.LoadUtil; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.util.LoadUtil; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.InputStruct; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/AbstractReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/AbstractReader.java similarity index 86% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/AbstractReader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/AbstractReader.java index f60bf8075..085a78d67 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/AbstractReader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/AbstractReader.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader; +package org.apache.hugegraph.loader.reader; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.progress.InputProgress; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.progress.InputProgress; public abstract class AbstractReader implements InputReader { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/InputReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/InputReader.java similarity index 68% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/InputReader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/InputReader.java index 23908d670..56b22f886 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/InputReader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/InputReader.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader; +package org.apache.hugegraph.loader.reader; -import com.baidu.hugegraph.loader.constant.AutoCloseableIterator; -import com.baidu.hugegraph.loader.exception.InitException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.reader.file.LocalFileReader; -import com.baidu.hugegraph.loader.reader.hdfs.HDFSFileReader; -import com.baidu.hugegraph.loader.reader.jdbc.JDBCReader; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.source.hdfs.HDFSSource; -import com.baidu.hugegraph.loader.source.jdbc.JDBCSource; +import org.apache.hugegraph.loader.constant.AutoCloseableIterator; +import org.apache.hugegraph.loader.exception.InitException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.reader.file.LocalFileReader; +import org.apache.hugegraph.loader.reader.hdfs.HDFSFileReader; +import org.apache.hugegraph.loader.reader.jdbc.JDBCReader; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.hdfs.HDFSSource; +import org.apache.hugegraph.loader.source.jdbc.JDBCSource; /** * Responsible for continuously reading the next batch of data lines diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/Readable.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/Readable.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/Readable.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/Readable.java index 1179f9452..4fe965e07 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/Readable.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/Readable.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader; +package org.apache.hugegraph.loader.reader; import java.io.IOException; import java.io.InputStream; import org.apache.hadoop.fs.Path; -import com.baidu.hugegraph.loader.progress.InputItemProgress; +import org.apache.hugegraph.loader.progress.InputItemProgress; public interface Readable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/FileLineFetcher.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/FileLineFetcher.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/FileLineFetcher.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/FileLineFetcher.java index ae1f1337e..7ed83ceed 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/FileLineFetcher.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/FileLineFetcher.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.file; +package org.apache.hugegraph.loader.reader.file; import static org.apache.hugegraph.util.Bytes.MB; @@ -38,19 +38,19 @@ import org.apache.hadoop.io.compress.CompressionInputStream; import org.apache.hadoop.io.compress.SnappyCodec; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.reader.line.LineFetcher; +import org.apache.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.source.file.FileFormat; +import org.apache.hugegraph.loader.source.file.FileSource; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.parser.CsvLineParser; -import com.baidu.hugegraph.loader.parser.JsonLineParser; -import com.baidu.hugegraph.loader.parser.LineParser; -import com.baidu.hugegraph.loader.parser.TextLineParser; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.reader.line.LineFetcher; -import com.baidu.hugegraph.loader.source.file.Compression; -import com.baidu.hugegraph.loader.source.file.FileFormat; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.parser.CsvLineParser; +import org.apache.hugegraph.loader.parser.JsonLineParser; +import org.apache.hugegraph.loader.parser.LineParser; +import org.apache.hugegraph.loader.parser.TextLineParser; +import org.apache.hugegraph.loader.reader.Readable; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/FileReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/FileReader.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/FileReader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/FileReader.java index 6bb8f068e..6d71b2764 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/FileReader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/FileReader.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.file; +package org.apache.hugegraph.loader.reader.file; import java.io.IOException; import java.util.Comparator; @@ -25,17 +25,17 @@ import java.util.List; import java.util.NoSuchElementException; +import org.apache.hugegraph.loader.exception.InitException; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.progress.InputItemProgress; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.source.file.FileSource; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.exception.InitException; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.progress.InputItemProgress; -import com.baidu.hugegraph.loader.reader.AbstractReader; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.reader.AbstractReader; +import org.apache.hugegraph.loader.reader.Readable; import org.apache.hugegraph.util.Log; public abstract class FileReader extends AbstractReader { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/LocalFileReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/LocalFileReader.java similarity index 90% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/LocalFileReader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/LocalFileReader.java index d0fa863df..e773ce742 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/LocalFileReader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/LocalFileReader.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.file; +package org.apache.hugegraph.loader.reader.file; import java.io.File; import java.io.FileInputStream; @@ -29,13 +29,13 @@ import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.Path; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.progress.FileItemProgress; -import com.baidu.hugegraph.loader.progress.InputItemProgress; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.source.file.Compression; -import com.baidu.hugegraph.loader.source.file.FileFilter; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.progress.FileItemProgress; +import org.apache.hugegraph.loader.progress.InputItemProgress; +import org.apache.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.source.file.FileFilter; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.reader.Readable; public class LocalFileReader extends FileReader { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/OrcFileLineFetcher.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/OrcFileLineFetcher.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/OrcFileLineFetcher.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/OrcFileLineFetcher.java index 8e19adb47..038991cbc 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/OrcFileLineFetcher.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/OrcFileLineFetcher.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.file; +package org.apache.hugegraph.loader.reader.file; import java.io.IOException; import java.util.List; @@ -31,13 +31,13 @@ import org.apache.hadoop.hive.ql.io.orc.RecordReader; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.source.file.FileSource; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.reader.Readable; import org.apache.hugegraph.util.Log; public class OrcFileLineFetcher extends FileLineFetcher { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/ParquetFileLineFetcher.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/ParquetFileLineFetcher.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/ParquetFileLineFetcher.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/ParquetFileLineFetcher.java index b99136cda..9fb6453e9 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/file/ParquetFileLineFetcher.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/file/ParquetFileLineFetcher.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.file; +package org.apache.hugegraph.loader.reader.file; import java.io.IOException; import java.util.List; @@ -25,6 +25,11 @@ import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.util.ParquetUtil; import org.apache.parquet.column.page.PageReadStore; import org.apache.parquet.example.data.simple.SimpleGroup; import org.apache.parquet.example.data.simple.convert.GroupRecordConverter; @@ -37,12 +42,7 @@ import org.apache.parquet.schema.Type; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.util.ParquetUtil; +import org.apache.hugegraph.loader.reader.Readable; import org.apache.hugegraph.util.Log; public class ParquetFileLineFetcher extends FileLineFetcher { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/hdfs/HDFSFileReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/hdfs/HDFSFileReader.java similarity index 89% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/hdfs/HDFSFileReader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/hdfs/HDFSFileReader.java index 90cdfa1fc..b161328c3 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/hdfs/HDFSFileReader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/hdfs/HDFSFileReader.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.hdfs; +package org.apache.hugegraph.loader.reader.hdfs; import java.io.IOException; import java.io.InputStream; @@ -31,21 +31,21 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.progress.FileItemProgress; +import org.apache.hugegraph.loader.progress.InputItemProgress; +import org.apache.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.source.file.FileFilter; +import org.apache.hugegraph.loader.source.hdfs.HDFSSource; +import org.apache.hugegraph.loader.source.hdfs.KerberosConfig; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.progress.FileItemProgress; -import com.baidu.hugegraph.loader.progress.InputItemProgress; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.reader.file.FileLineFetcher; -import com.baidu.hugegraph.loader.reader.file.FileReader; -import com.baidu.hugegraph.loader.reader.file.OrcFileLineFetcher; -import com.baidu.hugegraph.loader.reader.file.ParquetFileLineFetcher; -import com.baidu.hugegraph.loader.source.file.Compression; -import com.baidu.hugegraph.loader.source.file.FileFilter; -import com.baidu.hugegraph.loader.source.hdfs.HDFSSource; -import com.baidu.hugegraph.loader.source.hdfs.KerberosConfig; +import org.apache.hugegraph.loader.reader.Readable; +import org.apache.hugegraph.loader.reader.file.FileLineFetcher; +import org.apache.hugegraph.loader.reader.file.FileReader; +import org.apache.hugegraph.loader.reader.file.OrcFileLineFetcher; +import org.apache.hugegraph.loader.reader.file.ParquetFileLineFetcher; import org.apache.hugegraph.util.Log; public class HDFSFileReader extends FileReader { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/JDBCReader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCReader.java similarity index 86% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/JDBCReader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCReader.java index 9577cadd1..aabe69b13 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/JDBCReader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCReader.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.jdbc; +package org.apache.hugegraph.loader.reader.jdbc; import java.sql.SQLException; import java.util.List; import java.util.NoSuchElementException; -import com.baidu.hugegraph.loader.exception.InitException; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.reader.AbstractReader; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.source.jdbc.JDBCSource; +import org.apache.hugegraph.loader.exception.InitException; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.source.jdbc.JDBCSource; +import org.apache.hugegraph.loader.reader.AbstractReader; public class JDBCReader extends AbstractReader { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/JDBCUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCUtil.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/JDBCUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCUtil.java index c89330d83..2a87e52e3 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/JDBCUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/JDBCUtil.java @@ -17,14 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.jdbc; +package org.apache.hugegraph.loader.reader.jdbc; import java.sql.SQLException; +import org.apache.hugegraph.loader.exception.LoadException; import org.postgresql.core.Utils; -import com.baidu.hugegraph.loader.exception.LoadException; - public final class JDBCUtil { public static String escapeMysql(String value) { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/RowFetcher.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/RowFetcher.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/RowFetcher.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/RowFetcher.java index dc65314cc..d4bab3df6 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/jdbc/RowFetcher.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/jdbc/RowFetcher.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.jdbc; +package org.apache.hugegraph.loader.reader.jdbc; import java.sql.Connection; import java.sql.DriverManager; @@ -30,12 +30,12 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.source.jdbc.JDBCSource; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.loader.source.jdbc.JDBCSource; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/line/Line.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/line/Line.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/line/Line.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/line/Line.java index c254013dc..e066663d2 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/line/Line.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/line/Line.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.line; +package org.apache.hugegraph.loader.reader.line; import java.util.ArrayList; import java.util.Arrays; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/line/LineFetcher.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/line/LineFetcher.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/line/LineFetcher.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/line/LineFetcher.java index a72d3c94b..d012d3f41 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/reader/line/LineFetcher.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/reader/line/LineFetcher.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.reader.line; +package org.apache.hugegraph.loader.reader.line; import java.io.IOException; import java.util.List; -import com.baidu.hugegraph.loader.reader.Readable; -import com.baidu.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.reader.Readable; import org.apache.hugegraph.util.E; /** diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/DeserializeException.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/DeserializeException.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/DeserializeException.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/DeserializeException.java index 59999e2bc..1d649c2bb 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/DeserializeException.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/DeserializeException.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.serializer; +package org.apache.hugegraph.loader.serializer; import java.util.Arrays; -import com.baidu.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.LoadException; import com.fasterxml.jackson.databind.node.JsonNodeType; public class DeserializeException extends LoadException { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/InputProgressDeser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/InputProgressDeser.java similarity index 91% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/InputProgressDeser.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/InputProgressDeser.java index 3978699bb..eb11e24b3 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/InputProgressDeser.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/InputProgressDeser.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.loader.serializer; +package org.apache.hugegraph.loader.serializer; import java.io.IOException; import java.util.Set; -import com.baidu.hugegraph.loader.progress.InputItemProgress; -import com.baidu.hugegraph.loader.progress.InputProgress; -import com.baidu.hugegraph.loader.progress.FileItemProgress; -import com.baidu.hugegraph.loader.source.SourceType; -import com.baidu.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.progress.InputItemProgress; +import org.apache.hugegraph.loader.progress.InputProgress; +import org.apache.hugegraph.loader.progress.FileItemProgress; +import org.apache.hugegraph.loader.source.SourceType; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/InputSourceDeser.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/InputSourceDeser.java similarity index 89% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/InputSourceDeser.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/InputSourceDeser.java index 13b1cd7f4..6e8ab2531 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/serializer/InputSourceDeser.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/serializer/InputSourceDeser.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.loader.serializer; +package org.apache.hugegraph.loader.serializer; import java.io.IOException; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.source.SourceType; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.source.hdfs.HDFSSource; -import com.baidu.hugegraph.loader.source.jdbc.JDBCSource; -import com.baidu.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.hdfs.HDFSSource; +import org.apache.hugegraph.loader.source.jdbc.JDBCSource; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/AbstractSource.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/AbstractSource.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/AbstractSource.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/AbstractSource.java index ed2136b3e..c71935b29 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/AbstractSource.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/AbstractSource.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.loader.source; +package org.apache.hugegraph.loader.source; import java.io.Serializable; import java.nio.charset.Charset; import java.util.Arrays; import java.util.List; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.source.file.ListFormat; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.source.file.ListFormat; import org.apache.hugegraph.util.CollectionUtil; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/InputSource.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/InputSource.java similarity index 87% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/InputSource.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/InputSource.java index 4b3e9ad82..29334157c 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/InputSource.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/InputSource.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.loader.source; +package org.apache.hugegraph.loader.source; -import com.baidu.hugegraph.loader.constant.Checkable; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.source.file.FileSource; import com.fasterxml.jackson.annotation.JsonProperty; public interface InputSource extends Checkable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/SourceType.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/SourceType.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/SourceType.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/SourceType.java index 5b870cfb6..125d1ae16 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/SourceType.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/SourceType.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.source; +package org.apache.hugegraph.loader.source; public enum SourceType { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/Compression.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/Compression.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/Compression.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/Compression.java index 4d0489b16..39ae693f5 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/Compression.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/Compression.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.file; +package org.apache.hugegraph.loader.source.file; public enum Compression { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileFilter.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileFilter.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileFilter.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileFilter.java index 5e9acc208..e40ddd88b 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileFilter.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileFilter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.file; +package org.apache.hugegraph.loader.source.file; import java.io.Serializable; import java.util.Set; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileFormat.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileFormat.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileFormat.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileFormat.java index 5669f4e7d..23aad249d 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileFormat.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileFormat.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.file; +package org.apache.hugegraph.loader.source.file; -import com.baidu.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.Constants; public enum FileFormat { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileSource.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileSource.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileSource.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileSource.java index 5d8516776..e102bda4f 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/FileSource.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/FileSource.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.file; +package org.apache.hugegraph.loader.source.file; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.source.AbstractSource; -import com.baidu.hugegraph.loader.source.SourceType; -import com.baidu.hugegraph.loader.util.DateUtil; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.util.DateUtil; +import org.apache.hugegraph.loader.source.AbstractSource; +import org.apache.hugegraph.loader.source.SourceType; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/ListFormat.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/ListFormat.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/ListFormat.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/ListFormat.java index 22d054eca..7fae01beb 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/ListFormat.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/ListFormat.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.file; +package org.apache.hugegraph.loader.source.file; import java.util.Collections; import java.util.Set; -import com.baidu.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.Constants; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Sets; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/SkippedLine.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/SkippedLine.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/SkippedLine.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/SkippedLine.java index ad16ab84d..d5b1627d8 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/file/SkippedLine.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/file/SkippedLine.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.file; +package org.apache.hugegraph.loader.source.file; import java.io.Serializable; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.baidu.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.Constants; import com.fasterxml.jackson.annotation.JsonProperty; public class SkippedLine implements Serializable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/hdfs/HDFSSource.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/hdfs/HDFSSource.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/hdfs/HDFSSource.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/hdfs/HDFSSource.java index d09c96c7f..b73540002 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/hdfs/HDFSSource.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/hdfs/HDFSSource.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.hdfs; +package org.apache.hugegraph.loader.source.hdfs; import java.io.File; import java.nio.file.Paths; @@ -25,8 +25,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.loader.source.SourceType; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.source.file.FileSource; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/hdfs/KerberosConfig.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/hdfs/KerberosConfig.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/hdfs/KerberosConfig.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/hdfs/KerberosConfig.java index 099f43c62..ea00016c9 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/hdfs/KerberosConfig.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/hdfs/KerberosConfig.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.hdfs; +package org.apache.hugegraph.loader.source.hdfs; import java.io.File; import java.nio.file.Paths; @@ -25,7 +25,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.constant.Checkable; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/jdbc/JDBCSource.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/jdbc/JDBCSource.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/jdbc/JDBCSource.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/jdbc/JDBCSource.java index 19294fe3d..7f323d8f7 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/jdbc/JDBCSource.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/jdbc/JDBCSource.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.jdbc; +package org.apache.hugegraph.loader.source.jdbc; -import com.baidu.hugegraph.loader.source.AbstractSource; -import com.baidu.hugegraph.loader.source.SourceType; -import com.baidu.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.AbstractSource; +import org.apache.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.source.file.FileSource; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/jdbc/JDBCVendor.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/jdbc/JDBCVendor.java similarity index 98% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/jdbc/JDBCVendor.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/jdbc/JDBCVendor.java index 540c779fe..50d607be6 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/source/jdbc/JDBCVendor.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/source/jdbc/JDBCVendor.java @@ -17,16 +17,16 @@ * under the License. */ -package com.baidu.hugegraph.loader.source.jdbc; +package org.apache.hugegraph.loader.source.jdbc; import java.net.URISyntaxException; import org.apache.http.client.utils.URIBuilder; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.reader.jdbc.JDBCUtil; -import com.baidu.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.reader.jdbc.JDBCUtil; +import org.apache.hugegraph.loader.reader.line.Line; import org.apache.hugegraph.util.E; public enum JDBCVendor { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/spark/HugeGraphSparkLoader.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/spark/HugeGraphSparkLoader.java similarity index 88% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/spark/HugeGraphSparkLoader.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/spark/HugeGraphSparkLoader.java index 160aa7777..5a8c2a46a 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/spark/HugeGraphSparkLoader.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/spark/HugeGraphSparkLoader.java @@ -17,35 +17,36 @@ * under the License. */ -package com.baidu.hugegraph.loader.spark; +package org.apache.hugegraph.loader.spark; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.loader.builder.EdgeBuilder; -import com.baidu.hugegraph.loader.builder.ElementBuilder; -import com.baidu.hugegraph.loader.builder.VertexBuilder; -import com.baidu.hugegraph.loader.direct.loader.HBaseDirectLoader; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import com.baidu.hugegraph.loader.mapping.VertexMapping; -import com.baidu.hugegraph.loader.metrics.LoadDistributeMetrics; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.source.file.Compression; -import com.baidu.hugegraph.loader.source.file.FileFilter; -import com.baidu.hugegraph.loader.source.file.FileFormat; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.source.file.SkippedLine; -import com.baidu.hugegraph.loader.source.jdbc.JDBCSource; -import com.baidu.hugegraph.loader.util.Printer; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.BatchEdgeRequest; -import com.baidu.hugegraph.structure.graph.BatchVertexRequest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.UpdateStrategy; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.loader.builder.EdgeBuilder; +import org.apache.hugegraph.loader.builder.ElementBuilder; +import org.apache.hugegraph.loader.builder.VertexBuilder; +import org.apache.hugegraph.loader.direct.loader.HBaseDirectLoader; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.metrics.LoadDistributeMetrics; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.source.jdbc.JDBCSource; +import org.apache.hugegraph.loader.util.Printer; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.LoadMapping; +import org.apache.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.source.file.FileFilter; +import org.apache.hugegraph.loader.source.file.FileFormat; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.file.SkippedLine; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.BatchEdgeRequest; +import org.apache.hugegraph.structure.graph.BatchVertexRequest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.UpdateStrategy; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.util.Log; import org.apache.spark.SparkConf; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/EdgeStructV1.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/EdgeStructV1.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/EdgeStructV1.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/EdgeStructV1.java index e2f8a64ad..98e5d18ad 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/EdgeStructV1.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/EdgeStructV1.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.struct; +package org.apache.hugegraph.loader.struct; import java.util.List; -import com.baidu.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.constant.ElemType; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/ElementStructV1.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/ElementStructV1.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/ElementStructV1.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/ElementStructV1.java index dc6f6671d..017e91414 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/ElementStructV1.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/ElementStructV1.java @@ -17,20 +17,20 @@ * under the License. */ -package com.baidu.hugegraph.loader.struct; +package org.apache.hugegraph.loader.struct; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.loader.constant.Checkable; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.constant.Unique; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.util.JsonUtil; -import com.baidu.hugegraph.structure.graph.UpdateStrategy; +import org.apache.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.constant.Unique; +import org.apache.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.structure.graph.UpdateStrategy; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.HashUtil; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/GraphStructV1.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/GraphStructV1.java similarity index 89% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/GraphStructV1.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/GraphStructV1.java index 1b9af2949..a12063cf3 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/GraphStructV1.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/GraphStructV1.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.struct; +package org.apache.hugegraph.loader.struct; import java.io.File; import java.io.IOException; @@ -26,18 +26,18 @@ import java.util.Set; import java.util.stream.Collectors; -import com.baidu.hugegraph.loader.mapping.BackendStoreInfo; +import org.apache.hugegraph.loader.constant.Checkable; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.mapping.BackendStoreInfo; import org.apache.commons.collections.ListUtils; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.Checkable; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.util.JsonUtil; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/VertexStructV1.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/VertexStructV1.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/VertexStructV1.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/VertexStructV1.java index 1f972151b..d154642b4 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/struct/VertexStructV1.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/struct/VertexStructV1.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.loader.struct; +package org.apache.hugegraph.loader.struct; -import com.baidu.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.constant.ElemType; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/BatchInsertTask.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/BatchInsertTask.java similarity index 88% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/BatchInsertTask.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/BatchInsertTask.java index d9d22b143..77b957961 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/BatchInsertTask.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/BatchInsertTask.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.loader.task; +package org.apache.hugegraph.loader.task; -import static com.baidu.hugegraph.loader.constant.Constants.BATCH_PRINT_FREQ; +import static org.apache.hugegraph.loader.constant.Constants.BATCH_PRINT_FREQ; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.loader.util.Printer; import org.slf4j.Logger; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.loader.builder.Record; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.util.Printer; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.loader.builder.Record; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; import org.apache.hugegraph.rest.ClientException; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/InsertTask.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/InsertTask.java similarity index 84% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/InsertTask.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/InsertTask.java index 72770fe29..cc2d07834 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/InsertTask.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/InsertTask.java @@ -17,26 +17,26 @@ * under the License. */ -package com.baidu.hugegraph.loader.task; +package org.apache.hugegraph.loader.task; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.loader.builder.Record; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.metrics.LoadMetrics; -import com.baidu.hugegraph.loader.metrics.LoadSummary; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.BatchEdgeRequest; -import com.baidu.hugegraph.structure.graph.BatchVertexRequest; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.loader.builder.Record; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.metrics.LoadMetrics; +import org.apache.hugegraph.loader.metrics.LoadSummary; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.BatchEdgeRequest; +import org.apache.hugegraph.structure.graph.BatchVertexRequest; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import com.google.common.collect.ImmutableSet; public abstract class InsertTask implements Runnable { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/ParseTaskBuilder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/ParseTaskBuilder.java similarity index 86% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/ParseTaskBuilder.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/ParseTaskBuilder.java index 47b75f46f..2dfa71073 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/ParseTaskBuilder.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/ParseTaskBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.task; +package org.apache.hugegraph.loader.task; import java.util.ArrayList; import java.util.List; @@ -25,21 +25,21 @@ import org.slf4j.Logger; -import com.baidu.hugegraph.loader.builder.EdgeBuilder; -import com.baidu.hugegraph.loader.builder.ElementBuilder; -import com.baidu.hugegraph.loader.builder.Record; -import com.baidu.hugegraph.loader.builder.VertexBuilder; -import com.baidu.hugegraph.loader.exception.ParseException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.VertexMapping; -import com.baidu.hugegraph.loader.metrics.LoadMetrics; -import com.baidu.hugegraph.loader.reader.line.Line; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.loader.builder.EdgeBuilder; +import org.apache.hugegraph.loader.builder.ElementBuilder; +import org.apache.hugegraph.loader.builder.Record; +import org.apache.hugegraph.loader.builder.VertexBuilder; +import org.apache.hugegraph.loader.exception.ParseException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.loader.metrics.LoadMetrics; +import org.apache.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/SingleInsertTask.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/SingleInsertTask.java similarity index 86% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/SingleInsertTask.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/SingleInsertTask.java index 432e49497..24fcde2fe 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/SingleInsertTask.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/SingleInsertTask.java @@ -17,22 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.loader.task; +package org.apache.hugegraph.loader.task; -import static com.baidu.hugegraph.loader.constant.Constants.SINGLE_PRINT_FREQ; +import static org.apache.hugegraph.loader.constant.Constants.SINGLE_PRINT_FREQ; import java.util.List; +import org.apache.hugegraph.loader.util.Printer; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.builder.Record; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.InsertException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.util.Printer; +import org.apache.hugegraph.loader.builder.Record; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.InsertException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; import org.apache.hugegraph.util.Log; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/TaskManager.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/TaskManager.java similarity index 92% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/TaskManager.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/TaskManager.java index ee2b35cbc..27b042626 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/task/TaskManager.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/task/TaskManager.java @@ -17,10 +17,10 @@ * under the License. */ -package com.baidu.hugegraph.loader.task; +package org.apache.hugegraph.loader.task; -import static com.baidu.hugegraph.loader.constant.Constants.BATCH_WORKER; -import static com.baidu.hugegraph.loader.constant.Constants.SINGLE_WORKER; +import static org.apache.hugegraph.loader.constant.Constants.BATCH_WORKER; +import static org.apache.hugegraph.loader.constant.Constants.SINGLE_WORKER; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -30,13 +30,13 @@ import org.slf4j.Logger; -import com.baidu.hugegraph.loader.builder.Record; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.metrics.LoadSummary; +import org.apache.hugegraph.loader.builder.Record; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.metrics.LoadSummary; import org.apache.hugegraph.util.ExecutorUtil; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/DataTypeUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DataTypeUtil.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/DataTypeUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DataTypeUtil.java index ac7216aea..002cb05c5 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/DataTypeUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DataTypeUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.util.ArrayList; import java.util.Collection; @@ -26,14 +26,14 @@ import java.util.Set; import java.util.UUID; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.source.AbstractSource; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.source.file.ListFormat; -import com.baidu.hugegraph.structure.constant.Cardinality; -import com.baidu.hugegraph.structure.constant.DataType; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.source.AbstractSource; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.source.file.ListFormat; +import org.apache.hugegraph.structure.constant.Cardinality; +import org.apache.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.InsertionOrderUtil;; import org.apache.hugegraph.util.ReflectionUtil; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/DateUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DateUtil.java similarity index 96% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/DateUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DateUtil.java index f86ff029a..609360b3e 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/DateUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/DateUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.util.Date; import java.util.Map; @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.hugegraph.date.SafeDateFormat; -import com.baidu.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.constant.Constants; public final class DateUtil { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/HugeClientHolder.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/HugeClientHolder.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/HugeClientHolder.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/HugeClientHolder.java index 4700c4156..92f561d94 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/HugeClientHolder.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/HugeClientHolder.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.nio.file.Paths; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.HugeClientBuilder; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.HugeClientBuilder; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.executor.LoadOptions; import org.apache.hugegraph.rest.ClientException; import org.apache.hugegraph.util.E; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/JsonUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/JsonUtil.java similarity index 93% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/JsonUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/JsonUtil.java index dc61446b2..ac9eb718a 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/JsonUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/JsonUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.io.IOException; import java.util.ArrayList; @@ -28,11 +28,11 @@ import org.slf4j.Logger; -import com.baidu.hugegraph.loader.progress.InputProgress; -import com.baidu.hugegraph.loader.serializer.DeserializeException; -import com.baidu.hugegraph.loader.serializer.InputProgressDeser; -import com.baidu.hugegraph.loader.serializer.InputSourceDeser; -import com.baidu.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.progress.InputProgress; +import org.apache.hugegraph.loader.serializer.DeserializeException; +import org.apache.hugegraph.loader.serializer.InputProgressDeser; +import org.apache.hugegraph.loader.serializer.InputSourceDeser; +import org.apache.hugegraph.loader.source.InputSource; import org.apache.hugegraph.rest.SerializeException; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.Log; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/LoadUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/LoadUtil.java similarity index 94% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/LoadUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/LoadUtil.java index 5c509fcb0..c94807a8b 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/LoadUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/LoadUtil.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.io.File; import java.lang.reflect.UndeclaredThrowableException; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.executor.LoadOptions; import org.apache.hugegraph.util.E; import com.beust.jcommander.JCommander; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/MappingUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/MappingUtil.java similarity index 89% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/MappingUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/MappingUtil.java index ca88f40c9..5bd405e4c 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/MappingUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/MappingUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.io.File; import java.io.IOException; @@ -28,20 +28,20 @@ import org.apache.commons.io.FileUtils; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.mapping.EdgeMapping; -import com.baidu.hugegraph.loader.mapping.ElementMapping; -import com.baidu.hugegraph.loader.mapping.InputStruct; -import com.baidu.hugegraph.loader.mapping.LoadMapping; -import com.baidu.hugegraph.loader.mapping.VertexMapping; -import com.baidu.hugegraph.loader.source.InputSource; -import com.baidu.hugegraph.loader.source.SourceType; -import com.baidu.hugegraph.loader.source.file.FileSource; -import com.baidu.hugegraph.loader.struct.EdgeStructV1; -import com.baidu.hugegraph.loader.struct.ElementStructV1; -import com.baidu.hugegraph.loader.struct.GraphStructV1; -import com.baidu.hugegraph.loader.struct.VertexStructV1; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.mapping.EdgeMapping; +import org.apache.hugegraph.loader.mapping.ElementMapping; +import org.apache.hugegraph.loader.mapping.InputStruct; +import org.apache.hugegraph.loader.mapping.LoadMapping; +import org.apache.hugegraph.loader.mapping.VertexMapping; +import org.apache.hugegraph.loader.source.InputSource; +import org.apache.hugegraph.loader.source.SourceType; +import org.apache.hugegraph.loader.source.file.FileSource; +import org.apache.hugegraph.loader.struct.EdgeStructV1; +import org.apache.hugegraph.loader.struct.ElementStructV1; +import org.apache.hugegraph.loader.struct.GraphStructV1; +import org.apache.hugegraph.loader.struct.VertexStructV1; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.InsertionOrderUtil;; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/ParquetUtil.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java similarity index 97% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/ParquetUtil.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java index 98fddabc1..f732c4df5 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/ParquetUtil.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import java.time.LocalDate; import java.time.LocalDateTime; @@ -30,7 +30,7 @@ import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.Type; -import com.baidu.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.LoadException; public class ParquetUtil { diff --git a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/Printer.java b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/Printer.java similarity index 95% rename from hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/Printer.java rename to hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/Printer.java index ef0ac8cdc..bbe920a97 100644 --- a/hugegraph-loader/src/main/java/com/baidu/hugegraph/loader/util/Printer.java +++ b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/Printer.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.loader.util; +package org.apache.hugegraph.loader.util; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.constant.ElemType; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.metrics.LoadReport; -import com.baidu.hugegraph.loader.metrics.LoadSummary; -import com.baidu.hugegraph.loader.progress.LoadProgress; +import org.apache.hugegraph.loader.constant.ElemType; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.metrics.LoadReport; +import org.apache.hugegraph.loader.metrics.LoadSummary; +import org.apache.hugegraph.loader.progress.LoadProgress; import org.apache.hugegraph.util.Log; import org.apache.hugegraph.util.TimeUtil; diff --git a/hugegraph-loader/src/main/resources/log4j2.xml b/hugegraph-loader/src/main/resources/log4j2.xml index 7b65a83fc..3014d8147 100644 --- a/hugegraph-loader/src/main/resources/log4j2.xml +++ b/hugegraph-loader/src/main/resources/log4j2.xml @@ -62,7 +62,7 @@ - + diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/DBUtil.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/DBUtil.java similarity index 96% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/DBUtil.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/DBUtil.java index 814e13225..9f63c9ab6 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/DBUtil.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/DBUtil.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import com.baidu.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.LoadException; public class DBUtil { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/FileLoadTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/FileLoadTest.java similarity index 99% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/FileLoadTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/FileLoadTest.java index ee4467892..e46310be3 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/FileLoadTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/FileLoadTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.io.File; import java.io.IOException; @@ -35,29 +35,29 @@ import org.apache.hadoop.hive.common.type.Date; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; +import org.apache.hugegraph.loader.HugeGraphLoader; +import org.apache.hugegraph.loader.util.DateUtil; +import org.apache.hugegraph.loader.util.HugeClientHolder; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.exception.ServerException; -import com.baidu.hugegraph.loader.HugeGraphLoader; -import com.baidu.hugegraph.loader.constant.Constants; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.exception.ParseException; -import com.baidu.hugegraph.loader.executor.LoadContext; -import com.baidu.hugegraph.loader.executor.LoadOptions; -import com.baidu.hugegraph.loader.progress.FileItemProgress; -import com.baidu.hugegraph.loader.progress.InputItemProgress; -import com.baidu.hugegraph.loader.progress.InputProgress; -import com.baidu.hugegraph.loader.source.file.Compression; -import com.baidu.hugegraph.loader.util.DateUtil; -import com.baidu.hugegraph.loader.util.HugeClientHolder; -import com.baidu.hugegraph.structure.constant.DataType; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.exception.ServerException; +import org.apache.hugegraph.loader.constant.Constants; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.exception.ParseException; +import org.apache.hugegraph.loader.executor.LoadContext; +import org.apache.hugegraph.loader.executor.LoadOptions; +import org.apache.hugegraph.loader.progress.FileItemProgress; +import org.apache.hugegraph.loader.progress.InputItemProgress; +import org.apache.hugegraph.loader.progress.InputProgress; +import org.apache.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.structure.constant.DataType; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.PropertyKey; import org.apache.hugegraph.testutil.Assert; import org.apache.hugegraph.testutil.Whitebox; import org.apache.hugegraph.util.LongEncoding; diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/FileUtil.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/FileUtil.java similarity index 97% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/FileUtil.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/FileUtil.java index 86c7ab116..d57d4fc1f 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/FileUtil.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/FileUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.io.File; import java.io.FileNotFoundException; @@ -31,7 +31,7 @@ import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; -import com.baidu.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.source.file.Compression; public class FileUtil implements IOUtil { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/HDFSLoadTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/HDFSLoadTest.java similarity index 96% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/HDFSLoadTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/HDFSLoadTest.java index b9fcc2678..83ccafa6c 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/HDFSLoadTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/HDFSLoadTest.java @@ -17,18 +17,18 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.nio.file.Paths; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.loader.HugeGraphLoader; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.loader.HugeGraphLoader; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; public class HDFSLoadTest extends FileLoadTest { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/HDFSUtil.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/HDFSUtil.java similarity index 97% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/HDFSUtil.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/HDFSUtil.java index 3959e50f2..460760ef7 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/HDFSUtil.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/HDFSUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.io.File; import java.io.IOException; @@ -33,8 +33,8 @@ import org.apache.hadoop.fs.Path; import org.slf4j.Logger; -import com.baidu.hugegraph.loader.exception.LoadException; -import com.baidu.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.exception.LoadException; +import org.apache.hugegraph.loader.source.file.Compression; import org.apache.hugegraph.util.Log; public class HDFSUtil implements IOUtil { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/IOUtil.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/IOUtil.java similarity index 97% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/IOUtil.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/IOUtil.java index 2e540d9f8..205ba3715 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/IOUtil.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/IOUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.io.BufferedOutputStream; import java.io.IOException; @@ -37,7 +37,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import com.baidu.hugegraph.loader.source.file.Compression; +import org.apache.hugegraph.loader.source.file.Compression; public interface IOUtil { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/JDBCLoadTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/JDBCLoadTest.java similarity index 97% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/JDBCLoadTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/JDBCLoadTest.java index be33ca8d3..dbf46545c 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/JDBCLoadTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/JDBCLoadTest.java @@ -17,19 +17,19 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.util.List; +import org.apache.hugegraph.loader.HugeGraphLoader; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.baidu.hugegraph.loader.HugeGraphLoader; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/LoadTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/LoadTest.java similarity index 95% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/LoadTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/LoadTest.java index 340e3beb4..a990f2ab1 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/functional/LoadTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/functional/LoadTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.functional; +package org.apache.hugegraph.loader.test.functional; import java.nio.file.Paths; import java.text.DateFormat; @@ -27,10 +27,10 @@ import java.util.Map; import java.util.TimeZone; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.structure.constant.T; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.structure.constant.T; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; import org.apache.hugegraph.testutil.Assert; diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/DateUtilTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/DateUtilTest.java similarity index 96% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/DateUtilTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/DateUtilTest.java index 48026d216..129a3e0af 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/DateUtilTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/DateUtilTest.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.unit; +package org.apache.hugegraph.loader.test.unit; +import org.apache.hugegraph.loader.util.DateUtil; import org.junit.Test; -import com.baidu.hugegraph.loader.util.DateUtil; import org.apache.hugegraph.testutil.Assert; public class DateUtilTest { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/LineTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/LineTest.java similarity index 96% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/LineTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/LineTest.java index 78b3e1b21..21fa43bfe 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/LineTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/LineTest.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.unit; +package org.apache.hugegraph.loader.test.unit; import org.junit.Test; -import com.baidu.hugegraph.loader.reader.line.Line; +import org.apache.hugegraph.loader.reader.line.Line; import org.apache.hugegraph.testutil.Assert; public class LineTest { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/LoadProgressTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/LoadProgressTest.java similarity index 94% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/LoadProgressTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/LoadProgressTest.java index 1a0b98f9c..a9ae92a2c 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/LoadProgressTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/LoadProgressTest.java @@ -17,13 +17,13 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.unit; +package org.apache.hugegraph.loader.test.unit; +import org.apache.hugegraph.loader.test.functional.LoadTest; +import org.apache.hugegraph.loader.util.JsonUtil; import org.junit.Test; -import com.baidu.hugegraph.loader.progress.LoadProgress; -import com.baidu.hugegraph.loader.test.functional.LoadTest; -import com.baidu.hugegraph.loader.util.JsonUtil; +import org.apache.hugegraph.loader.progress.LoadProgress; import org.apache.hugegraph.testutil.Assert; public class LoadProgressTest extends LoadTest { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/MappingConverterTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/MappingConverterTest.java similarity index 98% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/MappingConverterTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/MappingConverterTest.java index c937daed0..7f1dee26b 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/MappingConverterTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/MappingConverterTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.unit; +package org.apache.hugegraph.loader.test.unit; import java.io.File; import java.io.IOException; @@ -25,11 +25,10 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; +import org.apache.hugegraph.loader.MappingConverter; import org.junit.Assert; import org.junit.Test; -import com.baidu.hugegraph.loader.MappingConverter; - public class MappingConverterTest { @Test diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/RangesTimerTest.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/RangesTimerTest.java similarity index 94% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/RangesTimerTest.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/RangesTimerTest.java index f69436123..52e186a98 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/RangesTimerTest.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/RangesTimerTest.java @@ -17,11 +17,11 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.unit; +package org.apache.hugegraph.loader.test.unit; import org.junit.Test; -import com.baidu.hugegraph.loader.metrics.RangesTimer; +import org.apache.hugegraph.loader.metrics.RangesTimer; import org.apache.hugegraph.testutil.Assert; public class RangesTimerTest { diff --git a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/UnitTestSuite.java b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/UnitTestSuite.java similarity index 95% rename from hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/UnitTestSuite.java rename to hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/UnitTestSuite.java index 2f061db47..2ea692ea3 100644 --- a/hugegraph-loader/src/test/java/com/baidu/hugegraph/loader/test/unit/UnitTestSuite.java +++ b/hugegraph-loader/src/test/java/org/apache/hugegraph/loader/test/unit/UnitTestSuite.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.loader.test.unit; +package org.apache.hugegraph.loader.test.unit; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/hugegraph-tools/assembly/bin/hugegraph b/hugegraph-tools/assembly/bin/hugegraph index 27d49d996..3a2635c2e 100755 --- a/hugegraph-tools/assembly/bin/hugegraph +++ b/hugegraph-tools/assembly/bin/hugegraph @@ -143,4 +143,4 @@ if [ "$JAVA_OPTIONS" = "" ] ; then fi exec $JAVA -Dtools.home.path=${TOP} $JAVA_OPTIONS -cp $LIB/hugegraph-tools-*.jar -Djava.ext.dirs=$LIB/ \ -com.baidu.hugegraph.cmd.HugeGraphCommand $URL_ARG $GRAPH_ARG $USER_ARG $PASSWORD_ARG $TIMEOUT_ARG $TRUST_STORE_FILE_ARG $TRUST_STORE_PASSWORD_ARG "$@" +org.apache.hugegraph.cmd.HugeGraphCommand $URL_ARG $GRAPH_ARG $USER_ARG $PASSWORD_ARG $TIMEOUT_ARG $TRUST_STORE_FILE_ARG $TRUST_STORE_PASSWORD_ARG "$@" diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/Directory.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/Directory.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/Directory.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/Directory.java index 947ad4ff8..28bc04afe 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/Directory.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/Directory.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.io.Closeable; import java.io.InputStream; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/HdfsDirectory.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/HdfsDirectory.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/HdfsDirectory.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/HdfsDirectory.java index 758b4b42d..6318f595b 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/HdfsDirectory.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/HdfsDirectory.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.io.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import com.baidu.hugegraph.exception.ToolsException; +import org.apache.hugegraph.exception.ToolsException; import org.apache.hugegraph.rest.ClientException; import org.apache.hugegraph.util.E; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/LocalDirectory.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/LocalDirectory.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/LocalDirectory.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/LocalDirectory.java index 0e11f4585..a43c92e48 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/LocalDirectory.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/LocalDirectory.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.io.File; import java.io.FileInputStream; @@ -34,7 +34,7 @@ import org.apache.commons.io.FileUtils; -import com.baidu.hugegraph.exception.ToolsException; +import org.apache.hugegraph.exception.ToolsException; import org.apache.hugegraph.rest.ClientException; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/Printer.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/Printer.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/Printer.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/Printer.java index 74af379f4..d5a907e4f 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/Printer.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/Printer.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.util.List; import java.util.Map; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/RetryManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/RetryManager.java similarity index 97% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/RetryManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/RetryManager.java index 87ddc8577..b9f1d34ba 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/RetryManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/RetryManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import com.baidu.hugegraph.exception.ToolsException; +import org.apache.hugegraph.exception.ToolsException; public class RetryManager extends ToolManager { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/ToolClient.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/ToolClient.java similarity index 91% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/ToolClient.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/ToolClient.java index 6807d9357..24ce53bea 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/ToolClient.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/ToolClient.java @@ -17,21 +17,22 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.nio.file.Paths; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.driver.AuthManager; -import com.baidu.hugegraph.driver.GraphManager; -import com.baidu.hugegraph.driver.GremlinManager; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.driver.SchemaManager; -import com.baidu.hugegraph.driver.TaskManager; -import com.baidu.hugegraph.driver.TraverserManager; +import org.apache.hugegraph.driver.AuthManager; +import org.apache.hugegraph.driver.GraphManager; +import org.apache.hugegraph.driver.GremlinManager; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.driver.SchemaManager; +import org.apache.hugegraph.driver.TaskManager; +import org.apache.hugegraph.driver.TraverserManager; import org.apache.hugegraph.util.E; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.hugegraph.driver.GraphsManager; public class ToolClient { @@ -90,7 +91,7 @@ public SchemaManager schema() { return this.client.schema(); } - public com.baidu.hugegraph.driver.GraphsManager graphs() { + public GraphsManager graphs() { return this.client.graphs(); } diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/ToolManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/ToolManager.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/base/ToolManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/base/ToolManager.java index 14dab84ad..19ef4af59 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/base/ToolManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/base/ToolManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.base; +package org.apache.hugegraph.base; import java.io.IOException; import java.util.List; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/cmd/HugeGraphCommand.java similarity index 94% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/cmd/HugeGraphCommand.java index 31e2ed82d..24c09f26e 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/cmd/HugeGraphCommand.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.cmd; +package org.apache.hugegraph.cmd; import java.util.Arrays; import java.util.Iterator; @@ -27,34 +27,31 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.base.ToolManager; +import org.apache.hugegraph.constant.Constants; +import org.apache.hugegraph.exception.ExitException; +import org.apache.hugegraph.util.ToolUtil; import org.apache.logging.log4j.util.Strings; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.base.ToolClient.ConnectionInfo; -import com.baidu.hugegraph.base.ToolManager; -import com.baidu.hugegraph.constant.Constants; -import com.baidu.hugegraph.exception.ExitException; -import com.baidu.hugegraph.manager.AuthBackupRestoreManager; -import com.baidu.hugegraph.manager.BackupManager; -import com.baidu.hugegraph.manager.DumpGraphManager; -import com.baidu.hugegraph.manager.GraphsManager; -import com.baidu.hugegraph.manager.GremlinManager; -import com.baidu.hugegraph.manager.RestoreManager; -import com.baidu.hugegraph.manager.TasksManager; -import com.baidu.hugegraph.structure.Task; -import com.baidu.hugegraph.structure.constant.GraphMode; -import com.baidu.hugegraph.structure.gremlin.Result; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.manager.AuthBackupRestoreManager; +import org.apache.hugegraph.manager.BackupManager; +import org.apache.hugegraph.manager.DumpGraphManager; +import org.apache.hugegraph.manager.GraphsManager; +import org.apache.hugegraph.manager.GremlinManager; +import org.apache.hugegraph.manager.RestoreManager; +import org.apache.hugegraph.manager.TasksManager; +import org.apache.hugegraph.structure.Task; +import org.apache.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.structure.gremlin.Result; +import org.apache.hugegraph.structure.gremlin.ResultSet; import org.apache.hugegraph.util.E; -import com.baidu.hugegraph.util.ToolUtil; import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterException; import com.beust.jcommander.ParametersDelegate; import com.google.common.collect.Lists; -import static com.baidu.hugegraph.manager.BackupManager.BACKUP_DEFAULT_TIMEOUT; - public class HugeGraphCommand { private static final int DEFAULT_GRAPH_CLEAR_TIMEOUT = 300; @@ -190,8 +187,8 @@ private void execute(String subCmd, JCommander jCommander) { this.checkMainParams(); switch (subCmd) { case "backup": - if (this.timeout() < BACKUP_DEFAULT_TIMEOUT) { - this.timeout(BACKUP_DEFAULT_TIMEOUT); + if (this.timeout() < BackupManager.BACKUP_DEFAULT_TIMEOUT) { + this.timeout(BackupManager.BACKUP_DEFAULT_TIMEOUT); } Printer.print("Graph '%s' start backup!", this.graph()); SubCommands.Backup backup = this.subCommand(subCmd); @@ -222,8 +219,8 @@ private void execute(String subCmd, JCommander jCommander) { migrate.targetUrl(), migrate.targetGraph()); // Backup source graph - if (this.timeout() < BACKUP_DEFAULT_TIMEOUT) { - this.timeout(BACKUP_DEFAULT_TIMEOUT); + if (this.timeout() < BackupManager.BACKUP_DEFAULT_TIMEOUT) { + this.timeout(BackupManager.BACKUP_DEFAULT_TIMEOUT); } backup = convMigrate2Backup(migrate); backupManager = manager(BackupManager.class); @@ -421,7 +418,7 @@ private void checkMainParams() { private T manager(Class clz) { try { - ConnectionInfo info = new ConnectionInfo(this.url(), this.graph(), + ToolClient.ConnectionInfo info = new ToolClient.ConnectionInfo(this.url(), this.graph(), this.username(), this.password(), this.timeout(), diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/cmd/SubCommands.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/cmd/SubCommands.java similarity index 99% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/cmd/SubCommands.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/cmd/SubCommands.java index 099b36b91..4f070ea23 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/cmd/SubCommands.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/cmd/SubCommands.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.cmd; +package org.apache.hugegraph.cmd; import java.io.File; import java.io.IOException; @@ -31,11 +31,11 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.constant.AuthRestoreConflictStrategy; -import com.baidu.hugegraph.manager.TasksManager; -import com.baidu.hugegraph.structure.constant.GraphMode; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.constant.AuthRestoreConflictStrategy; +import org.apache.hugegraph.manager.TasksManager; +import org.apache.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.structure.constant.HugeType; import org.apache.hugegraph.util.E; import org.apache.hugegraph.util.InsertionOrderUtil; import com.beust.jcommander.DynamicParameter; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/constant/AuthRestoreConflictStrategy.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/constant/AuthRestoreConflictStrategy.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/constant/AuthRestoreConflictStrategy.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/constant/AuthRestoreConflictStrategy.java index ff8650605..50e54c665 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/constant/AuthRestoreConflictStrategy.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/constant/AuthRestoreConflictStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.constant; +package org.apache.hugegraph.constant; public enum AuthRestoreConflictStrategy { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/constant/Constants.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/constant/Constants.java similarity index 96% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/constant/Constants.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/constant/Constants.java index 59f09320c..42d1f33a9 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/constant/Constants.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/constant/Constants.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.constant; +package org.apache.hugegraph.constant; public final class Constants { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/exception/ExitException.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/exception/ExitException.java similarity index 97% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/exception/ExitException.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/exception/ExitException.java index 552466dc7..cec08e94f 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/exception/ExitException.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/exception/ExitException.java @@ -17,9 +17,9 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; -import com.baidu.hugegraph.constant.Constants; +import org.apache.hugegraph.constant.Constants; public class ExitException extends RuntimeException { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/exception/ToolsException.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/exception/ToolsException.java similarity index 97% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/exception/ToolsException.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/exception/ToolsException.java index b363e6a69..0340573a5 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/exception/ToolsException.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/exception/ToolsException.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.exception; +package org.apache.hugegraph.exception; public class ToolsException extends RuntimeException { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/Formatter.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/Formatter.java similarity index 91% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/Formatter.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/Formatter.java index cffe1829b..46f2a8c6d 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/Formatter.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/Formatter.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.formatter; +package org.apache.hugegraph.formatter; -import com.baidu.hugegraph.structure.JsonGraph.JsonVertex; +import org.apache.hugegraph.structure.JsonGraph; public interface Formatter { // Serialize a vertex(with edge and property) to string - public String dump(JsonVertex vertex) throws Exception; + public String dump(JsonGraph.JsonVertex vertex) throws Exception; public static final String PACKAGE = Formatter.class.getPackage().getName(); diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/JsonFormatter.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/JsonFormatter.java similarity index 87% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/JsonFormatter.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/JsonFormatter.java index 50410b593..c90ac57cc 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/JsonFormatter.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/JsonFormatter.java @@ -17,17 +17,17 @@ * under the License. */ -package com.baidu.hugegraph.formatter; +package org.apache.hugegraph.formatter; -import com.baidu.hugegraph.structure.JsonGraph.JsonVertex; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.hugegraph.structure.JsonGraph; public class JsonFormatter implements Formatter { private final ObjectMapper mapper = new ObjectMapper(); @Override - public String dump(JsonVertex vertex) throws Exception { + public String dump(JsonGraph.JsonVertex vertex) throws Exception { return this.mapper.writeValueAsString(vertex); } } diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/ComputeSign.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/ComputeSign.java similarity index 98% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/ComputeSign.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/ComputeSign.java index cffb00b0a..fb613144d 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/ComputeSign.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/ComputeSign.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.formatter.kgdumper; +package org.apache.hugegraph.formatter.kgdumper; import java.io.File; import java.io.FileInputStream; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/DumpKGFormatter.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/DumpKGFormatter.java similarity index 90% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/DumpKGFormatter.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/DumpKGFormatter.java index 6c3e6e6e9..93f4f8aed 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/DumpKGFormatter.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/DumpKGFormatter.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.formatter.kgdumper; +package org.apache.hugegraph.formatter.kgdumper; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -26,9 +26,8 @@ import java.util.Map; import java.util.Set; -import com.baidu.hugegraph.formatter.Formatter; -import com.baidu.hugegraph.structure.JsonGraph.JsonEdge; -import com.baidu.hugegraph.structure.JsonGraph.JsonVertex; +import org.apache.hugegraph.structure.JsonGraph; +import org.apache.hugegraph.formatter.Formatter; public class DumpKGFormatter implements Formatter { @@ -46,7 +45,7 @@ public DumpKGFormatter() throws IOException { } @Override - public String dump(JsonVertex vertex) throws Exception { + public String dump(JsonGraph.JsonVertex vertex) throws Exception { switch (vertex.getLabel()) { case "entity": return this.dumpEntity(vertex); @@ -57,12 +56,12 @@ public String dump(JsonVertex vertex) throws Exception { } } - private String dumpEntity(JsonVertex vertex) + private String dumpEntity(JsonGraph.JsonVertex vertex) throws UnsupportedEncodingException { if (vertex == null) { return ""; } - Set edges = vertex.getEdges(); + Set edges = vertex.getEdges(); Map properties = vertex.properties(); String plainId = (String) properties.get("plain_id"); @@ -79,7 +78,7 @@ private String dumpEntity(JsonVertex vertex) List region = new ArrayList<>(); List regionWeight = new ArrayList<>(); - for (JsonEdge edge : edges) { + for (JsonGraph.JsonEdge edge : edges) { if (edge == null) { continue; } @@ -115,18 +114,18 @@ private String dumpEntity(JsonVertex vertex) String.join("|*|", regionWeight)); } - private String dumpMemtion(JsonVertex vertex) + private String dumpMemtion(JsonGraph.JsonVertex vertex) throws UnsupportedEncodingException { if (vertex == null) { return ""; } - Set edges = vertex.getEdges(); + Set edges = vertex.getEdges(); String value = (String) vertex.properties().get("value"); List descript = new ArrayList<>(); List descriptWeight = new ArrayList<>(); - for (JsonEdge edge : edges) { + for (JsonGraph.JsonEdge edge : edges) { if (!vertex.getId().equals(edge.getSource())) { continue; } diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/SignFS64.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/SignFS64.java similarity index 99% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/SignFS64.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/SignFS64.java index fcab0df96..d8fc82ff7 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/formatter/kgdumper/SignFS64.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/formatter/kgdumper/SignFS64.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.formatter.kgdumper; +package org.apache.hugegraph.formatter.kgdumper; import java.io.UnsupportedEncodingException; import java.math.BigInteger; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/AuthBackupRestoreManager.java similarity index 96% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/AuthBackupRestoreManager.java index cc173d9cd..7089edd26 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/AuthBackupRestoreManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -32,24 +32,24 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.hugegraph.constant.AuthRestoreConflictStrategy; +import org.apache.hugegraph.exception.ToolsException; import org.apache.logging.log4j.util.Strings; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.base.HdfsDirectory; -import com.baidu.hugegraph.base.LocalDirectory; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.cmd.SubCommands; -import com.baidu.hugegraph.constant.AuthRestoreConflictStrategy; -import com.baidu.hugegraph.exception.ToolsException; -import com.baidu.hugegraph.structure.auth.Access; -import com.baidu.hugegraph.structure.auth.Belong; -import com.baidu.hugegraph.structure.auth.Group; -import com.baidu.hugegraph.structure.auth.Target; -import com.baidu.hugegraph.structure.auth.User; -import com.baidu.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.base.HdfsDirectory; +import org.apache.hugegraph.base.LocalDirectory; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.cmd.SubCommands; +import org.apache.hugegraph.structure.auth.Access; +import org.apache.hugegraph.structure.auth.Belong; +import org.apache.hugegraph.structure.auth.Group; +import org.apache.hugegraph.structure.auth.Target; +import org.apache.hugegraph.structure.auth.User; +import org.apache.hugegraph.structure.constant.HugeType; import org.apache.hugegraph.util.E; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.util.JsonUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/BackupManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/BackupManager.java similarity index 95% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/BackupManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/BackupManager.java index 9999d7aa4..fa38c4f6e 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/BackupManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/BackupManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -38,22 +38,22 @@ import org.apache.commons.io.FileUtils; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.cmd.SubCommands; -import com.baidu.hugegraph.driver.TraverserManager; -import com.baidu.hugegraph.exception.ToolsException; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Edges; -import com.baidu.hugegraph.structure.graph.Shard; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.graph.Vertices; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.exception.ToolsException; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.cmd.SubCommands; +import org.apache.hugegraph.driver.TraverserManager; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Edges; +import org.apache.hugegraph.structure.graph.Shard; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.graph.Vertices; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/BackupRestoreBaseManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/BackupRestoreBaseManager.java similarity index 94% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/BackupRestoreBaseManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/BackupRestoreBaseManager.java index 28bfe6031..f394cf4b7 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/BackupRestoreBaseManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/BackupRestoreBaseManager.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -32,19 +32,19 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.BiConsumer; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.base.Directory; -import com.baidu.hugegraph.base.HdfsDirectory; -import com.baidu.hugegraph.base.LocalDirectory; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.base.RetryManager; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.cmd.SubCommands; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.exception.ToolsException; +import org.apache.hugegraph.base.Directory; +import org.apache.hugegraph.base.HdfsDirectory; +import org.apache.hugegraph.base.LocalDirectory; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.base.RetryManager; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.cmd.SubCommands; import org.apache.hugegraph.concurrent.KeyLock; -import com.baidu.hugegraph.exception.ToolsException; -import com.baidu.hugegraph.structure.GraphElement; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.GraphElement; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.graph.Edge; import org.apache.hugegraph.util.E; import com.google.common.collect.ImmutableMap; diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/DumpGraphManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/DumpGraphManager.java similarity index 83% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/DumpGraphManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/DumpGraphManager.java index fe65d604a..32a3229e5 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/DumpGraphManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/DumpGraphManager.java @@ -17,24 +17,23 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.io.BufferedOutputStream; import java.io.OutputStream; import java.util.Collection; import java.util.List; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.base.LocalDirectory; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.cmd.SubCommands; -import com.baidu.hugegraph.formatter.Formatter; -import com.baidu.hugegraph.structure.JsonGraph; -import com.baidu.hugegraph.structure.JsonGraph.JsonVertex; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.formatter.Formatter; +import org.apache.hugegraph.structure.JsonGraph; +import org.apache.hugegraph.base.LocalDirectory; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.cmd.SubCommands; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; public class DumpGraphManager extends BackupManager { @@ -89,10 +88,10 @@ public void dump() { this.printSummary("dump graph"); } - private void dump(String file, Collection vertices) { + private void dump(String file, Collection vertices) { try (OutputStream os = this.outputStream(file, false); BufferedOutputStream bos = new BufferedOutputStream(os)) { - for (JsonVertex vertex : vertices) { + for (JsonGraph.JsonVertex vertex : vertices) { String content = this.dumpFormatter.dump(vertex); bos.write(content.getBytes(API.CHARSET)); bos.write(EOF); diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/GraphsManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/GraphsManager.java similarity index 91% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/GraphsManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/GraphsManager.java index b88fb8f3d..f78ddb39e 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/GraphsManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/GraphsManager.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.util.List; import java.util.Map; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.base.ToolManager; -import com.baidu.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.base.ToolManager; +import org.apache.hugegraph.structure.constant.GraphMode; public class GraphsManager extends ToolManager { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/GremlinManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/GremlinManager.java similarity index 89% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/GremlinManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/GremlinManager.java index 15434556d..cf315134d 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/GremlinManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/GremlinManager.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.util.Map; -import com.baidu.hugegraph.api.gremlin.GremlinRequest; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.base.ToolManager; -import com.baidu.hugegraph.structure.gremlin.ResultSet; +import org.apache.hugegraph.api.gremlin.GremlinRequest; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.base.ToolManager; +import org.apache.hugegraph.structure.gremlin.ResultSet; public class GremlinManager extends ToolManager { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/RestoreManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/RestoreManager.java similarity index 94% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/RestoreManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/RestoreManager.java index d48402488..7df2f5b4d 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/RestoreManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/RestoreManager.java @@ -17,25 +17,25 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.BiConsumer; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.cmd.SubCommands; -import com.baidu.hugegraph.structure.constant.GraphMode; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.structure.constant.IdStrategy; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.structure.schema.EdgeLabel; -import com.baidu.hugegraph.structure.schema.IndexLabel; -import com.baidu.hugegraph.structure.schema.PropertyKey; -import com.baidu.hugegraph.structure.schema.VertexLabel; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.cmd.SubCommands; +import org.apache.hugegraph.structure.constant.GraphMode; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.structure.constant.IdStrategy; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.structure.schema.EdgeLabel; +import org.apache.hugegraph.structure.schema.IndexLabel; +import org.apache.hugegraph.structure.schema.PropertyKey; +import org.apache.hugegraph.structure.schema.VertexLabel; import org.apache.hugegraph.util.E; public class RestoreManager extends BackupRestoreBaseManager { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/TasksManager.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/TasksManager.java similarity index 94% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/TasksManager.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/manager/TasksManager.java index 5a39c9016..83219b9cc 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/manager/TasksManager.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/manager/TasksManager.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.manager; +package org.apache.hugegraph.manager; import java.util.List; import java.util.Set; -import com.baidu.hugegraph.base.ToolClient; -import com.baidu.hugegraph.base.ToolManager; -import com.baidu.hugegraph.structure.Task; +import org.apache.hugegraph.base.ToolClient; +import org.apache.hugegraph.base.ToolManager; +import org.apache.hugegraph.structure.Task; import com.google.common.collect.ImmutableSet; public class TasksManager extends ToolManager { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/structure/JsonGraph.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/structure/JsonGraph.java similarity index 96% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/structure/JsonGraph.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/structure/JsonGraph.java index 2aaa58fd7..fb000bcae 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/structure/JsonGraph.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/structure/JsonGraph.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.structure; +package org.apache.hugegraph.structure; import java.util.Map; import java.util.Set; @@ -25,9 +25,9 @@ import org.eclipse.jetty.util.ConcurrentHashSet; -import com.baidu.hugegraph.structure.graph.Edge; -import com.baidu.hugegraph.structure.graph.Vertex; -import com.baidu.hugegraph.util.JsonUtil; +import org.apache.hugegraph.structure.graph.Edge; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.util.JsonUtil; import com.fasterxml.jackson.annotation.JsonRawValue; public class JsonGraph { diff --git a/hugegraph-tools/src/main/java/com/baidu/hugegraph/util/ToolUtil.java b/hugegraph-tools/src/main/java/org/apache/hugegraph/util/ToolUtil.java similarity index 94% rename from hugegraph-tools/src/main/java/com/baidu/hugegraph/util/ToolUtil.java rename to hugegraph-tools/src/main/java/org/apache/hugegraph/util/ToolUtil.java index 6082d70ae..3b475361f 100644 --- a/hugegraph-tools/src/main/java/com/baidu/hugegraph/util/ToolUtil.java +++ b/hugegraph-tools/src/main/java/org/apache/hugegraph/util/ToolUtil.java @@ -17,14 +17,14 @@ * under the License. */ -package com.baidu.hugegraph.util; +package org.apache.hugegraph.util; import java.util.Map; import java.util.Scanner; -import com.baidu.hugegraph.base.Printer; -import com.baidu.hugegraph.constant.Constants; -import com.baidu.hugegraph.exception.ExitException; +import org.apache.hugegraph.base.Printer; +import org.apache.hugegraph.constant.Constants; +import org.apache.hugegraph.exception.ExitException; import com.beust.jcommander.JCommander; public final class ToolUtil { diff --git a/hugegraph-tools/src/main/resources/log4j2.xml b/hugegraph-tools/src/main/resources/log4j2.xml index f23bfad73..323de386c 100644 --- a/hugegraph-tools/src/main/resources/log4j2.xml +++ b/hugegraph-tools/src/main/resources/log4j2.xml @@ -41,7 +41,7 @@ - + diff --git a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthBackupTest.java b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthBackupTest.java similarity index 95% rename from hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthBackupTest.java rename to hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthBackupTest.java index 35450d164..76f501109 100644 --- a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthBackupTest.java +++ b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthBackupTest.java @@ -17,15 +17,15 @@ * under the License. */ -package com.baidu.hugegraph.test.functional; +package org.apache.hugegraph.test.functional; import java.util.List; import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.cmd.HugeGraphCommand; -import com.baidu.hugegraph.test.util.FileUtil; +import org.apache.hugegraph.cmd.HugeGraphCommand; +import org.apache.hugegraph.test.util.FileUtil; import org.apache.hugegraph.testutil.Assert; public class AuthBackupTest extends AuthTest { diff --git a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthRestoreTest.java similarity index 95% rename from hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java rename to hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthRestoreTest.java index f9e6b33ce..6dfb6bb7d 100644 --- a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java +++ b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthRestoreTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.test.functional; +package org.apache.hugegraph.test.functional; import java.util.List; import java.util.Map; @@ -26,17 +26,16 @@ import org.junit.Before; import org.junit.Test; -import com.baidu.hugegraph.cmd.HugeGraphCommand; -import com.baidu.hugegraph.driver.HugeClient; -import com.baidu.hugegraph.structure.auth.Access; -import com.baidu.hugegraph.structure.auth.Belong; -import com.baidu.hugegraph.structure.auth.Group; -import com.baidu.hugegraph.structure.auth.Target; -import com.baidu.hugegraph.structure.auth.User; -import com.baidu.hugegraph.structure.constant.HugeType; -import com.baidu.hugegraph.test.util.FileUtil; +import org.apache.hugegraph.cmd.HugeGraphCommand; +import org.apache.hugegraph.driver.HugeClient; +import org.apache.hugegraph.structure.auth.Access; +import org.apache.hugegraph.structure.auth.Belong; +import org.apache.hugegraph.structure.auth.Group; +import org.apache.hugegraph.structure.auth.Target; +import org.apache.hugegraph.structure.auth.User; +import org.apache.hugegraph.structure.constant.HugeType; +import org.apache.hugegraph.test.util.FileUtil; import org.apache.hugegraph.testutil.Assert; -import com.beust.jcommander.ParameterException; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthTest.java b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthTest.java similarity index 96% rename from hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthTest.java rename to hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthTest.java index f720ddad7..b70ee131a 100644 --- a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/AuthTest.java +++ b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/AuthTest.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.test.functional; +package org.apache.hugegraph.test.functional; public class AuthTest { diff --git a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/CommandTest.java b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/CommandTest.java similarity index 96% rename from hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/CommandTest.java rename to hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/CommandTest.java index 84a3d9c4b..c0c7a6435 100644 --- a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/CommandTest.java +++ b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/CommandTest.java @@ -17,12 +17,12 @@ * under the License. */ -package com.baidu.hugegraph.test.functional; +package org.apache.hugegraph.test.functional; import org.junit.Test; -import com.baidu.hugegraph.cmd.HugeGraphCommand; -import com.baidu.hugegraph.exception.ExitException; +import org.apache.hugegraph.cmd.HugeGraphCommand; +import org.apache.hugegraph.exception.ExitException; import org.apache.hugegraph.testutil.Assert; public class CommandTest extends AuthTest { diff --git a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/FuncTestSuite.java b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/FuncTestSuite.java similarity index 95% rename from hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/FuncTestSuite.java rename to hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/FuncTestSuite.java index 6e770f66c..10d9f9f9b 100644 --- a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/functional/FuncTestSuite.java +++ b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/functional/FuncTestSuite.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.test.functional; +package org.apache.hugegraph.test.functional; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/util/FileUtil.java b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/util/FileUtil.java similarity index 96% rename from hugegraph-tools/src/test/java/com/baidu/hugegraph/test/util/FileUtil.java rename to hugegraph-tools/src/test/java/org/apache/hugegraph/test/util/FileUtil.java index 13858f959..2c9cd78f5 100644 --- a/hugegraph-tools/src/test/java/com/baidu/hugegraph/test/util/FileUtil.java +++ b/hugegraph-tools/src/test/java/org/apache/hugegraph/test/util/FileUtil.java @@ -17,7 +17,7 @@ * under the License. */ -package com.baidu.hugegraph.test.util; +package org.apache.hugegraph.test.util; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -32,8 +32,8 @@ import org.apache.commons.collections.ListUtils; -import com.baidu.hugegraph.api.API; -import com.baidu.hugegraph.exception.ToolsException; +import org.apache.hugegraph.api.API; +import org.apache.hugegraph.exception.ToolsException; import com.google.common.collect.Lists; public class FileUtil {