This is an automated email from the ASF dual-hosted git repository. xyuanlu pushed a commit to branch metaclient in repository https://gitbox.apache.org/repos/asf/helix.git
commit 341740ba73a77d1adc5def3e0f26d625892a804b Author: Marcos Rico Peng <[email protected]> AuthorDate: Fri Jan 27 15:00:44 2023 -0500 Refactoring MetaClient Exceptions Refactoring MetaClient Exception. Creating separate exception directory. --- .../java/org/apache/helix/metaclient/api/MetaClientInterface.java | 4 ++-- .../{constants => exception}/MetaClientBadVersionException.java | 2 +- .../metaclient/{constants => exception}/MetaClientException.java | 2 +- .../{constants => exception}/MetaClientInterruptException.java | 2 +- .../{constants => exception}/MetaClientNoNodeException.java | 2 +- .../{constants => exception}/MetaClientTimeoutException.java | 2 +- .../main/java/org/apache/helix/metaclient/impl/zk/ZkMetaClient.java | 4 +--- .../org/apache/helix/metaclient/impl/zk/util/ZkMetaClientUtil.java | 2 +- .../java/org/apache/helix/metaclient/impl/zk/TestZkMetaClient.java | 4 ++-- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/api/MetaClientInterface.java b/meta-client/src/main/java/org/apache/helix/metaclient/api/MetaClientInterface.java index b00993b97..46fb59cb7 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/api/MetaClientInterface.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/api/MetaClientInterface.java @@ -22,8 +22,8 @@ package org.apache.helix.metaclient.api; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.helix.metaclient.constants.MetaClientInterruptException; -import org.apache.helix.metaclient.constants.MetaClientTimeoutException; +import org.apache.helix.metaclient.exception.MetaClientInterruptException; +import org.apache.helix.metaclient.exception.MetaClientTimeoutException; public interface MetaClientInterface<T> { diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientBadVersionException.java b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientBadVersionException.java similarity index 89% rename from meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientBadVersionException.java rename to meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientBadVersionException.java index 4a7f4a0b2..bc59a4ac7 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientBadVersionException.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientBadVersionException.java @@ -1,4 +1,4 @@ -package org.apache.helix.metaclient.constants; +package org.apache.helix.metaclient.exception; public final class MetaClientBadVersionException extends MetaClientException { public MetaClientBadVersionException() { diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientException.java b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientException.java similarity index 96% rename from meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientException.java rename to meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientException.java index a40b8148f..ca6a213b3 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientException.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientException.java @@ -1,4 +1,4 @@ -package org.apache.helix.metaclient.constants; +package org.apache.helix.metaclient.exception; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientInterruptException.java b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientInterruptException.java similarity index 96% rename from meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientInterruptException.java rename to meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientInterruptException.java index 3f52e3ad9..60bc79607 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientInterruptException.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientInterruptException.java @@ -1,4 +1,4 @@ -package org.apache.helix.metaclient.constants; +package org.apache.helix.metaclient.exception; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientNoNodeException.java b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientNoNodeException.java similarity index 96% rename from meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientNoNodeException.java rename to meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientNoNodeException.java index b9cfb4b9f..09505fc19 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientNoNodeException.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientNoNodeException.java @@ -1,4 +1,4 @@ -package org.apache.helix.metaclient.constants; +package org.apache.helix.metaclient.exception; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientTimeoutException.java b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientTimeoutException.java similarity index 96% rename from meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientTimeoutException.java rename to meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientTimeoutException.java index 6f1c381a4..84b3e97ed 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/constants/MetaClientTimeoutException.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/exception/MetaClientTimeoutException.java @@ -1,4 +1,4 @@ -package org.apache.helix.metaclient.constants; +package org.apache.helix.metaclient.exception; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/ZkMetaClient.java b/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/ZkMetaClient.java index 4fa0ca73b..5bc6ca973 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/ZkMetaClient.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/ZkMetaClient.java @@ -33,7 +33,7 @@ import org.apache.helix.metaclient.api.DirectChildSubscribeResult; import org.apache.helix.metaclient.api.MetaClientInterface; import org.apache.helix.metaclient.api.Op; import org.apache.helix.metaclient.api.OpResult; -import org.apache.helix.metaclient.constants.MetaClientException; +import org.apache.helix.metaclient.exception.MetaClientException; import org.apache.helix.metaclient.impl.zk.adapter.DataListenerAdapter; import org.apache.helix.metaclient.impl.zk.factory.ZkMetaClientConfig; import org.apache.helix.metaclient.impl.zk.util.ZkMetaClientUtil; @@ -46,8 +46,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.apache.helix.metaclient.impl.zk.util.ZkMetaClientUtil.convertZkEntryMode; import static org.apache.helix.metaclient.impl.zk.util.ZkMetaClientUtil.translateZkExceptionToMetaclientException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ZkMetaClient<T> implements MetaClientInterface<T>, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(ZkMetaClient.class); diff --git a/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/util/ZkMetaClientUtil.java b/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/util/ZkMetaClientUtil.java index 94c83d725..2c3dc22cd 100644 --- a/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/util/ZkMetaClientUtil.java +++ b/meta-client/src/main/java/org/apache/helix/metaclient/impl/zk/util/ZkMetaClientUtil.java @@ -21,7 +21,7 @@ package org.apache.helix.metaclient.impl.zk.util; import org.apache.helix.metaclient.api.MetaClientInterface; import org.apache.helix.metaclient.api.OpResult; -import org.apache.helix.metaclient.constants.*; +import org.apache.helix.metaclient.exception.*; import org.apache.helix.zookeeper.zkclient.exception.*; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; diff --git a/meta-client/src/test/java/org/apache/helix/metaclient/impl/zk/TestZkMetaClient.java b/meta-client/src/test/java/org/apache/helix/metaclient/impl/zk/TestZkMetaClient.java index 605f37c74..15fce2e41 100644 --- a/meta-client/src/test/java/org/apache/helix/metaclient/impl/zk/TestZkMetaClient.java +++ b/meta-client/src/test/java/org/apache/helix/metaclient/impl/zk/TestZkMetaClient.java @@ -29,7 +29,7 @@ import java.util.Set; import org.apache.commons.io.FileUtils; import org.apache.helix.metaclient.api.DataUpdater; import org.apache.helix.metaclient.api.MetaClientInterface; -import org.apache.helix.metaclient.constants.MetaClientException; +import org.apache.helix.metaclient.exception.MetaClientException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -141,7 +141,7 @@ public class TestZkMetaClient { Assert.fail("No reach."); } catch (MetaClientException ex) { Assert.assertEquals(ex.getClass().getName(), - "org.apache.helix.metaclient.constants.MetaClientBadVersionException"); + "org.apache.helix.metaclient.exception.MetaClientBadVersionException"); } zkMetaClient.delete(key); }
