This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 5602c51 [UTILS] Move ReflectionUtils to bookkeeper-common module
5602c51 is described below
commit 5602c51192483075686746afb84c3449a470a98d
Author: Sijie Guo <[email protected]>
AuthorDate: Tue Nov 27 22:58:12 2018 -0800
[UTILS] Move ReflectionUtils to bookkeeper-common module
Descriptions of the changes in this PR:
*Motivation*
RefelectionUtils contains helpers for loading classes from relections.
It is useful across the project. However the class is in
`bookkeeper-server` module only.
*Changes*
Move this class to `bookkeeper-common` module
Reviewers: Jia Zhai <None>
This closes #1841 from sijie/move_reflection_utils
---
.../main/java/org/apache/bookkeeper/common}/util/ReflectionUtils.java | 4 +---
.../java/org/apache/bookkeeper/common}/util/TestReflectionUtils.java | 4 ++--
.../java/org/apache/bookkeeper/auth/AuthProviderFactoryFactory.java | 3 +--
.../main/java/org/apache/bookkeeper/bookie/LedgerStorageFactory.java | 2 +-
.../src/main/java/org/apache/bookkeeper/client/BookKeeper.java | 2 +-
.../bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java | 2 +-
.../main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java | 2 +-
.../src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java | 2 +-
.../src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java | 2 +-
.../org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java | 2 +-
.../src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java | 2 +-
.../main/java/org/apache/bookkeeper/metastore/MetastoreFactory.java | 2 +-
.../apache/bookkeeper/server/component/ServerLifecycleComponent.java | 2 +-
.../org/apache/bookkeeper/server/service/StatsProviderService.java | 2 +-
.../org/apache/bookkeeper/tls/SecurityProviderFactoryFactory.java | 2 +-
.../src/main/java/org/apache/bookkeeper/util/EntryFormatter.java | 1 +
.../src/main/java/org/apache/bookkeeper/util/LedgerIdFormatter.java | 1 +
.../java/org/apache/distributedlog/DistributedLogConfiguration.java | 2 +-
.../org/apache/distributedlog/namespace/NamespaceDriverManager.java | 2 +-
.../core/src/main/java/org/apache/distributedlog/tools/Tool.java | 2 +-
.../java/org/apache/distributedlog/tools/TestDistributedLogTool.java | 2 +-
.../bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java | 2 +-
22 files changed, 23 insertions(+), 24 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ReflectionUtils.java
b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/ReflectionUtils.java
similarity index 99%
rename from
bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ReflectionUtils.java
rename to
bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/ReflectionUtils.java
index 6297651..64cf34b 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ReflectionUtils.java
+++
b/bookkeeper-common/src/main/java/org/apache/bookkeeper/common/util/ReflectionUtils.java
@@ -1,5 +1,4 @@
/*
- *
* 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
@@ -16,9 +15,8 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-package org.apache.bookkeeper.util;
+package org.apache.bookkeeper.common.util;
import java.lang.reflect.Constructor;
import java.util.Map;
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestReflectionUtils.java
b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestReflectionUtils.java
similarity index 95%
rename from
bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestReflectionUtils.java
rename to
bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestReflectionUtils.java
index 6171239..dd1535f 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/TestReflectionUtils.java
+++
b/bookkeeper-common/src/test/java/org/apache/bookkeeper/common/util/TestReflectionUtils.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.bookkeeper.util;
+package org.apache.bookkeeper.common.util;
-import static org.apache.bookkeeper.util.ReflectionUtils.forName;
+import static org.apache.bookkeeper.common.util.ReflectionUtils.forName;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/auth/AuthProviderFactoryFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/auth/AuthProviderFactoryFactory.java
index c5906fe..b121a05 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/auth/AuthProviderFactoryFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/auth/AuthProviderFactoryFactory.java
@@ -22,12 +22,11 @@ package org.apache.bookkeeper.auth;
import java.io.IOException;
import org.apache.bookkeeper.client.BKException;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.proto.BookieConnectionPeer;
import org.apache.bookkeeper.proto.ClientConnectionPeer;
-import org.apache.bookkeeper.util.ReflectionUtils;
-
/**
* A factory to manage the authentication provider factories.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageFactory.java
index 6a9d0c4..82d7aad 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageFactory.java
@@ -22,7 +22,7 @@ package org.apache.bookkeeper.bookie;
import java.io.IOException;
-import org.apache.bookkeeper.util.ReflectionUtils;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
/**
* A factory that creates {@link LedgerStorage} by reflection.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
index 72edf51..a3c4007 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeper.java
@@ -58,6 +58,7 @@ import org.apache.bookkeeper.client.api.OpenBuilder;
import org.apache.bookkeeper.client.api.WriteFlag;
import org.apache.bookkeeper.common.util.OrderedExecutor;
import org.apache.bookkeeper.common.util.OrderedScheduler;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.feature.FeatureProvider;
@@ -77,7 +78,6 @@ import org.apache.bookkeeper.proto.BookieClientImpl;
import org.apache.bookkeeper.proto.DataFormats;
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.bookkeeper.util.SafeRunnable;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang.SystemUtils;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
index 9c0feb7..155229a 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
@@ -48,6 +48,7 @@ import org.apache.bookkeeper.bookie.BookKeeperServerStats;
import org.apache.bookkeeper.client.BKException.BKNotEnoughBookiesException;
import org.apache.bookkeeper.client.BookieInfoReader.BookieInfo;
import org.apache.bookkeeper.client.WeightedRandomSelection.WeightedObject;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.Configurable;
import org.apache.bookkeeper.feature.FeatureProvider;
@@ -62,7 +63,6 @@ import org.apache.bookkeeper.net.ScriptBasedMapping;
import org.apache.bookkeeper.net.StabilizeNetworkTopology;
import org.apache.bookkeeper.stats.OpStatsLogger;
import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
index a3c47ab..e395cb3 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/AbstractConfiguration.java
@@ -30,6 +30,7 @@ import javax.net.ssl.SSLEngine;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.common.util.JsonUtil;
import org.apache.bookkeeper.common.util.JsonUtil.ParseJsonException;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.feature.Feature;
import org.apache.bookkeeper.meta.AbstractZkLedgerManagerFactory;
import org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory;
@@ -37,7 +38,6 @@ import org.apache.bookkeeper.meta.LedgerManagerFactory;
import org.apache.bookkeeper.meta.LongHierarchicalLedgerManagerFactory;
import org.apache.bookkeeper.util.EntryFormatter;
import org.apache.bookkeeper.util.LedgerIdFormatter;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.bookkeeper.util.StringEntryFormatter;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.ConfigurationException;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
index c902db8..86ec444 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
@@ -26,10 +26,10 @@ import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.apache.bookkeeper.client.EnsemblePlacementPolicy;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.RackawareEnsemblePlacementPolicy;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.discover.RegistrationClient;
import org.apache.bookkeeper.discover.ZKRegistrationClient;
import org.apache.bookkeeper.replication.Auditor;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.commons.configuration.ConfigurationException;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
index e9c551e..afcfadc 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
@@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.bookie.InterleavedLedgerStorage;
import org.apache.bookkeeper.bookie.LedgerStorage;
import org.apache.bookkeeper.bookie.SortedLedgerStorage;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.discover.ZKRegistrationManager;
import org.apache.bookkeeper.stats.NullStatsProvider;
import org.apache.bookkeeper.stats.StatsProvider;
import org.apache.bookkeeper.util.BookKeeperConstants;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.commons.configuration.ConfigurationException;
/**
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
index 42ec734..72bc3e8 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManagerFactory.java
@@ -22,10 +22,10 @@ import java.net.URI;
import java.util.List;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.apache.bookkeeper.meta.LayoutManager.LedgerLayoutExistsException;
import org.apache.bookkeeper.meta.zk.ZKMetadataDriverBase;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZKUtil;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
index bab6d84..44c25df 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MetadataDrivers.java
@@ -37,13 +37,13 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.meta.exceptions.Code;
import org.apache.bookkeeper.meta.exceptions.MetadataException;
import org.apache.bookkeeper.stats.NullStatsLogger;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.lang3.StringUtils;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/MetastoreFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/MetastoreFactory.java
index 92f2ead..847d209 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/MetastoreFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/metastore/MetastoreFactory.java
@@ -17,7 +17,7 @@
*/
package org.apache.bookkeeper.metastore;
-import org.apache.bookkeeper.util.ReflectionUtils;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
/**
* Metastore Factory.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/component/ServerLifecycleComponent.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/component/ServerLifecycleComponent.java
index 281bb7d..cc8ee6e 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/component/ServerLifecycleComponent.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/component/ServerLifecycleComponent.java
@@ -26,9 +26,9 @@ import lombok.experimental.PackagePrivate;
import org.apache.bookkeeper.common.annotation.InterfaceStability.Evolving;
import org.apache.bookkeeper.common.component.AbstractLifecycleComponent;
import org.apache.bookkeeper.common.component.LifecycleComponent;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.server.conf.BookieConfiguration;
import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.util.ReflectionUtils;
/**
* A {@link LifecycleComponent} that runs on a bookie server. It can be loaded
via reflections.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/StatsProviderService.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/StatsProviderService.java
index ab5d894..ad734af 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/StatsProviderService.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/service/StatsProviderService.java
@@ -19,11 +19,11 @@
package org.apache.bookkeeper.server.service;
import java.io.IOException;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.server.component.ServerLifecycleComponent;
import org.apache.bookkeeper.server.conf.BookieConfiguration;
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.stats.StatsProvider;
-import org.apache.bookkeeper.util.ReflectionUtils;
/**
* A {@link org.apache.bookkeeper.common.component.LifecycleComponent} that
runs stats provider.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/SecurityProviderFactoryFactory.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/SecurityProviderFactoryFactory.java
index a6dad0b..6eb2c94 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/SecurityProviderFactoryFactory.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/SecurityProviderFactoryFactory.java
@@ -17,7 +17,7 @@
*/
package org.apache.bookkeeper.tls;
-import org.apache.bookkeeper.util.ReflectionUtils;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java
index c24e375..4f2a3c3 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/EntryFormatter.java
@@ -21,6 +21,7 @@
package org.apache.bookkeeper.util;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerIdFormatter.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerIdFormatter.java
index f037f6d..8f676ff 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerIdFormatter.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/LedgerIdFormatter.java
@@ -23,6 +23,7 @@ package org.apache.bookkeeper.util;
import java.util.UUID;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.AbstractConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/DistributedLogConfiguration.java
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/DistributedLogConfiguration.java
index 4052f4d..7a71ba8 100644
---
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/DistributedLogConfiguration.java
+++
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/DistributedLogConfiguration.java
@@ -25,11 +25,11 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Set;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.feature.FeatureProvider;
import org.apache.bookkeeper.net.DNSToSwitchMapping;
import org.apache.bookkeeper.stats.StatsLogger;
-import org.apache.bookkeeper.util.ReflectionUtils;
import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
diff --git
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
index b35de8f..67b54a9 100644
---
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
+++
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/namespace/NamespaceDriverManager.java
@@ -26,7 +26,7 @@ import java.net.URI;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.bookkeeper.util.ReflectionUtils;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.distributedlog.DistributedLogConstants;
import org.apache.distributedlog.impl.BKNamespaceDriver;
diff --git
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
index bc5603c..31395ca 100644
---
a/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
+++
b/stream/distributedlog/core/src/main/java/org/apache/distributedlog/tools/Tool.java
@@ -19,7 +19,7 @@ package org.apache.distributedlog.tools;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.bookkeeper.util.ReflectionUtils;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
diff --git
a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
index 753f23a..553e017 100644
---
a/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
+++
b/stream/distributedlog/core/src/test/java/org/apache/distributedlog/tools/TestDistributedLogTool.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
import java.net.URI;
import org.apache.bookkeeper.client.BKException.BKNoSuchLedgerExistsException;
-import org.apache.bookkeeper.util.ReflectionUtils;
+import org.apache.bookkeeper.common.util.ReflectionUtils;
import org.apache.distributedlog.DLMTestUtil;
import org.apache.distributedlog.DLSN;
import org.apache.distributedlog.DistributedLogConfiguration;
diff --git
a/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
b/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
index c4519df..6432c30 100644
---
a/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
+++
b/tests/shaded/distributedlog-core-shaded-test/src/test/java/org/apache/bookkeeper/tests/shaded/DistributedLogCoreShadedJarTest.java
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import dlshade.org.apache.bookkeeper.common.util.ReflectionUtils;
import dlshade.org.apache.bookkeeper.conf.AbstractConfiguration;
import dlshade.org.apache.bookkeeper.conf.ServerConfiguration;
import dlshade.org.apache.bookkeeper.meta.AbstractZkLedgerManagerFactory;
@@ -37,7 +38,6 @@ import
dlshade.org.apache.bookkeeper.meta.HierarchicalLedgerManagerFactory;
import dlshade.org.apache.bookkeeper.meta.LayoutManager;
import dlshade.org.apache.bookkeeper.meta.LedgerLayout;
import dlshade.org.apache.bookkeeper.meta.LedgerManagerFactory;
-import dlshade.org.apache.bookkeeper.util.ReflectionUtils;
import java.io.IOException;
import org.junit.Test;
import org.junit.runner.RunWith;
