You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hugegraph.apache.org by gu...@apache.org on 2022/08/30 11:26:55 UTC
[incubator-hugegraph-commons] branch update-package updated (0002e23 -> 0b875d3)
This is an automated email from the ASF dual-hosted git repository.
guoshoujing pushed a change to branch update-package
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-commons.git
discard 0002e23 update package name
new 0b875d3 update package name
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0002e23)
\
N -- N -- N refs/heads/update-package (0b875d3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[incubator-hugegraph-commons] 01/01: update package name
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
guoshoujing pushed a commit to branch update-package
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-commons.git
commit 0b875d3310f4e0823461c1fb2537e3b57372bc2d
Author: shoujing <gu...@apache.org>
AuthorDate: Tue Aug 30 19:25:17 2022 +0800
update package name
---
README.md | 2 +-
hugegraph-common/README.md | 2 +-
.../apache}/hugegraph/concurrent/AtomicLock.java | 5 +-
.../apache}/hugegraph/concurrent/BarrierEvent.java | 4 +-
.../apache}/hugegraph/concurrent/KeyLock.java | 4 +-
.../apache}/hugegraph/concurrent/LockGroup.java | 2 +-
.../apache}/hugegraph/concurrent/LockManager.java | 2 +-
.../concurrent/PausableScheduledThreadPool.java | 5 +-
.../apache}/hugegraph/concurrent/RowLock.java | 4 +-
.../apache}/hugegraph/config/ConfigConvOption.java | 4 +-
.../apache}/hugegraph/config/ConfigException.java | 2 +-
.../hugegraph/config/ConfigListConvOption.java | 4 +-
.../apache}/hugegraph/config/ConfigListOption.java | 4 +-
.../apache}/hugegraph/config/ConfigOption.java | 2 +-
.../apache}/hugegraph/config/HugeConfig.java | 6 +-
.../apache}/hugegraph/config/OptionChecker.java | 2 +-
.../apache}/hugegraph/config/OptionHolder.java | 5 +-
.../apache}/hugegraph/config/OptionSpace.java | 7 +-
.../apache}/hugegraph/config/TypedOption.java | 6 +-
.../apache}/hugegraph/date/SafeDateFormat.java | 2 +-
.../apache}/hugegraph/event/Event.java | 4 +-
.../apache}/hugegraph/event/EventHub.java | 10 +-
.../apache}/hugegraph/event/EventListener.java | 2 +-
.../apache}/hugegraph/func/TriFunction.java | 2 +-
.../hugegraph/iterator/BatchMapperIterator.java | 6 +-
.../apache}/hugegraph/iterator/CIter.java | 2 +-
.../hugegraph/iterator/ExtendableIterator.java | 4 +-
.../apache}/hugegraph/iterator/FilterIterator.java | 2 +-
.../iterator/FlatMapperFilterIterator.java | 4 +-
.../hugegraph/iterator/FlatMapperIterator.java | 4 +-
.../apache}/hugegraph/iterator/LimitIterator.java | 2 +-
.../apache}/hugegraph/iterator/ListIterator.java | 4 +-
.../apache}/hugegraph/iterator/MapperIterator.java | 2 +-
.../apache}/hugegraph/iterator/Metadatable.java | 2 +-
.../hugegraph/iterator/WrappedIterator.java | 2 +-
.../hugegraph/license/LicenseCommonParam.java | 2 +-
.../hugegraph/license/LicenseCreateParam.java | 2 +-
.../hugegraph/license/LicenseExtraParam.java | 2 +-
.../hugegraph/license/LicenseInstallParam.java | 2 +-
.../apache}/hugegraph/license/LicenseManager.java | 2 +-
.../hugegraph/license/LicenseManagerFactory.java | 4 +-
.../apache}/hugegraph/license/LicenseParams.java | 2 +-
.../apache}/hugegraph/license/MachineInfo.java | 2 +-
.../apache}/hugegraph/perf/LightStopwatch.java | 4 +-
.../apache}/hugegraph/perf/NormalStopwatch.java | 14 +--
.../apache}/hugegraph/perf/PerfUtil.java | 38 +++---
.../apache}/hugegraph/perf/Stopwatch.java | 2 +-
.../apache}/hugegraph/rest/AbstractRestClient.java | 6 +-
.../apache}/hugegraph/rest/ClientException.java | 2 +-
.../apache}/hugegraph/rest/RestClient.java | 2 +-
.../apache}/hugegraph/rest/RestResult.java | 2 +-
.../apache}/hugegraph/rest/SerializeException.java | 2 +-
.../apache}/hugegraph/testutil/Assert.java | 2 +-
.../apache}/hugegraph/testutil/Whitebox.java | 4 +-
.../baidu => org/apache}/hugegraph/util/Bytes.java | 2 +-
.../apache}/hugegraph/util/CheckSocket.java | 2 +-
.../apache}/hugegraph/util/CollectionUtil.java | 2 +-
.../apache}/hugegraph/util/DateUtil.java | 4 +-
.../baidu => org/apache}/hugegraph/util/E.java | 2 +-
.../apache}/hugegraph/util/ExecutorUtil.java | 4 +-
.../apache}/hugegraph/util/HashUtil.java | 2 +-
.../apache}/hugegraph/util/InsertionOrderUtil.java | 2 +-
.../baidu => org/apache}/hugegraph/util/Log.java | 2 +-
.../apache}/hugegraph/util/LongEncoding.java | 2 +-
.../apache}/hugegraph/util/NumericUtil.java | 2 +-
.../apache}/hugegraph/util/OrderLimitMap.java | 2 +-
.../apache}/hugegraph/util/ReflectionUtil.java | 4 +-
.../apache}/hugegraph/util/StringUtil.java | 2 +-
.../apache}/hugegraph/util/TimeUtil.java | 2 +-
.../apache}/hugegraph/util/UnitUtil.java | 2 +-
.../apache}/hugegraph/util/VersionUtil.java | 2 +-
.../apache}/hugegraph/version/CommonVersion.java | 8 +-
.../com/baidu/hugegraph/unit/UnitTestSuite.java | 127 ---------------------
.../apache}/hugegraph/testutil/AssertTest.java | 4 +-
.../apache}/hugegraph/testutil/WhiteboxTest.java | 2 +-
.../apache}/hugegraph/unit/BaseUnitTest.java | 5 +-
.../org/apache/hugegraph/unit/UnitTestSuite.java | 127 +++++++++++++++++++++
.../hugegraph/unit/concurrent/AtomicLockTest.java | 8 +-
.../unit/concurrent/BarrierEventTest.java | 6 +-
.../hugegraph/unit/concurrent/KeyLockTest.java | 8 +-
.../hugegraph/unit/concurrent/LockGroupTest.java | 14 +--
.../hugegraph/unit/concurrent/LockManagerTest.java | 10 +-
.../PausableScheduledThreadPoolTest.java | 6 +-
.../hugegraph/unit/concurrent/RowLockTest.java | 8 +-
.../hugegraph/unit/config/HugeConfigTest.java | 97 ++++++++--------
.../hugegraph/unit/config/OptionSpaceTest.java | 28 ++---
.../hugegraph/unit/config/test-check-error.conf | 0
.../hugegraph/unit/config/test-list-error.conf | 0
.../hugegraph/unit/config/test-type-error.conf | 0
.../apache}/hugegraph/unit/config/test.conf | 0
.../hugegraph/unit/date/SafeDateFormatTest.java | 6 +-
.../apache}/hugegraph/unit/event/EventHubTest.java | 12 +-
.../unit/iterator/BatchMapperIteratorTest.java | 10 +-
.../unit/iterator/ExtendableIteratorTest.java | 8 +-
.../unit/iterator/FilterIteratorTest.java | 10 +-
.../iterator/FlatMapperFilterIteratorTest.java | 10 +-
.../unit/iterator/FlatMapperIteratorTest.java | 10 +-
.../hugegraph/unit/iterator/LimitIteratorTest.java | 10 +-
.../hugegraph/unit/iterator/ListIteratorTest.java | 10 +-
.../unit/iterator/MapperIteratorTest.java | 10 +-
.../unit/license/LicenseCreateParamTest.java | 8 +-
.../unit/license/LicenseExtraParamTest.java | 6 +-
.../unit/license/LicenseInstallParamTest.java | 6 +-
.../hugegraph/unit/license/LicenseParamsTest.java | 8 +-
.../hugegraph/unit/license/MachineInfoTest.java | 6 +-
.../apache}/hugegraph/unit/perf/PerfUtilTest.java | 22 ++--
.../apache}/hugegraph/unit/perf/StopwatchTest.java | 17 ++-
.../hugegraph/unit/perf/testclass/TestClass.java | 21 ++--
.../unit/perf/testclass/TestLightClass.java | 14 +--
.../unit/perf/testclass/TestPerfClass.java | 18 +--
.../unit/perf/testclass/TestPerfLightClass.java | 18 +--
.../unit/perf/testclass2/TestClass4Package.java | 20 ++--
.../hugegraph/unit/rest/RestClientTest.java | 32 +++---
.../hugegraph/unit/rest/RestResultTest.java | 8 +-
.../apache}/hugegraph/unit/util/BytesTest.java | 10 +-
.../hugegraph/unit/util/CollectionUtilTest.java | 8 +-
.../apache}/hugegraph/unit/util/DateUtilTest.java | 8 +-
.../apache}/hugegraph/unit/util/EcheckTest.java | 8 +-
.../apache}/hugegraph/unit/util/HashUtilTest.java | 10 +-
.../unit/util/InsertionOrderUtilTest.java | 8 +-
.../apache}/hugegraph/unit/util/LogTest.java | 12 +-
.../hugegraph/unit/util/LongEncodingTest.java | 12 +-
.../hugegraph/unit/util/NumericUtilTest.java | 10 +-
.../hugegraph/unit/util/OrderLimitMapTest.java | 6 +-
.../hugegraph/unit/util/ReflectionUtilTest.java | 52 ++++-----
.../hugegraph/unit/util/StringUtilTest.java | 45 ++++----
.../apache}/hugegraph/unit/util/TimeUtilTest.java | 8 +-
.../apache}/hugegraph/unit/util/UnitUtilTest.java | 8 +-
.../hugegraph/unit/util/VersionUtilTest.java | 27 +++--
.../hugegraph/unit/version/VersionTest.java | 8 +-
hugegraph-common/src/test/resources/log4j2.xml | 2 +-
hugegraph-rpc/pom.xml | 4 +-
.../apache}/hugegraph/config/RpcOptions.java | 11 +-
.../apache}/hugegraph/rpc/RpcClientProvider.java | 8 +-
.../apache}/hugegraph/rpc/RpcCommonConfig.java | 6 +-
.../apache}/hugegraph/rpc/RpcConsumerConfig.java | 8 +-
.../apache}/hugegraph/rpc/RpcException.java | 2 +-
.../apache}/hugegraph/rpc/RpcProviderConfig.java | 4 +-
.../apache}/hugegraph/rpc/RpcServer.java | 12 +-
.../hugegraph/rpc/RpcServiceConfig4Client.java | 2 +-
.../hugegraph/rpc/RpcServiceConfig4Server.java | 2 +-
.../apache}/hugegraph/version/RpcVersion.java | 6 +-
.../apache}/hugegraph/unit/BaseUnitTest.java | 10 +-
.../apache}/hugegraph/unit/ExceptionTest.java | 6 +-
.../apache}/hugegraph/unit/ServerClientTest.java | 29 +++--
.../apache}/hugegraph/unit/UnitTestSuite.java | 2 +-
.../apache}/hugegraph/unit/VersionTest.java | 8 +-
hugegraph-rpc/src/test/resources/log4j2.xml | 2 +-
pom.xml | 2 +-
style/checkstyle.xml | 10 --
150 files changed, 684 insertions(+), 712 deletions(-)
diff --git a/README.md b/README.md
index 3d669eb..5196b43 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[](https://www.apache.org/licenses/LICENSE-2.0.html)
[](https://codecov.io/gh/hugegraph/hugegraph-common)
-[](https://mvnrepository.com/artifact/com.baidu.hugegraph/hugegraph-common)
+[](https://mvnrepository.com/artifact/org.apache.hugegraph/hugegraph-common)
hugegraph-commons is a common module for [HugeGraph](https://github.com/hugegraph/hugegraph) and its peripheral components.
hugegraph-commons encapsulates locks, configurations, events, iterators, rest and some
diff --git a/hugegraph-common/README.md b/hugegraph-common/README.md
index d311524..ca2f80d 100644
--- a/hugegraph-common/README.md
+++ b/hugegraph-common/README.md
@@ -3,7 +3,7 @@
[](https://www.apache.org/licenses/LICENSE-2.0.html)
[](https://travis-ci.org/hugegraph/hugegraph-common)
[](https://codecov.io/gh/hugegraph/hugegraph-common)
-[](https://mvnrepository.com/artifact/com.baidu.hugegraph/hugegraph-common)
+[](https://mvnrepository.com/artifact/org.apache.hugegraph/hugegraph-common)
hugegraph-common is a common module for [HugeGraph](https://github.com/hugegraph/hugegraph) and its peripheral components.
hugegraph-common encapsulates locks, configurations, events, iterators, rest and some
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/AtomicLock.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/AtomicLock.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/AtomicLock.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/AtomicLock.java
index 8316065..7c9a4c0 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/AtomicLock.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/AtomicLock.java
@@ -17,14 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.hugegraph.util.Log;
import org.slf4j.Logger;
-import com.baidu.hugegraph.util.Log;
-
public class AtomicLock {
private static final Logger LOG = Log.logger(LockManager.class);
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/BarrierEvent.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/BarrierEvent.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/BarrierEvent.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/BarrierEvent.java
index b6ccab9..1c89d11 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/BarrierEvent.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/BarrierEvent.java
@@ -18,14 +18,14 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
public class BarrierEvent {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/KeyLock.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/KeyLock.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/KeyLock.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/KeyLock.java
index dd8781b..eda012b 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/KeyLock.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/KeyLock.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.locks.Lock;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Striped;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/LockGroup.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/LockGroup.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/LockGroup.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/LockGroup.java
index 7d29c98..17b7347 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/LockGroup.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/LockGroup.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/LockManager.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/LockManager.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/LockManager.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/LockManager.java
index 299b001..d2c6098 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/LockManager.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/LockManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/PausableScheduledThreadPool.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/PausableScheduledThreadPool.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/PausableScheduledThreadPool.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/PausableScheduledThreadPool.java
index fb5a5f1..e5dba9f 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/PausableScheduledThreadPool.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/PausableScheduledThreadPool.java
@@ -17,16 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.List;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
+import org.apache.hugegraph.util.Log;
import org.slf4j.Logger;
-import com.baidu.hugegraph.util.Log;
-
public class PausableScheduledThreadPool extends ScheduledThreadPoolExecutor {
private static final Logger LOG = Log.logger(
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/RowLock.java b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/RowLock.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/RowLock.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/RowLock.java
index d70d3b5..1eb18f6 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/concurrent/RowLock.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/concurrent/RowLock.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.concurrent;
+package org.apache.hugegraph.concurrent;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
public class RowLock<K extends Comparable<K>> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigConvOption.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigConvOption.java
similarity index 95%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigConvOption.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigConvOption.java
index f67d0e4..5966176 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigConvOption.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigConvOption.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.util.function.Function;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
import com.google.common.base.Predicate;
public class ConfigConvOption<T, R> extends TypedOption<T, R> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigException.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigException.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigException.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigException.java
index aab2efb..cd79813 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigException.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
public class ConfigException extends RuntimeException {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigListConvOption.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigListConvOption.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigListConvOption.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigListConvOption.java
index 151fbf9..32351b4 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigListConvOption.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigListConvOption.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Function;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
import com.google.common.base.Predicate;
public class ConfigListConvOption<T, R> extends TypedOption<List<T>, List<R>> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigListOption.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigListOption.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigListOption.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigListOption.java
index ff114cc..7bba7ec 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigListOption.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigListOption.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Function;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
import com.google.common.base.Predicate;
public class ConfigListOption<T> extends ConfigOption<List<T>> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigOption.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigOption.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigOption.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigOption.java
index cb95874..d85d508 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/ConfigOption.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/ConfigOption.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import com.google.common.base.Predicate;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/HugeConfig.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/HugeConfig.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/HugeConfig.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/HugeConfig.java
index 69f7874..b25153d 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/HugeConfig.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/HugeConfig.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
import org.apache.commons.configuration2.Configuration;
import org.apache.commons.configuration2.FileBasedConfiguration;
import org.apache.commons.configuration2.PropertiesConfiguration;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionChecker.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionChecker.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionChecker.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionChecker.java
index f3e116f..551fe93 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionChecker.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionChecker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.lang.reflect.Array;
import java.util.Arrays;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionHolder.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionHolder.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionHolder.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionHolder.java
index e5c5be6..39c0dad 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionHolder.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionHolder.java
@@ -17,17 +17,16 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.hugegraph.util.Log;
import org.slf4j.Logger;
-import com.baidu.hugegraph.util.Log;
-
public class OptionHolder {
private static final Logger LOG = Log.logger(HugeConfig.class);
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionSpace.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionSpace.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionSpace.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionSpace.java
index 8c1128c..0c4d94a 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/OptionSpace.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/OptionSpace.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -27,11 +27,10 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
import org.slf4j.Logger;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.Log;
-
public final class OptionSpace {
private static final Logger LOG = Log.logger(OptionSpace.class);
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/TypedOption.java b/hugegraph-common/src/main/java/org/apache/hugegraph/config/TypedOption.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/config/TypedOption.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/config/TypedOption.java
index cd5841b..59ed9da 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/config/TypedOption.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/config/TypedOption.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Set;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
import org.apache.commons.configuration.PropertyConverter;
import org.slf4j.Logger;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.Log;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java b/hugegraph-common/src/main/java/org/apache/hugegraph/date/SafeDateFormat.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/date/SafeDateFormat.java
index 68cd008..0deba51 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/date/SafeDateFormat.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/date/SafeDateFormat.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.date;
+package org.apache.hugegraph.date;
import java.util.Date;
import java.util.TimeZone;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/event/Event.java b/hugegraph-common/src/main/java/org/apache/hugegraph/event/Event.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/event/Event.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/event/Event.java
index 733fd20..fccc1cd 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/event/Event.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/event/Event.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package com.baidu.hugegraph.event;
+package org.apache.hugegraph.event;
import java.util.Arrays;
import java.util.Collections;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
public class Event extends java.util.EventObject {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/event/EventHub.java b/hugegraph-common/src/main/java/org/apache/hugegraph/event/EventHub.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/event/EventHub.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/event/EventHub.java
index 5bd0870..0e426fc 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/event/EventHub.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/event/EventHub.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.event;
+package org.apache.hugegraph.event;
import java.util.Collections;
import java.util.List;
@@ -31,12 +31,12 @@ import java.util.concurrent.TimeUnit;
import javax.annotation.Nullable;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.ExecutorUtil;
+import org.apache.hugegraph.util.Log;
import org.slf4j.Logger;
-import com.baidu.hugegraph.iterator.ExtendableIterator;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.ExecutorUtil;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.iterator.ExtendableIterator;
import com.google.common.collect.ImmutableList;
public class EventHub {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/event/EventListener.java b/hugegraph-common/src/main/java/org/apache/hugegraph/event/EventListener.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/event/EventListener.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/event/EventListener.java
index 71148b2..a0deb4c 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/event/EventListener.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/event/EventListener.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.event;
+package org.apache.hugegraph.event;
public interface EventListener extends java.util.EventListener {
/**
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/func/TriFunction.java b/hugegraph-common/src/main/java/org/apache/hugegraph/func/TriFunction.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/func/TriFunction.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/func/TriFunction.java
index 555a0ee..b381d42 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/func/TriFunction.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/func/TriFunction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.func;
+package org.apache.hugegraph.func;
public interface TriFunction <T1, T2, T3, R> {
public R apply(T1 v1, T2 v2, T3 v3);
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/BatchMapperIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/BatchMapperIterator.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/BatchMapperIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/BatchMapperIterator.java
index 283fc45..79f9e87 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/BatchMapperIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/BatchMapperIterator.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.List;
import java.util.function.Function;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.InsertionOrderUtil;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.InsertionOrderUtil;
import com.google.common.collect.ImmutableList;
public class BatchMapperIterator<T, R> extends WrappedIterator<R> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/CIter.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/CIter.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/CIter.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/CIter.java
index 35eda45..fdaa8dc 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/CIter.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/CIter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/ExtendableIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/ExtendableIterator.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/ExtendableIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/ExtendableIterator.java
index d9985ed..d4e690f 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/ExtendableIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/ExtendableIterator.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Deque;
import java.util.Iterator;
import java.util.concurrent.ConcurrentLinkedDeque;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
public class ExtendableIterator<T> extends WrappedIterator<T> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FilterIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FilterIterator.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FilterIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FilterIterator.java
index 1dfc3ab..8b546ef 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FilterIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FilterIterator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.function.Function;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FlatMapperFilterIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FlatMapperFilterIterator.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FlatMapperFilterIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FlatMapperFilterIterator.java
index a222319..fe55232 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FlatMapperFilterIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FlatMapperFilterIterator.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.function.Function;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
public class FlatMapperFilterIterator<T, R> extends FlatMapperIterator<T, R> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FlatMapperIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FlatMapperIterator.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FlatMapperIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FlatMapperIterator.java
index 6b4cd98..92cd451 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/FlatMapperIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/FlatMapperIterator.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.function.Function;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
public class FlatMapperIterator<T, R> extends WrappedIterator<R> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/LimitIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/LimitIterator.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/LimitIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/LimitIterator.java
index 671168b..6a166af 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/LimitIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/LimitIterator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.function.Function;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/ListIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/ListIterator.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/ListIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/ListIterator.java
index f21a436..9ca190f 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/ListIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/ListIterator.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import com.baidu.hugegraph.util.InsertionOrderUtil;
+import org.apache.hugegraph.util.InsertionOrderUtil;
public class ListIterator<T> extends WrappedIterator<T> {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/MapperIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/MapperIterator.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/MapperIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/MapperIterator.java
index c02d17c..9d523b5 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/MapperIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/MapperIterator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.function.Function;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/Metadatable.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/Metadatable.java
similarity index 95%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/Metadatable.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/Metadatable.java
index 4b6d207..2f7d81f 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/Metadatable.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/Metadatable.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
public interface Metadatable {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/WrappedIterator.java b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/WrappedIterator.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/WrappedIterator.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/iterator/WrappedIterator.java
index 21c4e9e..6eb2f59 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/iterator/WrappedIterator.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/iterator/WrappedIterator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.iterator;
+package org.apache.hugegraph.iterator;
import java.util.Iterator;
import java.util.NoSuchElementException;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseCommonParam.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseCommonParam.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseCommonParam.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseCommonParam.java
index 2d1f45c..6cb5b89 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseCommonParam.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseCommonParam.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import java.util.Date;
import java.util.List;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseCreateParam.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseCreateParam.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseCreateParam.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseCreateParam.java
index 7cf69f8..c14b240 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseCreateParam.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseCreateParam.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseExtraParam.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseExtraParam.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseExtraParam.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseExtraParam.java
index 0c3337f..361acb5 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseExtraParam.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseExtraParam.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseInstallParam.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseInstallParam.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseInstallParam.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseInstallParam.java
index 4a5237b..462029f 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseInstallParam.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseInstallParam.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseManager.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseManager.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseManager.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseManager.java
index 892919c..7378899 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseManager.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
public interface LicenseManager {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseManagerFactory.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseManagerFactory.java
similarity index 91%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseManagerFactory.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseManagerFactory.java
index cf38c77..c14ddca 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseManagerFactory.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseManagerFactory.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import org.apache.commons.lang.NotImplementedException;
-import com.baidu.hugegraph.license.LicenseManager.VerifyCallback;
+import org.apache.hugegraph.license.LicenseManager.VerifyCallback;
public class LicenseManagerFactory {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseParams.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseParams.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseParams.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseParams.java
index dad9cf7..dcc4146 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/LicenseParams.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/LicenseParams.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import java.util.Date;
import java.util.List;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/MachineInfo.java b/hugegraph-common/src/main/java/org/apache/hugegraph/license/MachineInfo.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/license/MachineInfo.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/license/MachineInfo.java
index 9b9a96c..63d09de 100755
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/license/MachineInfo.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/license/MachineInfo.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.license;
+package org.apache.hugegraph.license;
import java.net.InetAddress;
import java.net.NetworkInterface;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/LightStopwatch.java b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/LightStopwatch.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/perf/LightStopwatch.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/perf/LightStopwatch.java
index b57ae37..1f63de7 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/LightStopwatch.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/LightStopwatch.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package com.baidu.hugegraph.perf;
+package org.apache.hugegraph.perf;
import java.util.List;
-import com.baidu.hugegraph.perf.PerfUtil.FastMap;
+import org.apache.hugegraph.perf.PerfUtil.FastMap;
public final class LightStopwatch implements Stopwatch {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/NormalStopwatch.java b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/NormalStopwatch.java
similarity index 95%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/perf/NormalStopwatch.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/perf/NormalStopwatch.java
index 7011bca..8b8aa06 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/NormalStopwatch.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/NormalStopwatch.java
@@ -17,17 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.perf;
+package org.apache.hugegraph.perf;
import java.util.List;
import java.util.function.BiFunction;
+import org.apache.hugegraph.util.Log;
import org.slf4j.Logger;
-import com.baidu.hugegraph.perf.PerfUtil.FastMap;
-import com.baidu.hugegraph.perf.PerfUtil.LocalStack;
-import com.baidu.hugegraph.testutil.Whitebox;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.testutil.Whitebox;
public final class NormalStopwatch implements Stopwatch {
@@ -51,7 +49,7 @@ public final class NormalStopwatch implements Stopwatch {
private final String name;
private final Path parent;
private final Path id;
- private final FastMap<String, Stopwatch> children;
+ private final PerfUtil.FastMap<String, Stopwatch> children;
public NormalStopwatch(String name, Stopwatch parent) {
this(name, parent.id());
@@ -62,7 +60,7 @@ public final class NormalStopwatch implements Stopwatch {
this.name = name;
this.parent = parent;
this.id = Stopwatch.id(parent, name);
- this.children = new FastMap<>();
+ this.children = new PerfUtil.FastMap<>();
}
@Override
@@ -254,7 +252,7 @@ public final class NormalStopwatch implements Stopwatch {
protected static void initEachWastedLost() {
int times = 100000000;
- LocalStack<Stopwatch> callStack = Whitebox.getInternalState(
+ PerfUtil.LocalStack<Stopwatch> callStack = Whitebox.getInternalState(
PerfUtil.instance(), "callStack");
long baseStart = PerfUtil.now();
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/PerfUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/PerfUtil.java
similarity index 94%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/perf/PerfUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/perf/PerfUtil.java
index e8ea2ea..d8a611d 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/PerfUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/PerfUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.perf;
+package org.apache.hugegraph.perf;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -37,13 +37,13 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
+import org.apache.hugegraph.util.ReflectionUtil;
import org.slf4j.Logger;
-import com.baidu.hugegraph.func.TriFunction;
-import com.baidu.hugegraph.perf.Stopwatch.Path;
-import com.baidu.hugegraph.testutil.Assert.ThrowableConsumer;
-import com.baidu.hugegraph.util.Log;
-import com.baidu.hugegraph.util.ReflectionUtil;
+import org.apache.hugegraph.func.TriFunction;
+import org.apache.hugegraph.testutil.Assert.ThrowableConsumer;
import com.google.common.reflect.ClassPath.ClassInfo;
import javassist.CannotCompileException;
@@ -63,14 +63,14 @@ public final class PerfUtil {
private static LocalTimer LOCAL_TIMER = null;
private static boolean LIGHT_WATCH = false;
- private final Map<Path, Stopwatch> stopwatches;
+ private final Map<Stopwatch.Path, Stopwatch> stopwatches;
private final LocalStack<Stopwatch> callStack;
private final Stopwatch root;
private PerfUtil() {
this.stopwatches = new HashMap<>(DEFAUL_CAPATICY);
this.callStack = new LocalStack<>(DEFAUL_CAPATICY);
- this.root = newStopwatch(Path.ROOT_NAME, Path.EMPTY);
+ this.root = newStopwatch(Stopwatch.Path.ROOT_NAME, Stopwatch.Path.EMPTY);
}
public static PerfUtil instance() {
@@ -128,7 +128,7 @@ public final class PerfUtil {
boolean empty = instance == null || instance.empty();
String message = "Please call clear() before switching " +
"light-stopwatch due to there is dirty watch";
- com.baidu.hugegraph.util.E.checkArgument(empty, message);
+ E.checkArgument(empty, message);
}
LIGHT_WATCH = yes;
}
@@ -141,7 +141,7 @@ public final class PerfUtil {
return System.nanoTime();
}
- protected static Stopwatch newStopwatch(String name, Path parent) {
+ protected static Stopwatch newStopwatch(String name, Stopwatch.Path parent) {
return LIGHT_WATCH ? new LightStopwatch(name, parent) :
new NormalStopwatch(name, parent);
}
@@ -174,9 +174,9 @@ public final class PerfUtil {
public Stopwatch start2(String name) {
long start = now(); // cost 70 ns with System.nanoTime()
- Path parent = this.callStack.empty() ?
- Path.EMPTY : this.callStack.peek().id();
- Path id = Stopwatch.id(parent, name); // cost 130
+ Stopwatch.Path parent = this.callStack.empty() ?
+ Stopwatch.Path.EMPTY : this.callStack.peek().id();
+ Stopwatch.Path id = Stopwatch.id(parent, name); // cost 130
// Get watch by id from global map
Stopwatch watch = this.stopwatches.get(id); // cost 170
if (watch == null) {
@@ -207,7 +207,7 @@ public final class PerfUtil {
public void clear() {
String error = "Can't be cleared when the call has not ended yet";
- com.baidu.hugegraph.util.E.checkState(this.callStack.empty(), error);
+ E.checkState(this.callStack.empty(), error);
this.stopwatches.clear();
this.root.clear();
@@ -273,9 +273,9 @@ public final class PerfUtil {
private void profile(CtMethod ctMethod)
throws CannotCompileException, ClassNotFoundException {
final String START =
- "com.baidu.hugegraph.perf.PerfUtil.instance().start(\"%s\");";
+ "org.apache.hugegraph.perf.PerfUtil.instance().start(\"%s\");";
final String END =
- "com.baidu.hugegraph.perf.PerfUtil.instance().end(\"%s\");";
+ "org.apache.hugegraph.perf.PerfUtil.instance().end(\"%s\");";
Watched annotation = (Watched) ctMethod.getAnnotation(Watched.class);
@@ -302,7 +302,7 @@ public final class PerfUtil {
public String toJson() {
StringBuilder sb = new StringBuilder(8 + this.stopwatches.size() * 96);
sb.append('{');
- for (Map.Entry<Path, Stopwatch> w : this.stopwatches.entrySet()) {
+ for (Map.Entry<Stopwatch.Path, Stopwatch> w : this.stopwatches.entrySet()) {
sb.append('"');
sb.append(w.getKey());
sb.append('"');
@@ -428,10 +428,10 @@ public final class PerfUtil {
}
};
- Map<Path, Stopwatch> items = this.stopwatches;
+ Map<Stopwatch.Path, Stopwatch> items = this.stopwatches;
Map<Integer, List<Stopwatch>> levelItems = new HashMap<>();
int maxDepth = 0;
- for (Map.Entry<Path, Stopwatch> e : items.entrySet()) {
+ for (Map.Entry<Stopwatch.Path, Stopwatch> e : items.entrySet()) {
int depth = e.getKey().toString().split("/").length;
List<Stopwatch> levelItem = levelItems.get(depth);
if (levelItem == null) {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/Stopwatch.java b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/Stopwatch.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/perf/Stopwatch.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/perf/Stopwatch.java
index a015a08..074869d 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/perf/Stopwatch.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/perf/Stopwatch.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.perf;
+package org.apache.hugegraph.perf;
import java.util.List;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/AbstractRestClient.java b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/rest/AbstractRestClient.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java
index d6b1b71..bf156b8 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/AbstractRestClient.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/AbstractRestClient.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rest;
+package org.apache.hugegraph.rest;
import java.io.IOException;
import java.net.URI;
@@ -31,6 +31,8 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.ExecutorUtil;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientRequestContext;
import jakarta.ws.rs.client.ClientRequestFilter;
@@ -63,8 +65,6 @@ import org.glassfish.jersey.internal.util.collection.Refs;
import org.glassfish.jersey.message.GZipEncoder;
import org.glassfish.jersey.uri.UriComponent;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.ExecutorUtil;
import com.google.common.collect.ImmutableMap;
import javax.net.ssl.HostnameVerifier;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/ClientException.java b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/ClientException.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/rest/ClientException.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/rest/ClientException.java
index d5fd207..0188a3a 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/ClientException.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/ClientException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rest;
+package org.apache.hugegraph.rest;
public class ClientException extends RuntimeException {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/RestClient.java b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestClient.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/rest/RestClient.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestClient.java
index a60aeee..3e095d5 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/RestClient.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestClient.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rest;
+package org.apache.hugegraph.rest;
import java.util.Map;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/RestResult.java b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestResult.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/rest/RestResult.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestResult.java
index 88ba49e..440deab 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/RestResult.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/RestResult.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rest;
+package org.apache.hugegraph.rest;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/SerializeException.java b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/SerializeException.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/rest/SerializeException.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/rest/SerializeException.java
index 65bfa95..eedac90 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/rest/SerializeException.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/rest/SerializeException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rest;
+package org.apache.hugegraph.rest;
public class SerializeException extends ClientException {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/testutil/Assert.java b/hugegraph-common/src/main/java/org/apache/hugegraph/testutil/Assert.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/testutil/Assert.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/testutil/Assert.java
index 333002d..284c572 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/testutil/Assert.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/testutil/Assert.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.testutil;
+package org.apache.hugegraph.testutil;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java b/hugegraph-common/src/main/java/org/apache/hugegraph/testutil/Whitebox.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/testutil/Whitebox.java
index 826ab01..db92f62 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/testutil/Whitebox.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/testutil/Whitebox.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.testutil;
+package org.apache.hugegraph.testutil;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Objects;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
import com.google.common.primitives.Primitives;
public class Whitebox {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/Bytes.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/Bytes.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/Bytes.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/Bytes.java
index df19c22..43f091c 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/Bytes.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/Bytes.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.Comparator;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/CheckSocket.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/CheckSocket.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/CheckSocket.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/CheckSocket.java
index c0dfc89..9924388 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/CheckSocket.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/CheckSocket.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.io.IOException;
import java.net.InetAddress;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/CollectionUtil.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/CollectionUtil.java
index 6b6d638..c1f3404 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/CollectionUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/CollectionUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.lang.reflect.Array;
import java.util.ArrayDeque;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/DateUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/DateUtil.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/DateUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/DateUtil.java
index a3f117a..b34ebb1 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/DateUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/DateUtil.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import com.baidu.hugegraph.date.SafeDateFormat;
+import org.apache.hugegraph.date.SafeDateFormat;
import com.google.common.collect.ImmutableMap;
public final class DateUtil {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/E.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/E.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/E.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/E.java
index 340b7bc..52acdd3 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/E.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/E.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.util.Collection;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/ExecutorUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/ExecutorUtil.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/ExecutorUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/ExecutorUtil.java
index 087f8d0..1058c98 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/ExecutorUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/ExecutorUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -26,7 +26,7 @@ import java.util.concurrent.ThreadFactory;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import com.baidu.hugegraph.concurrent.PausableScheduledThreadPool;
+import org.apache.hugegraph.concurrent.PausableScheduledThreadPool;
public final class ExecutorUtil {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/HashUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/HashUtil.java
similarity index 97%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/HashUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/HashUtil.java
index b2091be..443295e 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/HashUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/HashUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.nio.charset.Charset;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/InsertionOrderUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/InsertionOrderUtil.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/InsertionOrderUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/InsertionOrderUtil.java
index bfe9114..929cd6c 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/InsertionOrderUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/InsertionOrderUtil.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.LinkedHashMap;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/Log.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/Log.java
similarity index 96%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/Log.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/Log.java
index 6507cf0..1192e9d 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/Log.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/Log.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/LongEncoding.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/LongEncoding.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/LongEncoding.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/LongEncoding.java
index 0383cd7..3488445 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/LongEncoding.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/LongEncoding.java
@@ -15,7 +15,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
/**
* Utility class for encoding longs in strings based on:
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/NumericUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/NumericUtil.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/NumericUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/NumericUtil.java
index b07138a..d9dd190 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/NumericUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/NumericUtil.java
@@ -15,7 +15,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.math.BigDecimal;
import java.nio.ByteBuffer;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/OrderLimitMap.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/OrderLimitMap.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/OrderLimitMap.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/OrderLimitMap.java
index 0c22f45..e286ca9 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/OrderLimitMap.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/OrderLimitMap.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.util.HashMap;
import java.util.Map;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/ReflectionUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/ReflectionUtil.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/ReflectionUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/ReflectionUtil.java
index c9092ff..8530869 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/ReflectionUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/ReflectionUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.io.IOException;
import java.lang.annotation.Annotation;
@@ -26,7 +26,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import com.baidu.hugegraph.iterator.ExtendableIterator;
+import org.apache.hugegraph.iterator.ExtendableIterator;
import com.google.common.collect.Lists;
import com.google.common.reflect.ClassPath;
import com.google.common.reflect.ClassPath.ClassInfo;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/StringUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/StringUtil.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/StringUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/StringUtil.java
index f7dcbb9..d717510 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/StringUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/StringUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
public final class StringUtil {
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/TimeUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/TimeUtil.java
similarity index 98%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/TimeUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/TimeUtil.java
index 35696f0..69394df 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/TimeUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/TimeUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.time.Duration;
import java.util.Date;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/UnitUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/UnitUtil.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/UnitUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/UnitUtil.java
index 069ab00..e21ed9e 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/UnitUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/UnitUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.math.BigDecimal;
import java.time.Duration;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/VersionUtil.java b/hugegraph-common/src/main/java/org/apache/hugegraph/util/VersionUtil.java
similarity index 99%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/util/VersionUtil.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/util/VersionUtil.java
index 94e4d3a..57c9eb7 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/util/VersionUtil.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/util/VersionUtil.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.util;
+package org.apache.hugegraph.util;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/hugegraph-common/src/main/java/com/baidu/hugegraph/version/CommonVersion.java b/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
similarity index 80%
rename from hugegraph-common/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
rename to hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
index e75c183..13823e9 100644
--- a/hugegraph-common/src/main/java/com/baidu/hugegraph/version/CommonVersion.java
+++ b/hugegraph-common/src/main/java/org/apache/hugegraph/version/CommonVersion.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.version;
+package org.apache.hugegraph.version;
-import com.baidu.hugegraph.util.VersionUtil.Version;
+import org.apache.hugegraph.util.VersionUtil;
public class CommonVersion {
public static final String NAME = "hugegraph-common";
// The second parameter of Version.of() is for all-in-one JAR
- public static final Version VERSION = Version.of(CommonVersion.class,
- "2.1.2");
+ public static final VersionUtil.Version VERSION = VersionUtil.Version.of(CommonVersion.class,
+ "3.0.0");
}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java b/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java
deleted file mode 100644
index 012038e..0000000
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2017 HugeGraph Authors
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package com.baidu.hugegraph.unit;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-import com.baidu.hugegraph.testutil.AssertTest;
-import com.baidu.hugegraph.testutil.WhiteboxTest;
-import com.baidu.hugegraph.unit.concurrent.AtomicLockTest;
-import com.baidu.hugegraph.unit.concurrent.BarrierEventTest;
-import com.baidu.hugegraph.unit.concurrent.KeyLockTest;
-import com.baidu.hugegraph.unit.concurrent.LockGroupTest;
-import com.baidu.hugegraph.unit.concurrent.LockManagerTest;
-import com.baidu.hugegraph.unit.concurrent.PausableScheduledThreadPoolTest;
-import com.baidu.hugegraph.unit.concurrent.RowLockTest;
-import com.baidu.hugegraph.unit.config.HugeConfigTest;
-import com.baidu.hugegraph.unit.config.OptionSpaceTest;
-import com.baidu.hugegraph.unit.date.SafeDateFormatTest;
-import com.baidu.hugegraph.unit.event.EventHubTest;
-import com.baidu.hugegraph.unit.iterator.BatchMapperIteratorTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest;
-import com.baidu.hugegraph.unit.iterator.FilterIteratorTest;
-import com.baidu.hugegraph.unit.iterator.FlatMapperFilterIteratorTest;
-import com.baidu.hugegraph.unit.iterator.FlatMapperIteratorTest;
-import com.baidu.hugegraph.unit.iterator.LimitIteratorTest;
-import com.baidu.hugegraph.unit.iterator.ListIteratorTest;
-import com.baidu.hugegraph.unit.iterator.MapperIteratorTest;
-import com.baidu.hugegraph.unit.license.LicenseExtraParamTest;
-import com.baidu.hugegraph.unit.license.LicenseCreateParamTest;
-import com.baidu.hugegraph.unit.license.LicenseInstallParamTest;
-import com.baidu.hugegraph.unit.license.LicenseParamsTest;
-import com.baidu.hugegraph.unit.license.MachineInfoTest;
-import com.baidu.hugegraph.unit.perf.PerfUtilTest;
-import com.baidu.hugegraph.unit.perf.StopwatchTest;
-import com.baidu.hugegraph.unit.rest.RestClientTest;
-import com.baidu.hugegraph.unit.rest.RestResultTest;
-import com.baidu.hugegraph.unit.util.BytesTest;
-import com.baidu.hugegraph.unit.util.CollectionUtilTest;
-import com.baidu.hugegraph.unit.util.DateUtilTest;
-import com.baidu.hugegraph.unit.util.EcheckTest;
-import com.baidu.hugegraph.unit.util.HashUtilTest;
-import com.baidu.hugegraph.unit.util.InsertionOrderUtilTest;
-import com.baidu.hugegraph.unit.util.LogTest;
-import com.baidu.hugegraph.unit.util.LongEncodingTest;
-import com.baidu.hugegraph.unit.util.NumericUtilTest;
-import com.baidu.hugegraph.unit.util.OrderLimitMapTest;
-import com.baidu.hugegraph.unit.util.ReflectionUtilTest;
-import com.baidu.hugegraph.unit.util.StringUtilTest;
-import com.baidu.hugegraph.unit.util.TimeUtilTest;
-import com.baidu.hugegraph.unit.util.UnitUtilTest;
-import com.baidu.hugegraph.unit.util.VersionUtilTest;
-import com.baidu.hugegraph.unit.version.VersionTest;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
- LockManagerTest.class,
- LockGroupTest.class,
- AtomicLockTest.class,
- KeyLockTest.class,
- RowLockTest.class,
- PausableScheduledThreadPoolTest.class,
-
- HugeConfigTest.class,
- OptionSpaceTest.class,
- SafeDateFormatTest.class,
- BarrierEventTest.class,
- EventHubTest.class,
- PerfUtilTest.class,
- StopwatchTest.class,
- RestClientTest.class,
- RestResultTest.class,
- VersionTest.class,
-
- ExtendableIteratorTest.class,
- FilterIteratorTest.class,
- LimitIteratorTest.class,
- MapperIteratorTest.class,
- FlatMapperIteratorTest.class,
- FlatMapperFilterIteratorTest.class,
- ListIteratorTest.class,
- BatchMapperIteratorTest.class,
-
- BytesTest.class,
- CollectionUtilTest.class,
- EcheckTest.class,
- HashUtilTest.class,
- InsertionOrderUtilTest.class,
- LogTest.class,
- NumericUtilTest.class,
- ReflectionUtilTest.class,
- StringUtilTest.class,
- TimeUtilTest.class,
- VersionUtilTest.class,
- LongEncodingTest.class,
- OrderLimitMapTest.class,
- DateUtilTest.class,
- UnitUtilTest.class,
-
- LicenseExtraParamTest.class,
- LicenseCreateParamTest.class,
- LicenseInstallParamTest.class,
- LicenseParamsTest.class,
- MachineInfoTest.class,
-
- AssertTest.class,
- WhiteboxTest.class
-})
-public class UnitTestSuite {
-}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/testutil/AssertTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/testutil/AssertTest.java
similarity index 99%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/testutil/AssertTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/testutil/AssertTest.java
index 91b7ee4..7116adc 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/testutil/AssertTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/testutil/AssertTest.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package com.baidu.hugegraph.testutil;
+package org.apache.hugegraph.testutil;
import org.junit.Test;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class AssertTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/testutil/WhiteboxTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/testutil/WhiteboxTest.java
similarity index 99%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/testutil/WhiteboxTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/testutil/WhiteboxTest.java
index 6375c0d..f6ebf6d 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/testutil/WhiteboxTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/testutil/WhiteboxTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.testutil;
+package org.apache.hugegraph.testutil;
import org.junit.Test;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java
index 707b619..cd09b80 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit;
+package org.apache.hugegraph.unit;
import java.util.ArrayList;
import java.util.List;
@@ -26,11 +26,10 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import org.apache.hugegraph.util.TimeUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import com.baidu.hugegraph.util.TimeUtil;
-
public class BaseUnitTest {
@BeforeClass
diff --git a/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
new file mode 100644
index 0000000..0521987
--- /dev/null
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2017 HugeGraph Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hugegraph.unit;
+
+import org.apache.hugegraph.testutil.AssertTest;
+import org.apache.hugegraph.testutil.WhiteboxTest;
+import org.apache.hugegraph.unit.config.HugeConfigTest;
+import org.apache.hugegraph.unit.config.OptionSpaceTest;
+import org.apache.hugegraph.unit.event.EventHubTest;
+import org.apache.hugegraph.unit.version.VersionTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+import org.apache.hugegraph.unit.concurrent.AtomicLockTest;
+import org.apache.hugegraph.unit.concurrent.BarrierEventTest;
+import org.apache.hugegraph.unit.concurrent.KeyLockTest;
+import org.apache.hugegraph.unit.concurrent.LockGroupTest;
+import org.apache.hugegraph.unit.concurrent.LockManagerTest;
+import org.apache.hugegraph.unit.concurrent.PausableScheduledThreadPoolTest;
+import org.apache.hugegraph.unit.concurrent.RowLockTest;
+import org.apache.hugegraph.unit.date.SafeDateFormatTest;
+import org.apache.hugegraph.unit.iterator.BatchMapperIteratorTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest;
+import org.apache.hugegraph.unit.iterator.FilterIteratorTest;
+import org.apache.hugegraph.unit.iterator.FlatMapperFilterIteratorTest;
+import org.apache.hugegraph.unit.iterator.FlatMapperIteratorTest;
+import org.apache.hugegraph.unit.iterator.LimitIteratorTest;
+import org.apache.hugegraph.unit.iterator.ListIteratorTest;
+import org.apache.hugegraph.unit.iterator.MapperIteratorTest;
+import org.apache.hugegraph.unit.license.LicenseExtraParamTest;
+import org.apache.hugegraph.unit.license.LicenseCreateParamTest;
+import org.apache.hugegraph.unit.license.LicenseInstallParamTest;
+import org.apache.hugegraph.unit.license.LicenseParamsTest;
+import org.apache.hugegraph.unit.license.MachineInfoTest;
+import org.apache.hugegraph.unit.perf.PerfUtilTest;
+import org.apache.hugegraph.unit.perf.StopwatchTest;
+import org.apache.hugegraph.unit.rest.RestClientTest;
+import org.apache.hugegraph.unit.rest.RestResultTest;
+import org.apache.hugegraph.unit.util.BytesTest;
+import org.apache.hugegraph.unit.util.CollectionUtilTest;
+import org.apache.hugegraph.unit.util.DateUtilTest;
+import org.apache.hugegraph.unit.util.EcheckTest;
+import org.apache.hugegraph.unit.util.HashUtilTest;
+import org.apache.hugegraph.unit.util.InsertionOrderUtilTest;
+import org.apache.hugegraph.unit.util.LogTest;
+import org.apache.hugegraph.unit.util.LongEncodingTest;
+import org.apache.hugegraph.unit.util.NumericUtilTest;
+import org.apache.hugegraph.unit.util.OrderLimitMapTest;
+import org.apache.hugegraph.unit.util.ReflectionUtilTest;
+import org.apache.hugegraph.unit.util.StringUtilTest;
+import org.apache.hugegraph.unit.util.TimeUtilTest;
+import org.apache.hugegraph.unit.util.UnitUtilTest;
+import org.apache.hugegraph.unit.util.VersionUtilTest;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ LockManagerTest.class,
+ LockGroupTest.class,
+ AtomicLockTest.class,
+ KeyLockTest.class,
+ RowLockTest.class,
+ PausableScheduledThreadPoolTest.class,
+
+ HugeConfigTest.class,
+ OptionSpaceTest.class,
+ SafeDateFormatTest.class,
+ BarrierEventTest.class,
+ EventHubTest.class,
+ PerfUtilTest.class,
+ StopwatchTest.class,
+ RestClientTest.class,
+ RestResultTest.class,
+ VersionTest.class,
+
+ ExtendableIteratorTest.class,
+ FilterIteratorTest.class,
+ LimitIteratorTest.class,
+ MapperIteratorTest.class,
+ FlatMapperIteratorTest.class,
+ FlatMapperFilterIteratorTest.class,
+ ListIteratorTest.class,
+ BatchMapperIteratorTest.class,
+
+ BytesTest.class,
+ CollectionUtilTest.class,
+ EcheckTest.class,
+ HashUtilTest.class,
+ InsertionOrderUtilTest.class,
+ LogTest.class,
+ NumericUtilTest.class,
+ ReflectionUtilTest.class,
+ StringUtilTest.class,
+ TimeUtilTest.class,
+ VersionUtilTest.class,
+ LongEncodingTest.class,
+ OrderLimitMapTest.class,
+ DateUtilTest.class,
+ UnitUtilTest.class,
+
+ LicenseExtraParamTest.class,
+ LicenseCreateParamTest.class,
+ LicenseInstallParamTest.class,
+ LicenseParamsTest.class,
+ MachineInfoTest.class,
+
+ AssertTest.class,
+ WhiteboxTest.class
+})
+public class UnitTestSuite {
+}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/AtomicLockTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/AtomicLockTest.java
similarity index 91%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/AtomicLockTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/AtomicLockTest.java
index 225fe42..02265ad 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/AtomicLockTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/AtomicLockTest.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.AtomicLock;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.concurrent.AtomicLock;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class AtomicLockTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/BarrierEventTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/BarrierEventTest.java
similarity index 98%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/BarrierEventTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/BarrierEventTest.java
index c81aa3d..c40a2f2 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/BarrierEventTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/BarrierEventTest.java
@@ -1,4 +1,4 @@
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
@@ -8,8 +8,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.BarrierEvent;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.concurrent.BarrierEvent;
+import org.apache.hugegraph.testutil.Assert;
public class BarrierEventTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/KeyLockTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/KeyLockTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/KeyLockTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/KeyLockTest.java
index 60a946a..e431853 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/KeyLockTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/KeyLockTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import java.util.Arrays;
import java.util.List;
@@ -25,9 +25,9 @@ import java.util.concurrent.locks.Lock;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.KeyLock;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.concurrent.KeyLock;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class KeyLockTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/LockGroupTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/LockGroupTest.java
similarity index 90%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/LockGroupTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/LockGroupTest.java
index 1f25291..3309a43 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/LockGroupTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/LockGroupTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
@@ -26,12 +26,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.AtomicLock;
-import com.baidu.hugegraph.concurrent.KeyLock;
-import com.baidu.hugegraph.concurrent.LockGroup;
-import com.baidu.hugegraph.concurrent.RowLock;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.concurrent.AtomicLock;
+import org.apache.hugegraph.concurrent.KeyLock;
+import org.apache.hugegraph.concurrent.LockGroup;
+import org.apache.hugegraph.concurrent.RowLock;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class LockGroupTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/LockManagerTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/LockManagerTest.java
similarity index 94%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/LockManagerTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/LockManagerTest.java
index 4eb5abd..edb628b 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/LockManagerTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/LockManagerTest.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import org.junit.After;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.LockGroup;
-import com.baidu.hugegraph.concurrent.LockManager;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.concurrent.LockGroup;
+import org.apache.hugegraph.concurrent.LockManager;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class LockManagerTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/PausableScheduledThreadPoolTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/PausableScheduledThreadPoolTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/PausableScheduledThreadPoolTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/PausableScheduledThreadPoolTest.java
index b4feff6..fb66741 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/PausableScheduledThreadPoolTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/PausableScheduledThreadPoolTest.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hugegraph.util.ExecutorUtil;
import org.junit.Assert;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.PausableScheduledThreadPool;
-import com.baidu.hugegraph.util.ExecutorUtil;
+import org.apache.hugegraph.concurrent.PausableScheduledThreadPool;
public class PausableScheduledThreadPoolTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/RowLockTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/RowLockTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/RowLockTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/RowLockTest.java
index 4821f1d..0fd6661 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/concurrent/RowLockTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/concurrent/RowLockTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.concurrent;
+package org.apache.hugegraph.unit.concurrent;
import java.util.ArrayList;
import java.util.HashSet;
@@ -27,9 +27,9 @@ import java.util.Set;
import org.junit.Test;
-import com.baidu.hugegraph.concurrent.RowLock;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.concurrent.RowLock;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
import com.google.common.collect.ImmutableSet;
public class RowLockTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/HugeConfigTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/HugeConfigTest.java
similarity index 90%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/HugeConfigTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/HugeConfigTest.java
index f522d56..a2d1321 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/HugeConfigTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/HugeConfigTest.java
@@ -17,15 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.config;
-
-import static com.baidu.hugegraph.config.OptionChecker.allowValues;
-import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty;
-import static com.baidu.hugegraph.config.OptionChecker.inValues;
-import static com.baidu.hugegraph.config.OptionChecker.nonNegativeInt;
-import static com.baidu.hugegraph.config.OptionChecker.positiveInt;
-import static com.baidu.hugegraph.config.OptionChecker.rangeDouble;
-import static com.baidu.hugegraph.config.OptionChecker.rangeInt;
+package org.apache.hugegraph.unit.config;
import java.io.File;
import java.io.IOException;
@@ -34,6 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.hugegraph.config.*;
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.configuration2.AbstractConfiguration;
import org.apache.commons.configuration2.Configuration;
@@ -43,20 +36,20 @@ import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.io.FileHandler;
import org.apache.commons.io.FileUtils;
+import org.apache.hugegraph.config.*;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.baidu.hugegraph.config.ConfigConvOption;
-import com.baidu.hugegraph.config.ConfigException;
-import com.baidu.hugegraph.config.ConfigListConvOption;
-import com.baidu.hugegraph.config.ConfigListOption;
-import com.baidu.hugegraph.config.ConfigOption;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.OptionHolder;
-import com.baidu.hugegraph.config.OptionSpace;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.testutil.Whitebox;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.config.ConfigConvOption;
+import org.apache.hugegraph.config.ConfigException;
+import org.apache.hugegraph.config.ConfigListConvOption;
+import org.apache.hugegraph.config.ConfigListOption;
+import org.apache.hugegraph.config.ConfigOption;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.config.OptionHolder;
+import org.apache.hugegraph.config.OptionSpace;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -64,7 +57,7 @@ import com.google.common.collect.ImmutableMap;
public class HugeConfigTest extends BaseUnitTest {
private static final String PATH =
- "src/test/java/com/baidu/hugegraph/unit/config/";
+ "src/test/java/com/apache/hugegraph/unit/config/";
private static final String CONF = PATH + "test.conf";
@BeforeClass
@@ -139,7 +132,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.text",
"description of group1.text",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
""
);
});
@@ -148,7 +141,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.choice",
"description of group1.choice",
- allowValues("CHOICE-1", "CHOICE-2", "CHOICE-3"),
+ OptionChecker.allowValues("CHOICE-1", "CHOICE-2", "CHOICE-3"),
"CHOICE-4"
);
});
@@ -158,7 +151,7 @@ public class HugeConfigTest extends BaseUnitTest {
"group1.list",
true,
"description of group1.list",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
String.class,
ImmutableList.of()
);
@@ -168,7 +161,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int",
"description of group1.int",
- positiveInt(),
+ OptionChecker.positiveInt(),
0
);
});
@@ -177,7 +170,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int",
"description of group1.int",
- nonNegativeInt(),
+ OptionChecker.nonNegativeInt(),
-1
);
});
@@ -186,7 +179,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.long",
"description of group1.long",
- rangeInt(1L, 100L),
+ OptionChecker.rangeInt(1L, 100L),
0L
);
});
@@ -195,7 +188,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.long",
"description of group1.long",
- rangeInt(1L, 100L),
+ OptionChecker.rangeInt(1L, 100L),
101L
);
});
@@ -204,7 +197,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.double",
"description of group1.double",
- rangeDouble(1D, 10D),
+ OptionChecker.rangeDouble(1D, 10D),
0D
);
});
@@ -213,7 +206,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.double",
"description of group1.double",
- rangeDouble(1D, 10D),
+ OptionChecker.rangeDouble(1D, 10D),
11D
);
});
@@ -231,7 +224,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigListOption<>(
"group1.list",
"description of list with invalid default values",
- disallowEmpty()
+ OptionChecker.disallowEmpty()
);
});
@@ -247,7 +240,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigListConvOption<String, WeekDay>(
"group1.list_conv",
"description of list_conv with invalid default values",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
s -> WeekDay.valueOf(s)
);
});
@@ -288,7 +281,7 @@ public class HugeConfigTest extends BaseUnitTest {
Assert.assertEquals(Object.class, config.get(TestOptions.clazz));
Assert.assertThrows(ConfigException.class, () -> {
config.setProperty(TestOptions.clazz.name(),
- "com.baidu.hugegraph.HugeGraph");
+ "org.apache.hugegraph.HugeGraph");
}, e -> {
Assert.assertTrue(e.getCause() instanceof ClassNotFoundException);
});
@@ -448,7 +441,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.text1",
"description of group1.text1",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"text1-value"
);
@@ -463,7 +456,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.text3",
"description of group1.text3",
- allowValues("CHOICE-1", "CHOICE-2", "CHOICE-3"),
+ OptionChecker.allowValues("CHOICE-1", "CHOICE-2", "CHOICE-3"),
"CHOICE-1"
);
@@ -471,7 +464,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int1",
"description of group1.int1",
- rangeInt(1, 100),
+ OptionChecker.rangeInt(1, 100),
1
);
@@ -479,7 +472,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int2",
"description of group1.int2",
- nonNegativeInt(),
+ OptionChecker.nonNegativeInt(),
10
);
@@ -487,7 +480,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int3",
"description of group1.int3",
- positiveInt(),
+ OptionChecker.positiveInt(),
10
);
@@ -495,7 +488,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.long1",
"description of group1.long1",
- rangeInt(1L, 100L),
+ OptionChecker.rangeInt(1L, 100L),
100L
);
@@ -503,7 +496,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.float1",
"description of group1.float1",
- rangeDouble(1.0f, 100.0f),
+ OptionChecker.rangeDouble(1.0f, 100.0f),
100.0f
);
@@ -511,7 +504,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.double1",
"description of group1.double1",
- rangeDouble(1.0, 100.0),
+ OptionChecker.rangeDouble(1.0, 100.0),
100.0
);
@@ -519,7 +512,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.bool",
"description of group1.bool",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
true
);
@@ -527,7 +520,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.class",
"description of group1.class",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
Object.class
);
@@ -535,7 +528,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigConvOption<>(
"group1.weekday",
"description of group1.weekday",
- allowValues("SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
+ OptionChecker.allowValues("SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
"THURSDAY", "FRIDAY", "SATURDAY"),
WeekDay::valueOf,
"WEDNESDAY"
@@ -545,7 +538,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigListConvOption<>(
"group1.weekdays",
"description of group1.weekdays",
- inValues("SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
+ OptionChecker.inValues("SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
"THURSDAY", "FRIDAY", "SATURDAY"),
WeekDay::valueOf,
"SATURDAY", "SUNDAY"
@@ -555,7 +548,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigListOption<>(
"group1.list",
"description of group1.list",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"list-value1", "list-value2"
);
@@ -563,7 +556,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigListOption<>(
"group1.map",
"description of group1.map",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"key1:value1", "key2:value2"
);
}
@@ -575,7 +568,7 @@ public class HugeConfigTest extends BaseUnitTest {
"group1.text2",
true,
"description of group1.text2 sub",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
String.class,
"text2-value-override"
);
@@ -584,7 +577,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.textsub",
"description of group1.textsub",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"textsub-value"
);
}
@@ -605,7 +598,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int_type_error",
"description of group1.int_type_error",
- rangeInt(1, 100),
+ OptionChecker.rangeInt(1, 100),
1
);
}
@@ -626,7 +619,7 @@ public class HugeConfigTest extends BaseUnitTest {
new ConfigOption<>(
"group1.int_check_error",
"description of group1.int_check_error",
- rangeInt(1, 100),
+ OptionChecker.rangeInt(1, 100),
1
);
}
@@ -647,7 +640,7 @@ public class HugeConfigTest extends BaseUnitTest {
new InvalidConfigListOption<>(
"group1.list_for_list_error",
"description of group1.list_for_list_error",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
1
);
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/OptionSpaceTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/OptionSpaceTest.java
similarity index 91%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/OptionSpaceTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/OptionSpaceTest.java
index 3ff2c05..b789caf 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/OptionSpaceTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/OptionSpaceTest.java
@@ -17,18 +17,18 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.config;
-
-import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty;
+package org.apache.hugegraph.unit.config;
+import org.apache.hugegraph.config.*;
+import org.apache.hugegraph.config.*;
import org.junit.Test;
-import com.baidu.hugegraph.config.ConfigException;
-import com.baidu.hugegraph.config.ConfigOption;
-import com.baidu.hugegraph.config.OptionHolder;
-import com.baidu.hugegraph.config.OptionSpace;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.config.ConfigException;
+import org.apache.hugegraph.config.ConfigOption;
+import org.apache.hugegraph.config.OptionHolder;
+import org.apache.hugegraph.config.OptionSpace;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
import com.google.common.base.Predicate;
public class OptionSpaceTest extends BaseUnitTest {
@@ -143,7 +143,7 @@ public class OptionSpaceTest extends BaseUnitTest {
new InvalidOption<>(
"group1.text1",
"description of group1.text1",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"value"
);
@@ -175,7 +175,7 @@ public class OptionSpaceTest extends BaseUnitTest {
new ConfigOption<>(
"testgroup1.text1",
"description of testgroup1.text1",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"text1 value"
);
@@ -183,7 +183,7 @@ public class OptionSpaceTest extends BaseUnitTest {
new ConfigOption<>(
"testgroup1.text2",
"description of testgroup1.text2",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"text2 value"
);
}
@@ -202,7 +202,7 @@ public class OptionSpaceTest extends BaseUnitTest {
new ConfigOption<>(
"testgroup2.text1",
"description of testgroup2.text1",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"text1 value"
);
@@ -210,7 +210,7 @@ public class OptionSpaceTest extends BaseUnitTest {
new ConfigOption<>(
"testgroup2.text2",
"description of testgroup2.text2",
- disallowEmpty(),
+ OptionChecker.disallowEmpty(),
"text2 value"
);
}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test-check-error.conf b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test-check-error.conf
similarity index 100%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test-check-error.conf
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test-check-error.conf
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test-list-error.conf b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test-list-error.conf
similarity index 100%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test-list-error.conf
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test-list-error.conf
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test-type-error.conf b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test-type-error.conf
similarity index 100%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test-type-error.conf
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test-type-error.conf
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test.conf b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test.conf
similarity index 100%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/config/test.conf
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/config/test.conf
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/date/SafeDateFormatTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/date/SafeDateFormatTest.java
similarity index 97%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/date/SafeDateFormatTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/date/SafeDateFormatTest.java
index cf0036b..6c9e89e 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/date/SafeDateFormatTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/date/SafeDateFormatTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.date;
+package org.apache.hugegraph.unit.date;
import java.text.DateFormat;
import java.text.ParseException;
@@ -28,10 +28,10 @@ import java.util.List;
import java.util.TimeZone;
import java.util.concurrent.CountDownLatch;
+import org.apache.hugegraph.date.SafeDateFormat;
import org.junit.Test;
-import com.baidu.hugegraph.date.SafeDateFormat;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.testutil.Assert;
import com.google.common.collect.ImmutableList;
public class SafeDateFormatTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/event/EventHubTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/event/EventHubTest.java
similarity index 98%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/event/EventHubTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/event/EventHubTest.java
index ee57283..6a6cab4 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/event/EventHubTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/event/EventHubTest.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.event;
+package org.apache.hugegraph.unit.event;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hugegraph.event.Event;
+import org.apache.hugegraph.event.EventHub;
+import org.apache.hugegraph.event.EventListener;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.baidu.hugegraph.event.Event;
-import com.baidu.hugegraph.event.EventHub;
-import com.baidu.hugegraph.event.EventListener;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
import com.google.common.collect.ImmutableList;
public class EventHubTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/BatchMapperIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/BatchMapperIteratorTest.java
similarity index 97%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/BatchMapperIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/BatchMapperIteratorTest.java
index a5d33d7..40a39a2 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/BatchMapperIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/BatchMapperIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Collections;
@@ -29,10 +29,10 @@ import java.util.function.Function;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.BatchMapperIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.BatchMapperIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
@SuppressWarnings("resource")
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/ExtendableIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/ExtendableIteratorTest.java
similarity index 97%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/ExtendableIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/ExtendableIteratorTest.java
index 4c7ba31..e753ea8 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/ExtendableIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/ExtendableIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Iterator;
@@ -26,9 +26,9 @@ import java.util.NoSuchElementException;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.ExtendableIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.iterator.ExtendableIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
import com.google.common.collect.ImmutableList;
@SuppressWarnings("resource")
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FilterIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FilterIteratorTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FilterIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FilterIteratorTest.java
index 9024673..f6c0e17 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FilterIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FilterIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Iterator;
@@ -28,10 +28,10 @@ import java.util.function.Function;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.FilterIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.FilterIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
@SuppressWarnings("resource")
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FlatMapperFilterIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FlatMapperFilterIteratorTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FlatMapperFilterIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FlatMapperFilterIteratorTest.java
index bc69bf5..536f38a 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FlatMapperFilterIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FlatMapperFilterIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Iterator;
@@ -29,10 +29,10 @@ import java.util.function.Function;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.FlatMapperFilterIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.FlatMapperFilterIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FlatMapperIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FlatMapperIteratorTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FlatMapperIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FlatMapperIteratorTest.java
index 9745029..5e5baf4 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/FlatMapperIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/FlatMapperIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Iterator;
@@ -29,10 +29,10 @@ import java.util.function.Function;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.FlatMapperIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.FlatMapperIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/LimitIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/LimitIteratorTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/LimitIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/LimitIteratorTest.java
index acd4fc1..f806b5e 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/LimitIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/LimitIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Iterator;
@@ -28,10 +28,10 @@ import java.util.function.Function;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.LimitIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.LimitIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
@SuppressWarnings("resource")
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/ListIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/ListIteratorTest.java
similarity index 97%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/ListIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/ListIteratorTest.java
index 8ddd995..d833434 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/ListIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/ListIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Collections;
@@ -27,10 +27,10 @@ import java.util.NoSuchElementException;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.ListIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.ListIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterators;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/MapperIteratorTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/MapperIteratorTest.java
similarity index 94%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/MapperIteratorTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/MapperIteratorTest.java
index e2c63ed..23b2ab0 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/iterator/MapperIteratorTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/iterator/MapperIteratorTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.iterator;
+package org.apache.hugegraph.unit.iterator;
import java.util.ArrayList;
import java.util.Iterator;
@@ -29,10 +29,10 @@ import java.util.function.Function;
import org.junit.Test;
-import com.baidu.hugegraph.iterator.MapperIterator;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
+import org.apache.hugegraph.iterator.MapperIterator;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.iterator.ExtendableIteratorTest.CloseableItor;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseCreateParamTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseCreateParamTest.java
index cb67ce9..92b902f 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseCreateParamTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseCreateParamTest.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.license;
+package org.apache.hugegraph.unit.license;
import java.io.IOException;
import java.text.ParseException;
+import org.apache.hugegraph.date.SafeDateFormat;
import org.junit.Test;
-import com.baidu.hugegraph.date.SafeDateFormat;
-import com.baidu.hugegraph.license.LicenseCreateParam;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.license.LicenseCreateParam;
+import org.apache.hugegraph.testutil.Assert;
import com.fasterxml.jackson.databind.ObjectMapper;
public class LicenseCreateParamTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseExtraParamTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseExtraParamTest.java
similarity index 94%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseExtraParamTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseExtraParamTest.java
index 7d613c5..65f9def 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseExtraParamTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseExtraParamTest.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.license;
+package org.apache.hugegraph.unit.license;
import java.io.IOException;
+import org.apache.hugegraph.license.LicenseExtraParam;
import org.junit.Test;
-import com.baidu.hugegraph.license.LicenseExtraParam;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.testutil.Assert;
import com.fasterxml.jackson.databind.ObjectMapper;
public class LicenseExtraParamTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseInstallParamTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseInstallParamTest.java
similarity index 93%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseInstallParamTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseInstallParamTest.java
index a16b02f..8b3bbc4 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseInstallParamTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseInstallParamTest.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.license;
+package org.apache.hugegraph.unit.license;
import java.io.IOException;
import org.junit.Test;
-import com.baidu.hugegraph.license.LicenseInstallParam;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.license.LicenseInstallParam;
+import org.apache.hugegraph.testutil.Assert;
import com.fasterxml.jackson.databind.ObjectMapper;
public class LicenseInstallParamTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseParamsTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseParamsTest.java
similarity index 94%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseParamsTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseParamsTest.java
index 8dec1df..75e74f2 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/LicenseParamsTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/LicenseParamsTest.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.license;
+package org.apache.hugegraph.unit.license;
import java.io.IOException;
+import org.apache.hugegraph.license.LicenseExtraParam;
+import org.apache.hugegraph.license.LicenseParams;
import org.junit.Test;
-import com.baidu.hugegraph.license.LicenseExtraParam;
-import com.baidu.hugegraph.license.LicenseParams;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.testutil.Assert;
import com.fasterxml.jackson.databind.ObjectMapper;
public class LicenseParamsTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/MachineInfoTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/MachineInfoTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/MachineInfoTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/MachineInfoTest.java
index c436943..dfe3dc7 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/license/MachineInfoTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/license/MachineInfoTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.license;
+package org.apache.hugegraph.unit.license;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -26,8 +26,8 @@ import java.util.regex.Pattern;
import org.junit.Test;
-import com.baidu.hugegraph.license.MachineInfo;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.license.MachineInfo;
+import org.apache.hugegraph.testutil.Assert;
public class MachineInfoTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/PerfUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/PerfUtilTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/PerfUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/PerfUtilTest.java
index 926d9c8..b8d0def 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/PerfUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/PerfUtilTest.java
@@ -17,27 +17,27 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf;
+package org.apache.hugegraph.unit.perf;
import java.util.Map;
+import org.apache.hugegraph.perf.PerfUtil;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.unit.perf.testclass.TestLightClass;
+import org.apache.hugegraph.unit.perf.testclass.TestPerfClass;
import org.junit.After;
import org.junit.Test;
-import com.baidu.hugegraph.perf.PerfUtil;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass;
-import com.baidu.hugegraph.unit.perf.testclass.TestLightClass;
-import com.baidu.hugegraph.unit.perf.testclass.TestPerfClass;
-import com.baidu.hugegraph.unit.perf.testclass.TestPerfLightClass;
-import com.baidu.hugegraph.unit.perf.testclass2.TestClass4Package;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.perf.testclass.TestClass;
+import org.apache.hugegraph.unit.perf.testclass.TestPerfLightClass;
+import org.apache.hugegraph.unit.perf.testclass2.TestClass4Package;
import com.fasterxml.jackson.databind.ObjectMapper;
public class PerfUtilTest extends BaseUnitTest {
private static final String prefix =
- "com.baidu.hugegraph.unit.perf.testclass.";
+ "org.apache.hugegraph.unit.perf.testclass.";
private static final PerfUtil perf = PerfUtil.instance();
@After
@@ -251,7 +251,7 @@ public class PerfUtilTest extends BaseUnitTest {
@Test
public void testPerfUtilWithProfilePackage() throws Throwable {
- perf.profilePackage("com.baidu.hugegraph.unit.perf.testclass2");
+ perf.profilePackage("org.apache.hugegraph.unit.perf.testclass2");
TestClass4Package.Foo obj = new TestClass4Package.Foo();
obj.foo();
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/StopwatchTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/StopwatchTest.java
similarity index 89%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/StopwatchTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/StopwatchTest.java
index 53d5e60..bb89025 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/StopwatchTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/StopwatchTest.java
@@ -17,22 +17,21 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf;
+package org.apache.hugegraph.unit.perf;
+import org.apache.hugegraph.perf.LightStopwatch;
+import org.apache.hugegraph.perf.NormalStopwatch;
+import org.apache.hugegraph.perf.Stopwatch;
+import org.apache.hugegraph.unit.BaseUnitTest;
import org.junit.Test;
-import com.baidu.hugegraph.perf.LightStopwatch;
-import com.baidu.hugegraph.perf.NormalStopwatch;
-import com.baidu.hugegraph.perf.Stopwatch;
-import com.baidu.hugegraph.perf.Stopwatch.Path;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.testutil.Assert;
public class StopwatchTest extends BaseUnitTest {
@Test
public void testNormalStopwatchChild() {
- Stopwatch watch1 = new NormalStopwatch("w1", Path.EMPTY);
+ Stopwatch watch1 = new NormalStopwatch("w1", Stopwatch.Path.EMPTY);
Stopwatch watch2 = new NormalStopwatch("w2", watch1);
Stopwatch watch3 = new NormalStopwatch("w3", watch1);
@@ -68,7 +67,7 @@ public class StopwatchTest extends BaseUnitTest {
@Test
public void testLightStopwatchChild() {
- Stopwatch watch1 = new LightStopwatch("w1", Path.EMPTY);
+ Stopwatch watch1 = new LightStopwatch("w1", Stopwatch.Path.EMPTY);
Stopwatch watch2 = new LightStopwatch("w2", watch1);
Stopwatch watch3 = new LightStopwatch("w3", watch1);
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestClass.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestClass.java
similarity index 87%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestClass.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestClass.java
index 4288824..cd6233b 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestClass.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestClass.java
@@ -17,37 +17,36 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf.testclass;
+package org.apache.hugegraph.unit.perf.testclass;
-import com.baidu.hugegraph.perf.PerfUtil;
-import com.baidu.hugegraph.perf.PerfUtil.Watched;
+import org.apache.hugegraph.perf.PerfUtil;
public class TestClass {
- @Watched
+ @PerfUtil.Watched
public void test() {
new Foo().bar();
}
public static class Foo {
- @Watched(prefix="foo")
+ @PerfUtil.Watched(prefix="foo")
public void foo() {
this.bar();
}
- @Watched(prefix="foo")
+ @PerfUtil.Watched(prefix="foo")
public void bar() {}
}
public static class Bar {
- @Watched("bar_foo")
+ @PerfUtil.Watched("bar_foo")
public void foo() {
this.bar();
}
- @Watched("bar_bar")
+ @PerfUtil.Watched("bar_bar")
public void bar() {}
}
@@ -90,18 +89,18 @@ public class TestClass {
public static class Base {
- @Watched
+ @PerfUtil.Watched
public void func() {}
}
public static class Sub extends Base {
- @Watched
+ @PerfUtil.Watched
public void func1() {}
public void func2() {}
- @Watched
+ @PerfUtil.Watched
public void func3() {}
}
}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestLightClass.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestLightClass.java
similarity index 81%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestLightClass.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestLightClass.java
index 47ec3f1..73ce23e 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestLightClass.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestLightClass.java
@@ -17,36 +17,36 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf.testclass;
+package org.apache.hugegraph.unit.perf.testclass;
-import com.baidu.hugegraph.perf.PerfUtil.Watched;
+import org.apache.hugegraph.perf.PerfUtil;
public class TestLightClass {
- @Watched
+ @PerfUtil.Watched
public void test() {
new Foo().bar();
}
public static class Foo {
- @Watched(prefix="foo")
+ @PerfUtil.Watched(prefix="foo")
public void foo() {
this.bar();
}
- @Watched(prefix="foo")
+ @PerfUtil.Watched(prefix="foo")
public void bar() {}
}
public static class Bar {
- @Watched(prefix="bar")
+ @PerfUtil.Watched(prefix="bar")
public void foo() {
this.bar();
}
- @Watched(prefix="bar")
+ @PerfUtil.Watched(prefix="bar")
public void bar() {}
}
}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestPerfClass.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestPerfClass.java
similarity index 86%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestPerfClass.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestPerfClass.java
index 9ac381a..fab81e7 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestPerfClass.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestPerfClass.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf.testclass;
+package org.apache.hugegraph.unit.perf.testclass;
-import com.baidu.hugegraph.perf.PerfUtil.Watched;
+import org.apache.hugegraph.perf.PerfUtil;
public class TestPerfClass {
private Foo foo = new Foo();
- @Watched
+ @PerfUtil.Watched
public void test(int times) {
for (int i = 0; i < times; i++) {
this.testNew();
@@ -35,34 +35,34 @@ public class TestPerfClass {
}
}
- @Watched
+ @PerfUtil.Watched
public void testNew() {
new Foo();
}
- @Watched
+ @PerfUtil.Watched
public void testNewAndCall() {
new Foo().sum(1, 2);
}
- @Watched
+ @PerfUtil.Watched
public void testCall() {
this.foo.sum(1, 2);
}
- @Watched
+ @PerfUtil.Watched
public void testCallFooThenSum() {
this.foo.foo();
}
public static class Foo {
- @Watched
+ @PerfUtil.Watched
public void foo() {
this.sum(1, 2);
}
- @Watched
+ @PerfUtil.Watched
public int sum(int a, int b) {
int sum = a;
for (int i = 0; i < 100; i++) {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestPerfLightClass.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestPerfLightClass.java
similarity index 86%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestPerfLightClass.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestPerfLightClass.java
index 389ef23..36d0922 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass/TestPerfLightClass.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass/TestPerfLightClass.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf.testclass;
+package org.apache.hugegraph.unit.perf.testclass;
-import com.baidu.hugegraph.perf.PerfUtil.Watched;
+import org.apache.hugegraph.perf.PerfUtil;
public class TestPerfLightClass {
private Foo foo = new Foo();
- @Watched
+ @PerfUtil.Watched
public void test(int times) {
for (int i = 0; i < times; i++) {
this.testNew();
@@ -35,34 +35,34 @@ public class TestPerfLightClass {
}
}
- @Watched
+ @PerfUtil.Watched
public void testNew() {
new Foo();
}
- @Watched
+ @PerfUtil.Watched
public void testNewAndCall() {
new Foo().sum(1, 2);
}
- @Watched
+ @PerfUtil.Watched
public void testCall() {
this.foo.sum(1, 2);
}
- @Watched
+ @PerfUtil.Watched
public void testCallFooThenSum() {
this.foo.foo();
}
public static class Foo {
- @Watched
+ @PerfUtil.Watched
public void foo() {
this.sum(1, 2);
}
- @Watched
+ @PerfUtil.Watched
public int sum(int a, int b) {
int sum = a;
for (int i = 0; i < 100; i++) {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass2/TestClass4Package.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass2/TestClass4Package.java
similarity index 83%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass2/TestClass4Package.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass2/TestClass4Package.java
index b868907..4271fc0 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/perf/testclass2/TestClass4Package.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/perf/testclass2/TestClass4Package.java
@@ -17,25 +17,25 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.perf.testclass2;
+package org.apache.hugegraph.unit.perf.testclass2;
-import com.baidu.hugegraph.perf.PerfUtil.Watched;
+import org.apache.hugegraph.perf.PerfUtil;
public class TestClass4Package {
- @Watched
+ @PerfUtil.Watched
public void test() {
new Foo().bar();
}
public static class Foo extends FooBase {
- @Watched
+ @PerfUtil.Watched
public void foo() {
this.bar();
}
- @Watched
+ @PerfUtil.Watched
public void bar() {}
}
@@ -43,29 +43,29 @@ public class TestClass4Package {
public static class Bar {
- @Watched
+ @PerfUtil.Watched
public void foo() {
this.bar();
}
- @Watched
+ @PerfUtil.Watched
public void bar() {}
}
public static class Base {
- @Watched
+ @PerfUtil.Watched
public void func() {}
}
public static class Sub extends Base {
- @Watched
+ @PerfUtil.Watched
public void func1() {}
public void func2() {}
- @Watched
+ @PerfUtil.Watched
public void func3() {}
}
}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/rest/RestClientTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/rest/RestClientTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java
index bd48a0c..6819b22 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/rest/RestClientTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestClientTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.rest;
+package org.apache.hugegraph.unit.rest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
@@ -33,6 +33,10 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSessionContext;
+import org.apache.hugegraph.rest.AbstractRestClient;
+import org.apache.hugegraph.rest.ClientException;
+import org.apache.hugegraph.rest.RestClient;
+import org.apache.hugegraph.rest.RestResult;
import jakarta.ws.rs.client.Invocation.Builder;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.MultivaluedHashMap;
@@ -48,12 +52,8 @@ import org.glassfish.jersey.internal.util.collection.ImmutableMultivaluedMap;
import org.junit.Test;
import org.mockito.Mockito;
-import com.baidu.hugegraph.rest.AbstractRestClient;
-import com.baidu.hugegraph.rest.ClientException;
-import com.baidu.hugegraph.rest.RestClient;
-import com.baidu.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.testutil.Whitebox;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.testutil.Whitebox;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -304,15 +304,15 @@ public class RestClientTest {
return verifier.verify(hostname, session);
};
- Assert.assertTrue(verifer.apply("http://baidu.com", "baidu.com"));
- Assert.assertTrue(verifer.apply("http://test1.baidu.com", "baidu.com"));
- Assert.assertTrue(verifer.apply("http://test2.baidu.com", "baidu.com"));
- Assert.assertFalse(verifer.apply("http://baidu2.com", "baidu.com"));
- Assert.assertTrue(verifer.apply("http://baidu.com", ""));
- Assert.assertTrue(verifer.apply("baidu.com", "baidu.com"));
- Assert.assertTrue(verifer.apply("http://baidu.com/test", "baidu.com"));
- Assert.assertTrue(verifer.apply("baidu.com/test/abc", "baidu.com"));
- Assert.assertFalse(verifer.apply("baidu.com.sina.com", "baidu.com"));
+ Assert.assertTrue(verifer.apply("http://apache.com", "apache.com"));
+ Assert.assertTrue(verifer.apply("http://test1.apache.com", "apache.com"));
+ Assert.assertTrue(verifer.apply("http://test2.apache.com", "apache.com"));
+ Assert.assertFalse(verifer.apply("http://apache2.com", "apache.com"));
+ Assert.assertTrue(verifer.apply("http://apache.com", ""));
+ Assert.assertTrue(verifer.apply("apache.com", "apache.com"));
+ Assert.assertTrue(verifer.apply("http://apache.com/test", "apache.com"));
+ Assert.assertTrue(verifer.apply("apache.com/test/abc", "apache.com"));
+ Assert.assertFalse(verifer.apply("apache.com.sina.com", "apache.com"));
}
@Test
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/rest/RestResultTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestResultTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/rest/RestResultTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestResultTest.java
index 02832fd..f7db21b 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/rest/RestResultTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/rest/RestResultTest.java
@@ -17,10 +17,12 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.rest;
+package org.apache.hugegraph.unit.rest;
import java.util.Map;
+import org.apache.hugegraph.rest.RestResult;
+import org.apache.hugegraph.rest.SerializeException;
import jakarta.ws.rs.core.MultivaluedHashMap;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
@@ -28,9 +30,7 @@ import org.glassfish.jersey.internal.util.collection.ImmutableMultivaluedMap;
import org.junit.Test;
import org.mockito.Mockito;
-import com.baidu.hugegraph.rest.RestResult;
-import com.baidu.hugegraph.rest.SerializeException;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.testutil.Assert;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/BytesTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/BytesTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/BytesTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/BytesTest.java
index c3d2cb1..526cf5b 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/BytesTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/BytesTest.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.Bytes;
+import org.apache.hugegraph.util.NumericUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.Bytes;
-import com.baidu.hugegraph.util.NumericUtil;
+import org.apache.hugegraph.testutil.Assert;
public class BytesTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/CollectionUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/CollectionUtilTest.java
similarity index 99%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/CollectionUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/CollectionUtilTest.java
index 72fc01e..1ea5fff 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/CollectionUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/CollectionUtilTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,11 +29,11 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.CollectionUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.CollectionUtil;
+import org.apache.hugegraph.testutil.Assert;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/DateUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/DateUtilTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/DateUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/DateUtilTest.java
index 5a6e54c..1f6e946 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/DateUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/DateUtilTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.util.ArrayList;
import java.util.Date;
@@ -25,11 +25,11 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hugegraph.util.DateUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.DateUtil;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class DateUtilTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/EcheckTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/EcheckTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/EcheckTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/EcheckTest.java
index 46b9113..9bbbb48 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/EcheckTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/EcheckTest.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
+import org.apache.hugegraph.util.E;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/HashUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/HashUtilTest.java
similarity index 94%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/HashUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/HashUtilTest.java
index ada7842..05cd9a9 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/HashUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/HashUtilTest.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
+import org.apache.hugegraph.util.Bytes;
+import org.apache.hugegraph.util.HashUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.Bytes;
-import com.baidu.hugegraph.util.HashUtil;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class HashUtilTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/InsertionOrderUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/InsertionOrderUtilTest.java
similarity index 96%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/InsertionOrderUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/InsertionOrderUtilTest.java
index a8d9fa5..0880dfb 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/InsertionOrderUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/InsertionOrderUtilTest.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.InsertionOrderUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.InsertionOrderUtil;
+import org.apache.hugegraph.testutil.Assert;
import com.google.common.collect.ImmutableList;
public class InsertionOrderUtilTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/LogTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/LogTest.java
similarity index 79%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/LogTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/LogTest.java
index 9afe842..a6dd8a1 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/LogTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/LogTest.java
@@ -17,28 +17,28 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.Log;
import org.junit.Test;
import org.slf4j.Logger;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.testutil.Assert;
public class LogTest extends BaseUnitTest {
@Test
public void testLog() {
Logger log1 = Log.logger(LogTest.class);
- Logger log2 = Log.logger("com.baidu.hugegraph.unit.util.LogTest");
+ Logger log2 = Log.logger("org.apache.hugegraph.unit.util.LogTest");
Logger log3 = Log.logger("test");
Assert.assertEquals(log1, log2);
Assert.assertNotEquals(log1, log3);
log1.info("Info: testLog({})", LogTest.class);
- log2.info("Info: testLog({})", "com.baidu.hugegraph.unit.util.LogTest");
+ log2.info("Info: testLog({})", "org.apache.hugegraph.unit.util.LogTest");
log3.info("Info: testLog({})", "test");
}
}
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/LongEncodingTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/LongEncodingTest.java
similarity index 98%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/LongEncodingTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/LongEncodingTest.java
index 5a245a3..654df9e 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/LongEncodingTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/LongEncodingTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.math.BigDecimal;
import java.text.ParseException;
@@ -26,13 +26,13 @@ import java.util.Date;
import java.util.Random;
import java.util.TimeZone;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.Bytes;
+import org.apache.hugegraph.util.LongEncoding;
+import org.apache.hugegraph.util.NumericUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.Bytes;
-import com.baidu.hugegraph.util.LongEncoding;
-import com.baidu.hugegraph.util.NumericUtil;
+import org.apache.hugegraph.testutil.Assert;
public class LongEncodingTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/NumericUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/NumericUtilTest.java
similarity index 98%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/NumericUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/NumericUtilTest.java
index 00e70ad..ff4ae4a 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/NumericUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/NumericUtilTest.java
@@ -17,17 +17,17 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.math.BigDecimal;
import java.util.Date;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.Bytes;
+import org.apache.hugegraph.util.NumericUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.Bytes;
-import com.baidu.hugegraph.util.NumericUtil;
+import org.apache.hugegraph.testutil.Assert;
public class NumericUtilTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/OrderLimitMapTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/OrderLimitMapTest.java
similarity index 98%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/OrderLimitMapTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/OrderLimitMapTest.java
index 75137d5..1392f18 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/OrderLimitMapTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/OrderLimitMapTest.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.util.Map;
+import org.apache.hugegraph.util.OrderLimitMap;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.util.OrderLimitMap;
+import org.apache.hugegraph.testutil.Assert;
import com.google.common.collect.ImmutableList;
public class OrderLimitMapTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/ReflectionUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/ReflectionUtilTest.java
similarity index 77%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/ReflectionUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/ReflectionUtilTest.java
index 7031a44..d4413ce 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/ReflectionUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/ReflectionUtilTest.java
@@ -17,25 +17,25 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.List;
+import org.apache.hugegraph.perf.PerfUtil;
+import org.apache.hugegraph.unit.BaseUnitTest;
+import org.apache.hugegraph.util.ReflectionUtil;
import org.apache.commons.collections.IteratorUtils;
import org.junit.Test;
-import com.baidu.hugegraph.perf.PerfUtil.Watched;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass.Bar;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass.Base;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass.Foo;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass.ManuallyProfile;
-import com.baidu.hugegraph.unit.perf.testclass.TestClass.Sub;
-import com.baidu.hugegraph.util.ReflectionUtil;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.perf.testclass.TestClass;
+import org.apache.hugegraph.unit.perf.testclass.TestClass.Bar;
+import org.apache.hugegraph.unit.perf.testclass.TestClass.Base;
+import org.apache.hugegraph.unit.perf.testclass.TestClass.Foo;
+import org.apache.hugegraph.unit.perf.testclass.TestClass.ManuallyProfile;
+import org.apache.hugegraph.unit.perf.testclass.TestClass.Sub;
import com.google.common.reflect.ClassPath.ClassInfo;
import javassist.NotFoundException;
@@ -72,7 +72,7 @@ public class ReflectionUtilTest extends BaseUnitTest {
List<Method> methods;
methods = ReflectionUtil.getMethodsAnnotatedWith(Sub.class,
- Watched.class,
+ PerfUtil.Watched.class,
false);
methods.sort((m1, m2) -> m1.getName().compareTo(m2.getName()));
Assert.assertEquals(2, methods.size());
@@ -81,7 +81,7 @@ public class ReflectionUtilTest extends BaseUnitTest {
methods = ReflectionUtil.getMethodsAnnotatedWith(Sub.class,
- Watched.class,
+ PerfUtil.Watched.class,
true);
methods.sort((m1, m2) -> m1.getName().compareTo(m2.getName()));
Assert.assertEquals(3, methods.size());
@@ -94,16 +94,16 @@ public class ReflectionUtilTest extends BaseUnitTest {
public void testClasses() throws IOException {
@SuppressWarnings("unchecked")
List<ClassInfo> classes = IteratorUtils.toList(ReflectionUtil.classes(
- "com.baidu.hugegraph.util"));
+ "org.apache.hugegraph.util"));
Assert.assertEquals(17, classes.size());
classes.sort((c1, c2) -> c1.getName().compareTo(c2.getName()));
- Assert.assertEquals("com.baidu.hugegraph.util.Bytes",
+ Assert.assertEquals("org.apache.hugegraph.util.Bytes",
classes.get(0).getName());
- Assert.assertEquals("com.baidu.hugegraph.util.CheckSocket",
+ Assert.assertEquals("org.apache.hugegraph.util.CheckSocket",
classes.get(1).getName());
- Assert.assertEquals("com.baidu.hugegraph.util.CollectionUtil",
+ Assert.assertEquals("org.apache.hugegraph.util.CollectionUtil",
classes.get(2).getName());
- Assert.assertEquals("com.baidu.hugegraph.util.VersionUtil",
+ Assert.assertEquals("org.apache.hugegraph.util.VersionUtil",
classes.get(16).getName());
}
@@ -131,20 +131,20 @@ public class ReflectionUtilTest extends BaseUnitTest {
@Test
public void testPackageName() {
- String clazz = "com.baidu.hugegraph.unit.perf.testclass2.Test";
- Assert.assertEquals("com.baidu.hugegraph.unit.perf.testclass2",
+ String clazz = "org.apache.hugegraph.unit.perf.testclass2.Test";
+ Assert.assertEquals("org.apache.hugegraph.unit.perf.testclass2",
ReflectionUtil.packageName(clazz));
- clazz = "com.baidu.hugegraph.unit.perf.testclass2.Test$Bar";
- Assert.assertEquals("com.baidu.hugegraph.unit.perf.testclass2",
+ clazz = "org.apache.hugegraph.unit.perf.testclass2.Test$Bar";
+ Assert.assertEquals("org.apache.hugegraph.unit.perf.testclass2",
ReflectionUtil.packageName(clazz));
- clazz = "com.baidu.hugegraph.unit.perf.testclass.Test$Bar";
- Assert.assertEquals("com.baidu.hugegraph.unit.perf.testclass",
+ clazz = "org.apache.hugegraph.unit.perf.testclass.Test$Bar";
+ Assert.assertEquals("org.apache.hugegraph.unit.perf.testclass",
ReflectionUtil.packageName(clazz));
- clazz = "com.baidu.hugegraph.unit.perf.testclass..Test$Bar";
- Assert.assertEquals("com.baidu.hugegraph.unit.perf.testclass.",
+ clazz = "org.apache.hugegraph.unit.perf.testclass..Test$Bar";
+ Assert.assertEquals("org.apache.hugegraph.unit.perf.testclass.",
ReflectionUtil.packageName(clazz));
clazz = "com";
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/StringUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/StringUtilTest.java
similarity index 78%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/StringUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/StringUtilTest.java
index 6840f7c..89de282 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/StringUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/StringUtilTest.java
@@ -17,16 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.util.ArrayList;
import java.util.List;
+import org.apache.hugegraph.util.StringUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.util.StringUtil;
-import com.baidu.hugegraph.util.StringUtil.Chars;
+import org.apache.hugegraph.testutil.Assert;
import com.google.common.base.Splitter;
public class StringUtilTest {
@@ -64,18 +63,18 @@ public class StringUtilTest {
@Test
public void testSplitToCharsArray() {
- Assert.assertArrayEquals(Chars.of("1", "2", "3"),
+ Assert.assertArrayEquals(StringUtil.Chars.of("1", "2", "3"),
StringUtil.splitToCharsArray("1, 2, 3", ", "));
- Assert.assertArrayEquals(Chars.of("1", "1", "1"),
+ Assert.assertArrayEquals(StringUtil.Chars.of("1", "1", "1"),
StringUtil.splitToCharsArray("1 1 1", " "));
- Assert.assertArrayEquals(Chars.of("", "", ""),
+ Assert.assertArrayEquals(StringUtil.Chars.of("", "", ""),
StringUtil.splitToCharsArray("111", "1"));
- Assert.assertArrayEquals(new Chars[]{Chars.of("123")},
+ Assert.assertArrayEquals(new StringUtil.Chars[]{StringUtil.Chars.of("123")},
StringUtil.splitToCharsArray("123", " "));
- Assert.assertArrayEquals(Chars.of("1", "", "2", "3"),
+ Assert.assertArrayEquals(StringUtil.Chars.of("1", "", "2", "3"),
StringUtil.splitToCharsArray("1::2:3", ":"));
- Assert.assertArrayEquals(Chars.of("1", "", "2", "", "3"),
+ Assert.assertArrayEquals(StringUtil.Chars.of("1", "", "2", "", "3"),
StringUtil.splitToCharsArray("1::2::3", ":"));
Assert.assertThrows(IllegalArgumentException.class, () -> {
@@ -85,7 +84,7 @@ public class StringUtilTest {
@Test
public void testCharsCharAt() {
- Chars chars = Chars.of("123");
+ StringUtil.Chars chars = StringUtil.Chars.of("123");
Assert.assertEquals('1', chars.charAt(0));
Assert.assertEquals('2', chars.charAt(1));
Assert.assertEquals('3', chars.charAt(2));
@@ -100,12 +99,12 @@ public class StringUtilTest {
@Test
public void testCharsSubSequence() {
- Chars chars = Chars.of("123");
- Assert.assertEquals(Chars.of("1"), chars.subSequence(0, 1));
- Assert.assertEquals(Chars.of("12"), chars.subSequence(0, 2));
- Assert.assertEquals(Chars.of("2"), chars.subSequence(1, 2));
- Assert.assertEquals(Chars.of("23"), chars.subSequence(1, 3));
- Assert.assertEquals(Chars.of("123"), chars.subSequence(0, 3));
+ StringUtil.Chars chars = StringUtil.Chars.of("123");
+ Assert.assertEquals(StringUtil.Chars.of("1"), chars.subSequence(0, 1));
+ Assert.assertEquals(StringUtil.Chars.of("12"), chars.subSequence(0, 2));
+ Assert.assertEquals(StringUtil.Chars.of("2"), chars.subSequence(1, 2));
+ Assert.assertEquals(StringUtil.Chars.of("23"), chars.subSequence(1, 3));
+ Assert.assertEquals(StringUtil.Chars.of("123"), chars.subSequence(0, 3));
Assert.assertThrows(IllegalArgumentException.class, () -> {
chars.subSequence(2, 1);
@@ -128,9 +127,9 @@ public class StringUtilTest {
@Test
public void testCharsEquals() {
- Chars chars1 = Chars.of("123");
- Chars chars2 = Chars.of("123");
- Chars chars3 = Chars.of("12");
+ StringUtil.Chars chars1 = StringUtil.Chars.of("123");
+ StringUtil.Chars chars2 = StringUtil.Chars.of("123");
+ StringUtil.Chars chars3 = StringUtil.Chars.of("12");
Assert.assertEquals(chars1, chars2);
Assert.assertNotEquals(chars1, chars3);
@@ -140,9 +139,9 @@ public class StringUtilTest {
@Test
public void testCharsHashCode() {
- Chars chars1 = Chars.of("123");
- Chars chars2 = Chars.of("123");
- Chars chars3 = Chars.of("12");
+ StringUtil.Chars chars1 = StringUtil.Chars.of("123");
+ StringUtil.Chars chars2 = StringUtil.Chars.of("123");
+ StringUtil.Chars chars3 = StringUtil.Chars.of("12");
Assert.assertEquals(chars1.hashCode(), chars2.hashCode());
Assert.assertEquals(chars1.hashCode(), "123".hashCode());
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/TimeUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/TimeUtilTest.java
similarity index 95%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/TimeUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/TimeUtilTest.java
index 13f831a..91e692d 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/TimeUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/TimeUtilTest.java
@@ -17,15 +17,15 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.util.Date;
+import org.apache.hugegraph.util.TimeUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.TimeUtil;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class TimeUtilTest extends BaseUnitTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/UnitUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/UnitUtilTest.java
similarity index 99%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/UnitUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/UnitUtilTest.java
index a7e31e9..7b255ec 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/UnitUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/UnitUtilTest.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
+import org.apache.hugegraph.util.Bytes;
+import org.apache.hugegraph.util.UnitUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.util.Bytes;
-import com.baidu.hugegraph.util.UnitUtil;
+import org.apache.hugegraph.testutil.Assert;
public class UnitUtilTest {
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/VersionUtilTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/VersionUtilTest.java
similarity index 89%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/VersionUtilTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/VersionUtilTest.java
index 9ee1862..6e9ff41 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/util/VersionUtilTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/util/VersionUtilTest.java
@@ -17,22 +17,21 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.util;
+package org.apache.hugegraph.unit.util;
import java.net.MalformedURLException;
+import org.apache.hugegraph.util.VersionUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.unit.BaseUnitTest;
-import com.baidu.hugegraph.util.VersionUtil;
-import com.baidu.hugegraph.util.VersionUtil.Version;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.unit.BaseUnitTest;
public class VersionUtilTest extends BaseUnitTest {
@Test
public void testVersionWithTwoPart() {
- Version version = Version.of("0.2");
+ VersionUtil.Version version = VersionUtil.Version.of("0.2");
Assert.assertTrue(VersionUtil.match(version, "0", "1"));
Assert.assertTrue(VersionUtil.match(version, "0.0", "1.0"));
@@ -53,7 +52,7 @@ public class VersionUtilTest extends BaseUnitTest {
@Test
public void testVersionWithThreePart() {
- Version version = Version.of("3.2.5");
+ VersionUtil.Version version = VersionUtil.Version.of("3.2.5");
Assert.assertTrue(VersionUtil.match(version, "2", "4"));
Assert.assertTrue(VersionUtil.match(version, "3", "4"));
@@ -94,7 +93,7 @@ public class VersionUtilTest extends BaseUnitTest {
@Test
public void testVersionCheck() {
- Version version = Version.of("0.6.5");
+ VersionUtil.Version version = VersionUtil.Version.of("0.6.5");
VersionUtil.check(version, "0.6", "0.7", "test-component");
VersionUtil.check(version, "0.6.5", "0.7", "test-component");
@@ -140,17 +139,17 @@ public class VersionUtilTest extends BaseUnitTest {
@Test
public void testVersion() {
// Test equals
- Version v1 = VersionUtil.Version.of("0.2.1");
- Version v2 = VersionUtil.Version.of("0.2.1");
+ VersionUtil.Version v1 = VersionUtil.Version.of("0.2.1");
+ VersionUtil.Version v2 = VersionUtil.Version.of("0.2.1");
Assert.assertEquals(v1, v1);
Assert.assertEquals(v1, v2);
- Version v3 = VersionUtil.Version.of("0.2.0");
- Version v4 = VersionUtil.Version.of("0.2");
+ VersionUtil.Version v3 = VersionUtil.Version.of("0.2.0");
+ VersionUtil.Version v4 = VersionUtil.Version.of("0.2");
Assert.assertEquals(v3, v4);
- Version v5 = VersionUtil.Version.of("0.2.3");
- Version v6 = VersionUtil.Version.of("0.3.2");
+ VersionUtil.Version v5 = VersionUtil.Version.of("0.2.3");
+ VersionUtil.Version v6 = VersionUtil.Version.of("0.3.2");
Assert.assertNotEquals(v5, v6);
Assert.assertNotEquals(v5, null);
Assert.assertNotEquals(v5, "0.2.3");
diff --git a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/version/VersionTest.java b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/version/VersionTest.java
similarity index 86%
rename from hugegraph-common/src/test/java/com/baidu/hugegraph/unit/version/VersionTest.java
rename to hugegraph-common/src/test/java/org/apache/hugegraph/unit/version/VersionTest.java
index 6d92e11..12e3c65 100644
--- a/hugegraph-common/src/test/java/com/baidu/hugegraph/unit/version/VersionTest.java
+++ b/hugegraph-common/src/test/java/org/apache/hugegraph/unit/version/VersionTest.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.unit.version;
+package org.apache.hugegraph.unit.version;
+import org.apache.hugegraph.util.VersionUtil;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.util.VersionUtil;
-import com.baidu.hugegraph.version.CommonVersion;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.version.CommonVersion;
public class VersionTest {
diff --git a/hugegraph-common/src/test/resources/log4j2.xml b/hugegraph-common/src/test/resources/log4j2.xml
index 7ef111d..15600fc 100644
--- a/hugegraph-common/src/test/resources/log4j2.xml
+++ b/hugegraph-common/src/test/resources/log4j2.xml
@@ -18,7 +18,7 @@
<appender-ref ref="console"/>
<appender-ref ref="file"/>
</root>
- <logger name="com.baidu.hugegraph" level="INFO" additivity="false">
+ <logger name="org.apache.hugegraph" level="INFO" additivity="false">
<appender-ref ref="console"/>
<appender-ref ref="file"/>
</logger>
diff --git a/hugegraph-rpc/pom.xml b/hugegraph-rpc/pom.xml
index 2c2d1c1..9bbd52d 100644
--- a/hugegraph-rpc/pom.xml
+++ b/hugegraph-rpc/pom.xml
@@ -21,9 +21,9 @@
<dependencies>
<!-- hugegraph-common -->
<dependency>
- <groupId>com.baidu.hugegraph</groupId>
+ <groupId>org.apache.hugegraph</groupId>
<artifactId>hugegraph-common</artifactId>
- <version>${project.version}</version>
+ <version>3.0.0</version>
</dependency>
<!-- sofa rpc -->
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/config/RpcOptions.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/config/RpcOptions.java
similarity index 94%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/config/RpcOptions.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/config/RpcOptions.java
index d58673c..782643e 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/config/RpcOptions.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/config/RpcOptions.java
@@ -17,11 +17,14 @@
* under the License.
*/
-package com.baidu.hugegraph.config;
+package org.apache.hugegraph.config;
-import static com.baidu.hugegraph.config.OptionChecker.allowValues;
-import static com.baidu.hugegraph.config.OptionChecker.disallowEmpty;
-import static com.baidu.hugegraph.config.OptionChecker.rangeInt;
+import org.apache.hugegraph.config.ConfigOption;
+import org.apache.hugegraph.config.OptionHolder;
+
+import static org.apache.hugegraph.config.OptionChecker.allowValues;
+import static org.apache.hugegraph.config.OptionChecker.disallowEmpty;
+import static org.apache.hugegraph.config.OptionChecker.rangeInt;
public class RpcOptions extends OptionHolder {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcClientProvider.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcClientProvider.java
similarity index 94%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcClientProvider.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcClientProvider.java
index 6f0eba5..b17191a 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcClientProvider.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcClientProvider.java
@@ -17,16 +17,16 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import com.alipay.sofa.rpc.common.utils.StringUtils;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.RpcOptions;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.config.RpcOptions;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.util.E;
public class RpcClientProvider {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcCommonConfig.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcCommonConfig.java
similarity index 92%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcCommonConfig.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcCommonConfig.java
index 4ee50b6..475a82a 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcCommonConfig.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcCommonConfig.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
import java.util.Map;
import com.alipay.sofa.rpc.common.RpcConfigs;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.RpcOptions;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.config.RpcOptions;
public class RpcCommonConfig {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcConsumerConfig.java
similarity index 98%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcConsumerConfig.java
index c9b28f9..f2c9b92 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcConsumerConfig.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
import java.util.ArrayList;
import java.util.List;
@@ -38,9 +38,9 @@ import com.alipay.sofa.rpc.core.request.SofaRequest;
import com.alipay.sofa.rpc.core.response.SofaResponse;
import com.alipay.sofa.rpc.ext.Extension;
import com.alipay.sofa.rpc.ext.ExtensionLoaderFactory;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.RpcOptions;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.config.RpcOptions;
+import org.apache.hugegraph.util.Log;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcException.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcException.java
similarity index 97%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcException.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcException.java
index 2a2675c..6fc2f24 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcException.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
public class RpcException extends RuntimeException {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcProviderConfig.java
similarity index 97%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcProviderConfig.java
index 8bf0aea..bc6d322 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcProviderConfig.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
import java.util.Map;
import com.alipay.sofa.rpc.config.ProviderConfig;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.util.E;
import com.google.common.collect.Maps;
public class RpcProviderConfig implements RpcServiceConfig4Server {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServer.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServer.java
similarity index 95%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServer.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServer.java
index a7e0ba9..0807e56 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServer.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServer.java
@@ -17,10 +17,11 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
import java.util.Map;
+import org.apache.hugegraph.config.RpcOptions;
import org.apache.commons.collections.MapUtils;
import org.slf4j.Logger;
@@ -30,11 +31,10 @@ import com.alipay.sofa.rpc.config.ProviderConfig;
import com.alipay.sofa.rpc.config.ServerConfig;
import com.alipay.sofa.rpc.server.Server;
import com.alipay.sofa.rpc.server.bolt.BoltServer;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.RpcOptions;
-import com.baidu.hugegraph.testutil.Whitebox;
-import com.baidu.hugegraph.util.E;
-import com.baidu.hugegraph.util.Log;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.testutil.Whitebox;
+import org.apache.hugegraph.util.E;
+import org.apache.hugegraph.util.Log;
public class RpcServer {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Client.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Client.java
similarity index 97%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Client.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Client.java
index 13cfca9..51b59c4 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Client.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Client.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
public interface RpcServiceConfig4Client {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Server.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Server.java
similarity index 97%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Server.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Server.java
index 7139073..9c0a0e5 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/rpc/RpcServiceConfig4Server.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/rpc/RpcServiceConfig4Server.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.rpc;
+package org.apache.hugegraph.rpc;
public interface RpcServiceConfig4Server {
diff --git a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/version/RpcVersion.java b/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
similarity index 87%
rename from hugegraph-rpc/src/main/java/com/baidu/hugegraph/version/RpcVersion.java
rename to hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
index 5faee27..97bd509 100644
--- a/hugegraph-rpc/src/main/java/com/baidu/hugegraph/version/RpcVersion.java
+++ b/hugegraph-rpc/src/main/java/org/apache/hugegraph/version/RpcVersion.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package com.baidu.hugegraph.version;
+package org.apache.hugegraph.version;
-import com.baidu.hugegraph.util.VersionUtil.Version;
+import org.apache.hugegraph.util.VersionUtil.Version;
public class RpcVersion {
@@ -27,5 +27,5 @@ public class RpcVersion {
// The second parameter of Version.of() is for all-in-one JAR
public static final Version VERSION = Version.of(RpcVersion.class,
- "2.1.2");
+ "3.0.0");
}
diff --git a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java
similarity index 86%
rename from hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java
rename to hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java
index cdbdb03..9d1e0d7 100644
--- a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/BaseUnitTest.java
+++ b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/BaseUnitTest.java
@@ -17,21 +17,21 @@
* under the License.
*/
-package com.baidu.hugegraph.unit;
+package org.apache.hugegraph.unit;
import java.net.URL;
import org.junit.BeforeClass;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.config.OptionSpace;
-import com.baidu.hugegraph.rpc.RpcServer;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.config.OptionSpace;
+import org.apache.hugegraph.rpc.RpcServer;
public class BaseUnitTest {
@BeforeClass
public static void initEnv() {
- OptionSpace.register("rpc", "com.baidu.hugegraph.config.RpcOptions");
+ OptionSpace.register("rpc", "org.apache.hugegraph.config.RpcOptions");
}
protected static HugeConfig config(boolean server) {
diff --git a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/ExceptionTest.java b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/ExceptionTest.java
similarity index 93%
rename from hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/ExceptionTest.java
rename to hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/ExceptionTest.java
index ade2198..9ca812a 100644
--- a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/ExceptionTest.java
+++ b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/ExceptionTest.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package com.baidu.hugegraph.unit;
+package org.apache.hugegraph.unit;
import org.junit.Test;
-import com.baidu.hugegraph.rpc.RpcException;
-import com.baidu.hugegraph.testutil.Assert;
+import org.apache.hugegraph.rpc.RpcException;
+import org.apache.hugegraph.testutil.Assert;
public class ExceptionTest {
diff --git a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/ServerClientTest.java b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/ServerClientTest.java
similarity index 97%
rename from hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/ServerClientTest.java
rename to hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/ServerClientTest.java
index 28fe564..590749e 100644
--- a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/ServerClientTest.java
+++ b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/ServerClientTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package com.baidu.hugegraph.unit;
+package org.apache.hugegraph.unit;
import java.io.IOException;
import java.net.InetAddress;
@@ -31,15 +31,15 @@ import org.junit.Test;
import com.alipay.sofa.rpc.common.RpcOptions;
import com.alipay.sofa.rpc.core.exception.SofaRpcException;
import com.alipay.sofa.rpc.core.exception.SofaRpcRuntimeException;
-import com.baidu.hugegraph.config.HugeConfig;
-import com.baidu.hugegraph.rpc.RpcClientProvider;
-import com.baidu.hugegraph.rpc.RpcCommonConfig;
-import com.baidu.hugegraph.rpc.RpcConsumerConfig;
-import com.baidu.hugegraph.rpc.RpcProviderConfig;
-import com.baidu.hugegraph.rpc.RpcServer;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.testutil.Whitebox;
-import com.baidu.hugegraph.util.E;
+import org.apache.hugegraph.config.HugeConfig;
+import org.apache.hugegraph.rpc.RpcClientProvider;
+import org.apache.hugegraph.rpc.RpcCommonConfig;
+import org.apache.hugegraph.rpc.RpcConsumerConfig;
+import org.apache.hugegraph.rpc.RpcProviderConfig;
+import org.apache.hugegraph.rpc.RpcServer;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.testutil.Whitebox;
+import org.apache.hugegraph.util.E;
import com.google.common.collect.ImmutableMap;
public class ServerClientTest extends BaseUnitTest {
@@ -147,8 +147,7 @@ public class ServerClientTest extends BaseUnitTest {
// Init client
HugeConfig config = config(false);
String url = rpcServerRandom.host() + ":" + rpcServerRandom.port();
- String remoteUrlKey = com.baidu.hugegraph.config
- .RpcOptions.RPC_REMOTE_URL.name();
+ String remoteUrlKey = org.apache.hugegraph.config.RpcOptions.RPC_REMOTE_URL.name();
config.setProperty(remoteUrlKey, url);
RpcClientProvider rpcClientRandom = new RpcClientProvider(config);
@@ -186,8 +185,7 @@ public class ServerClientTest extends BaseUnitTest {
// Init client
HugeConfig config = config(false);
String url = rpcServerAdaptive.host() + ":" + rpcServerAdaptive.port();
- String remoteUrlKey = com.baidu.hugegraph.config
- .RpcOptions.RPC_REMOTE_URL.name();
+ String remoteUrlKey = org.apache.hugegraph.config.RpcOptions.RPC_REMOTE_URL.name();
config.setProperty(remoteUrlKey, url);
RpcClientProvider rpcClientAdaptive = new RpcClientProvider(config);
@@ -458,8 +456,7 @@ public class ServerClientTest extends BaseUnitTest {
s5g1.resetResult();
// Test LB "roundRobin"
- String lbKey = com.baidu.hugegraph.config
- .RpcOptions.RPC_CLIENT_LOAD_BALANCER.name();
+ String lbKey = org.apache.hugegraph.config.RpcOptions.RPC_CLIENT_LOAD_BALANCER.name();
clientLB.setProperty(lbKey, "roundRobin");
RpcClientProvider rpcClientRound = new RpcClientProvider(clientLB);
HelloService round = rpcClientRound.config()
diff --git a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
similarity index 96%
rename from hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java
rename to hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/UnitTestSuite.java
index 7944660..ed42295 100644
--- a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/UnitTestSuite.java
+++ b/hugegraph-rpc/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-rpc/src/test/java/com/baidu/hugegraph/unit/VersionTest.java b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/VersionTest.java
similarity index 87%
rename from hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/VersionTest.java
rename to hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/VersionTest.java
index 1430bda..fae9fb8 100644
--- a/hugegraph-rpc/src/test/java/com/baidu/hugegraph/unit/VersionTest.java
+++ b/hugegraph-rpc/src/test/java/org/apache/hugegraph/unit/VersionTest.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package com.baidu.hugegraph.unit;
+package org.apache.hugegraph.unit;
import org.junit.Test;
-import com.baidu.hugegraph.testutil.Assert;
-import com.baidu.hugegraph.util.VersionUtil;
-import com.baidu.hugegraph.version.RpcVersion;
+import org.apache.hugegraph.testutil.Assert;
+import org.apache.hugegraph.util.VersionUtil;
+import org.apache.hugegraph.version.RpcVersion;
public class VersionTest {
diff --git a/hugegraph-rpc/src/test/resources/log4j2.xml b/hugegraph-rpc/src/test/resources/log4j2.xml
index f69acfd..033c5b8 100644
--- a/hugegraph-rpc/src/test/resources/log4j2.xml
+++ b/hugegraph-rpc/src/test/resources/log4j2.xml
@@ -18,7 +18,7 @@
<appender-ref ref="console"/>
<appender-ref ref="file"/>
</root>
- <logger name="com.baidu.hugegraph" level="INFO" additivity="false">
+ <logger name="org.apache.hugegraph" level="INFO" additivity="false">
<appender-ref ref="console"/>
<appender-ref ref="file"/>
</logger>
diff --git a/pom.xml b/pom.xml
index 2a5c1e9..738d636 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
</scm>
<properties>
- <revision>2.1.2</revision>
+ <revision>3.0.0</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<top.level.dir>${project.basedir}/..</top.level.dir>
<compiler.source>1.8</compiler.source>
diff --git a/style/checkstyle.xml b/style/checkstyle.xml
index c242928..8c5c317 100644
--- a/style/checkstyle.xml
+++ b/style/checkstyle.xml
@@ -24,16 +24,6 @@
<property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
<message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
</module>
- <!-- <module name="ImportOrder">-->
- <!-- <property name="staticGroups"-->
- <!-- value="org.apache,java,javax,org,com,com.baidu.hugegraph"/>-->
- <!-- <property name="separatedStaticGroups" value="true"/>-->
- <!-- <property name="groups" value="org.apache,java,javax,org,com,com.baidu.hugegraph"/>-->
- <!-- <property name="ordered" value="true"/>-->
- <!-- <property name="separated" value="true"/>-->
- <!-- <property name="option" value="top"/>-->
- <!-- <property name="sortStaticImportsAlphabetically" value="true"/>-->
- <!-- </module>-->
<module name="AvoidStarImport"/>
<module name="RedundantImport"/>
<module name="RedundantModifier"/>