diff --git a/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java b/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java index c14321cb95..5b3cb7b3d7 100644 --- a/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java +++ b/ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java @@ -19,6 +19,12 @@ import java.util.Optional; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotReplicatedException; +import org.apache.ratis.protocol.exceptions.RaftException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; import org.apache.ratis.proto.RaftProtos.*; import org.apache.ratis.util.ProtoUtils; diff --git a/ratis-client/src/main/java/org/apache/ratis/client/impl/OrderedAsync.java b/ratis-client/src/main/java/org/apache/ratis/client/impl/OrderedAsync.java index 3b6c396398..0b642b7cf5 100644 --- a/ratis-client/src/main/java/org/apache/ratis/client/impl/OrderedAsync.java +++ b/ratis-client/src/main/java/org/apache/ratis/client/impl/OrderedAsync.java @@ -23,9 +23,9 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto.TypeCase; import org.apache.ratis.proto.RaftProtos.SlidingWindowEntry; -import org.apache.ratis.protocol.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; import org.apache.ratis.protocol.Message; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.protocol.RaftPeerId; diff --git a/ratis-client/src/main/java/org/apache/ratis/client/impl/RaftClientImpl.java b/ratis-client/src/main/java/org/apache/ratis/client/impl/RaftClientImpl.java index 8f00e50c53..4d89bd3614 100644 --- a/ratis-client/src/main/java/org/apache/ratis/client/impl/RaftClientImpl.java +++ b/ratis-client/src/main/java/org/apache/ratis/client/impl/RaftClientImpl.java @@ -26,7 +26,13 @@ import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.proto.RaftProtos.SlidingWindowEntry; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.apache.ratis.protocol.exceptions.RaftException; +import org.apache.ratis.protocol.exceptions.RaftRetryFailureException; import org.apache.ratis.protocol.exceptions.ResourceUnavailableException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.retry.RetryPolicy; import org.apache.ratis.util.CollectionUtils; import org.apache.ratis.util.JavaUtils; diff --git a/ratis-client/src/main/java/org/apache/ratis/client/impl/UnorderedAsync.java b/ratis-client/src/main/java/org/apache/ratis/client/impl/UnorderedAsync.java index eeb6b96e8d..6363c65cdf 100644 --- a/ratis-client/src/main/java/org/apache/ratis/client/impl/UnorderedAsync.java +++ b/ratis-client/src/main/java/org/apache/ratis/client/impl/UnorderedAsync.java @@ -20,11 +20,11 @@ import org.apache.ratis.client.retry.ClientRetryEvent; import org.apache.ratis.client.impl.RaftClientImpl.PendingClientRequest; import org.apache.ratis.protocol.ClientId; -import org.apache.ratis.protocol.GroupMismatchException; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftClientRequest; -import org.apache.ratis.protocol.RaftException; +import org.apache.ratis.protocol.exceptions.RaftException; import org.apache.ratis.retry.RetryPolicy; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.TimeDuration; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientReply.java b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientReply.java index 33137c91d4..36e2fd2455 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientReply.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/RaftClientReply.java @@ -18,6 +18,12 @@ package org.apache.ratis.protocol; import org.apache.ratis.proto.RaftProtos.CommitInfoProto; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotReplicatedException; +import org.apache.ratis.protocol.exceptions.RaftException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.Preconditions; import org.apache.ratis.util.ProtoUtils; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/AlreadyClosedException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/AlreadyClosedException.java similarity index 95% rename from ratis-common/src/main/java/org/apache/ratis/protocol/AlreadyClosedException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/AlreadyClosedException.java index f69173ff0f..01568928e5 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/AlreadyClosedException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/AlreadyClosedException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; /** * The corresponding object is already closed. diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/AlreadyExistsException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/AlreadyExistsException.java similarity index 96% rename from ratis-common/src/main/java/org/apache/ratis/protocol/AlreadyExistsException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/AlreadyExistsException.java index cc441f23c3..a90cd39d22 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/AlreadyExistsException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/AlreadyExistsException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; import java.io.IOException; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/ChecksumException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ChecksumException.java similarity index 96% rename from ratis-common/src/main/java/org/apache/ratis/protocol/ChecksumException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ChecksumException.java index 1742c246b7..70f2774812 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/ChecksumException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ChecksumException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; import java.io.IOException; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/GroupMismatchException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/GroupMismatchException.java similarity index 95% rename from ratis-common/src/main/java/org/apache/ratis/protocol/GroupMismatchException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/GroupMismatchException.java index af60825166..56a872c9df 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/GroupMismatchException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/GroupMismatchException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; /** * This exception indicates that the group id in the request does not match diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/LeaderNotReadyException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/LeaderNotReadyException.java similarity index 93% rename from ratis-common/src/main/java/org/apache/ratis/protocol/LeaderNotReadyException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/LeaderNotReadyException.java index efe795f8dd..d441a8ddd5 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/LeaderNotReadyException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/LeaderNotReadyException.java @@ -15,7 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; + +import org.apache.ratis.protocol.RaftGroupMemberId; /** * This exception is sent from the server to a client. The server has just diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/NotLeaderException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/NotLeaderException.java similarity index 92% rename from ratis-common/src/main/java/org/apache/ratis/protocol/NotLeaderException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/NotLeaderException.java index ab291b975c..8d5c2cb4e9 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/NotLeaderException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/NotLeaderException.java @@ -15,8 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; +import org.apache.ratis.protocol.RaftGroupMemberId; +import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.util.Preconditions; import java.util.Collection; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/NotReplicatedException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/NotReplicatedException.java similarity index 97% rename from ratis-common/src/main/java/org/apache/ratis/protocol/NotReplicatedException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/NotReplicatedException.java index c8643d71cf..5f48654eec 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/NotReplicatedException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/NotReplicatedException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; import org.apache.ratis.proto.RaftProtos.ReplicationLevel; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/RaftException.java similarity index 96% rename from ratis-common/src/main/java/org/apache/ratis/protocol/RaftException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/RaftException.java index 11aac90e4e..7e7db0e32e 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/RaftException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; import java.io.IOException; diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftRetryFailureException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/RaftRetryFailureException.java similarity index 93% rename from ratis-common/src/main/java/org/apache/ratis/protocol/RaftRetryFailureException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/RaftRetryFailureException.java index 47e79025ab..a04ed7eb3a 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/RaftRetryFailureException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/RaftRetryFailureException.java @@ -15,8 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; +import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.retry.RetryPolicy; /** diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/ReconfigurationInProgressException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ReconfigurationInProgressException.java similarity index 95% rename from ratis-common/src/main/java/org/apache/ratis/protocol/ReconfigurationInProgressException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ReconfigurationInProgressException.java index 3d0f093920..76ccbf454f 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/ReconfigurationInProgressException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ReconfigurationInProgressException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; public class ReconfigurationInProgressException extends RaftException { public ReconfigurationInProgressException(String message) { diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/ReconfigurationTimeoutException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ReconfigurationTimeoutException.java similarity index 95% rename from ratis-common/src/main/java/org/apache/ratis/protocol/ReconfigurationTimeoutException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ReconfigurationTimeoutException.java index 69a2e51fe9..14ff977899 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/ReconfigurationTimeoutException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ReconfigurationTimeoutException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; public class ReconfigurationTimeoutException extends RaftException { public ReconfigurationTimeoutException(String message) { diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ResourceUnavailableException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ResourceUnavailableException.java index 92b4abb987..3d01423a56 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ResourceUnavailableException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ResourceUnavailableException.java @@ -17,8 +17,6 @@ */ package org.apache.ratis.protocol.exceptions; -import org.apache.ratis.protocol.RaftException; - /** * A particular resource is unavailable. */ diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/ServerNotReadyException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ServerNotReadyException.java similarity index 95% rename from ratis-common/src/main/java/org/apache/ratis/protocol/ServerNotReadyException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ServerNotReadyException.java index 80307e6095..06455c82e5 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/ServerNotReadyException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/ServerNotReadyException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; /** * The server is not ready yet. diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/StaleReadException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StaleReadException.java similarity index 95% rename from ratis-common/src/main/java/org/apache/ratis/protocol/StaleReadException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StaleReadException.java index 0240479701..410f05b786 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/StaleReadException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StaleReadException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; /** * This exception indicates the failure of a stale-read. diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/StateMachineException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StateMachineException.java similarity index 93% rename from ratis-common/src/main/java/org/apache/ratis/protocol/StateMachineException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StateMachineException.java index 15545e1c13..6a97203f67 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/StateMachineException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StateMachineException.java @@ -15,7 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; + +import org.apache.ratis.protocol.RaftGroupMemberId; public class StateMachineException extends RaftException { public StateMachineException(RaftGroupMemberId serverId, Throwable cause) { diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StreamException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StreamException.java index 777e56c500..f63f72c011 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StreamException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/StreamException.java @@ -17,8 +17,6 @@ */ package org.apache.ratis.protocol.exceptions; -import org.apache.ratis.protocol.RaftException; - /** * A stream is not found in the server. */ diff --git a/ratis-common/src/main/java/org/apache/ratis/protocol/TimeoutIOException.java b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/TimeoutIOException.java similarity index 96% rename from ratis-common/src/main/java/org/apache/ratis/protocol/TimeoutIOException.java rename to ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/TimeoutIOException.java index bfdff887f7..7bcd3c9dad 100644 --- a/ratis-common/src/main/java/org/apache/ratis/protocol/TimeoutIOException.java +++ b/ratis-common/src/main/java/org/apache/ratis/protocol/exceptions/TimeoutIOException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.ratis.protocol; +package org.apache.ratis.protocol.exceptions; import java.io.IOException; diff --git a/ratis-common/src/main/java/org/apache/ratis/util/IOUtils.java b/ratis-common/src/main/java/org/apache/ratis/util/IOUtils.java index b075b3f8ec..16eb49b797 100644 --- a/ratis-common/src/main/java/org/apache/ratis/util/IOUtils.java +++ b/ratis-common/src/main/java/org/apache/ratis/util/IOUtils.java @@ -17,8 +17,8 @@ */ package org.apache.ratis.util; -import org.apache.ratis.protocol.AlreadyClosedException; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.slf4j.Logger; import java.io.ByteArrayInputStream; diff --git a/ratis-common/src/main/java/org/apache/ratis/util/PeerProxyMap.java b/ratis-common/src/main/java/org/apache/ratis/util/PeerProxyMap.java index 6327adbbf0..5fb680229d 100644 --- a/ratis-common/src/main/java/org/apache/ratis/util/PeerProxyMap.java +++ b/ratis-common/src/main/java/org/apache/ratis/util/PeerProxyMap.java @@ -17,7 +17,7 @@ */ package org.apache.ratis.util; -import org.apache.ratis.protocol.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; import org.apache.ratis.protocol.RaftPeer; import org.apache.ratis.protocol.RaftPeerId; import org.apache.ratis.util.function.CheckedFunction; diff --git a/ratis-common/src/main/java/org/apache/ratis/util/SlidingWindow.java b/ratis-common/src/main/java/org/apache/ratis/util/SlidingWindow.java index c9175d081d..75ffd80cd3 100644 --- a/ratis-common/src/main/java/org/apache/ratis/util/SlidingWindow.java +++ b/ratis-common/src/main/java/org/apache/ratis/util/SlidingWindow.java @@ -17,7 +17,7 @@ */ package org.apache.ratis.util; -import org.apache.ratis.protocol.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/FileStoreClient.java b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/FileStoreClient.java index 4b8cd5af81..639cfdb490 100644 --- a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/FileStoreClient.java +++ b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/FileStoreClient.java @@ -30,7 +30,7 @@ import org.apache.ratis.protocol.Message; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftGroup; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; import org.apache.ratis.util.JavaUtils; import org.apache.ratis.util.Preconditions; diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/GrpcUtil.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/GrpcUtil.java index 28b7cc7517..09a180d573 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/GrpcUtil.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/GrpcUtil.java @@ -18,8 +18,8 @@ package org.apache.ratis.grpc; import org.apache.ratis.protocol.RaftClientReply; -import org.apache.ratis.protocol.ServerNotReadyException; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.ServerNotReadyException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.thirdparty.io.grpc.ManagedChannel; import org.apache.ratis.thirdparty.io.grpc.Metadata; import org.apache.ratis.thirdparty.io.grpc.Status; diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java index 42c24efdf2..9e45db324d 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java @@ -32,8 +32,8 @@ import org.apache.ratis.proto.RaftProtos.RaftClientReplyProto; import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto; import org.apache.ratis.proto.RaftProtos.SetConfigurationRequestProto; -import org.apache.ratis.protocol.LeaderNotReadyException; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.thirdparty.io.grpc.netty.GrpcSslContexts; import org.apache.ratis.thirdparty.io.netty.handler.ssl.SslContextBuilder; import org.apache.ratis.proto.grpc.AdminProtocolServiceGrpc; @@ -41,9 +41,9 @@ import org.apache.ratis.proto.grpc.RaftClientProtocolServiceGrpc; import org.apache.ratis.proto.grpc.RaftClientProtocolServiceGrpc.RaftClientProtocolServiceBlockingStub; import org.apache.ratis.proto.grpc.RaftClientProtocolServiceGrpc.RaftClientProtocolServiceStub; -import org.apache.ratis.protocol.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; import org.apache.ratis.protocol.ClientId; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.protocol.RaftPeer; diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java index d878c8dbe0..dc8ce4973e 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolService.java @@ -20,6 +20,9 @@ import org.apache.ratis.client.impl.ClientProtoUtils; import org.apache.ratis.grpc.GrpcUtil; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.RaftException; import org.apache.ratis.thirdparty.io.grpc.stub.StreamObserver; import org.apache.ratis.proto.RaftProtos.RaftClientReplyProto; import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto; diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java index 0450fa0e38..9fe24dd49d 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientRpc.java @@ -24,6 +24,7 @@ import org.apache.ratis.grpc.GrpcTlsConfig; import org.apache.ratis.grpc.GrpcUtil; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; import org.apache.ratis.thirdparty.io.grpc.StatusRuntimeException; import org.apache.ratis.thirdparty.io.grpc.stub.StreamObserver; import org.apache.ratis.proto.RaftProtos.GroupInfoRequestProto; diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientStreamer.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientStreamer.java index a93a62209b..7f53453c47 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientStreamer.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientStreamer.java @@ -23,6 +23,7 @@ import org.apache.ratis.grpc.GrpcTlsConfig; import org.apache.ratis.grpc.GrpcUtil; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.thirdparty.com.google.protobuf.ByteString; import org.apache.ratis.proto.RaftProtos.RaftClientReplyProto; import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto; diff --git a/ratis-hadoop/src/main/java/org/apache/ratis/hadooprpc/client/HadoopClientRpc.java b/ratis-hadoop/src/main/java/org/apache/ratis/hadooprpc/client/HadoopClientRpc.java index ffb6dc83b9..bd04dc1e19 100644 --- a/ratis-hadoop/src/main/java/org/apache/ratis/hadooprpc/client/HadoopClientRpc.java +++ b/ratis-hadoop/src/main/java/org/apache/ratis/hadooprpc/client/HadoopClientRpc.java @@ -21,6 +21,12 @@ import org.apache.hadoop.ipc.RemoteException; import org.apache.ratis.client.impl.RaftClientRpcWithProxy; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.RaftException; +import org.apache.ratis.protocol.exceptions.ReconfigurationInProgressException; +import org.apache.ratis.protocol.exceptions.ReconfigurationTimeoutException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.util.PeerProxyMap; import java.io.IOException; diff --git a/ratis-netty/src/main/java/org/apache/ratis/netty/NettyRpcProxy.java b/ratis-netty/src/main/java/org/apache/ratis/netty/NettyRpcProxy.java index 15e54f4dc3..5f5d7ecf23 100644 --- a/ratis-netty/src/main/java/org/apache/ratis/netty/NettyRpcProxy.java +++ b/ratis-netty/src/main/java/org/apache/ratis/netty/NettyRpcProxy.java @@ -20,7 +20,7 @@ import org.apache.ratis.client.RaftClientConfigKeys; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.RaftPeer; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.thirdparty.io.netty.channel.*; import org.apache.ratis.thirdparty.io.netty.channel.nio.NioEventLoopGroup; import org.apache.ratis.thirdparty.io.netty.channel.socket.SocketChannel; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java index 0b1a9e17af..5718158953 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderState.java @@ -20,6 +20,10 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotReplicatedException; +import org.apache.ratis.protocol.exceptions.ReconfigurationTimeoutException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.metrics.LogAppenderMetrics; import org.apache.ratis.server.protocol.TermIndex; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java index a514c632d0..933dfd1a18 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequest.java @@ -19,6 +19,7 @@ import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.Preconditions; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java index 0ea59a7231..1a222eafc4 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java @@ -21,10 +21,10 @@ import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto; import org.apache.ratis.protocol.Message; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftClientRequest; -import org.apache.ratis.protocol.RaftException; +import org.apache.ratis.protocol.exceptions.RaftException; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.SetConfigurationRequest; import org.apache.ratis.server.RaftServerConfigKeys; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java index 79436d0be5..b1d56d6ad5 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java @@ -20,7 +20,15 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.*; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.apache.ratis.protocol.exceptions.RaftException; +import org.apache.ratis.protocol.exceptions.ReconfigurationInProgressException; import org.apache.ratis.protocol.exceptions.ResourceUnavailableException; +import org.apache.ratis.protocol.exceptions.ServerNotReadyException; +import org.apache.ratis.protocol.exceptions.StaleReadException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.RaftServerMXBean; import org.apache.ratis.server.RaftServerRpc; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java index 38cccba013..f52bc904f6 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerProxy.java @@ -29,6 +29,9 @@ import org.apache.ratis.proto.RaftProtos.RequestVoteReplyProto; import org.apache.ratis.proto.RaftProtos.RequestVoteRequestProto; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.AlreadyExistsException; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; import org.apache.ratis.rpc.RpcType; import org.apache.ratis.server.RaftServer; import org.apache.ratis.server.RaftServerConfigKeys; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java index 3011fbe911..4ce061d3d8 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java @@ -19,6 +19,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.protocol.TermIndex; import org.apache.ratis.server.raftlog.RaftLog; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java index 907dc800a3..9b0abec9d2 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java @@ -20,7 +20,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.protocol.Message; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.raftlog.RaftLog; import org.apache.ratis.proto.RaftProtos.LogEntryProto; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/WatchRequests.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/WatchRequests.java index f7f76eba09..97605d5e70 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/impl/WatchRequests.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/WatchRequests.java @@ -20,7 +20,7 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.proto.RaftProtos.WatchRequestTypeProto; -import org.apache.ratis.protocol.NotReplicatedException; +import org.apache.ratis.protocol.exceptions.NotReplicatedException; import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.protocol.exceptions.ResourceUnavailableException; import org.apache.ratis.server.RaftServerConfigKeys; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java index 4122262994..8f88020e03 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLog.java @@ -21,7 +21,7 @@ import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftConfiguration; import org.apache.ratis.server.impl.ServerProtoUtils; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogIOException.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogIOException.java index 37ab9ae98f..d4c21c18f4 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogIOException.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogIOException.java @@ -17,7 +17,7 @@ */ package org.apache.ratis.server.raftlog; -import org.apache.ratis.protocol.RaftException; +import org.apache.ratis.protocol.exceptions.RaftException; /** * Exception while reading/writing RaftLog diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java index 4b790ea1d8..ee4377a129 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java @@ -18,7 +18,7 @@ package org.apache.ratis.server.raftlog; import org.apache.ratis.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.impl.RaftConfiguration; import org.apache.ratis.statemachine.TransactionContext; import org.apache.ratis.util.Preconditions; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java index b529ad03cc..4a1e17d51a 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogReader.java @@ -18,7 +18,7 @@ package org.apache.ratis.server.raftlog.segmented; import org.apache.ratis.io.CorruptedFileException; -import org.apache.ratis.protocol.ChecksumException; +import org.apache.ratis.protocol.exceptions.ChecksumException; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.metrics.RaftLogMetrics; import org.apache.ratis.thirdparty.com.google.protobuf.CodedInputStream; diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java index 8555998aaf..402a22202a 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLogWorker.java @@ -21,7 +21,7 @@ import com.codahale.metrics.Timer; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.RaftGroupMemberId; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.impl.ServerProtoUtils; diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java index 9b2ad9beb2..09ddec836d 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java @@ -22,8 +22,8 @@ import org.apache.ratis.client.RaftClient; import org.apache.ratis.client.RaftClientConfigKeys; import org.apache.ratis.client.impl.OrderedAsync; -import org.apache.ratis.protocol.AlreadyClosedException; -import org.apache.ratis.protocol.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftGroup; import org.apache.ratis.protocol.RaftGroupId; diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java index 370cfd68a7..552f0490f5 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java @@ -25,13 +25,13 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.protocol.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; import org.apache.ratis.protocol.Message; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftGroup; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.RaftRetryFailureException; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.RaftRetryFailureException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.retry.RetryPolicies; import org.apache.ratis.retry.RetryPolicies.RetryLimited; import org.apache.ratis.retry.RetryPolicy; diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java index 27bf52346f..d825d87391 100644 --- a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java @@ -22,6 +22,10 @@ import org.apache.ratis.client.RaftClient; import org.apache.ratis.client.RaftClientRpc; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.GroupMismatchException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; +import org.apache.ratis.protocol.exceptions.StaleReadException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.raftlog.RaftLog; diff --git a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java index c9dd63f78a..368b871fba 100644 --- a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java @@ -23,11 +23,11 @@ import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.CommitInfoProto; import org.apache.ratis.proto.RaftProtos.ReplicationLevel; -import org.apache.ratis.protocol.AlreadyClosedException; -import org.apache.ratis.protocol.NotReplicatedException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.NotReplicatedException; import org.apache.ratis.protocol.RaftClientReply; -import org.apache.ratis.protocol.RaftRetryFailureException; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.RaftRetryFailureException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.retry.RetryPolicies; import org.apache.ratis.retry.RetryPolicy; import org.apache.ratis.server.RaftServerConfigKeys; diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java index a205ff2093..3355cb96da 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupManagementBaseTest.java @@ -23,7 +23,7 @@ import org.apache.ratis.RaftTestUtil; import org.apache.ratis.client.RaftClient; import org.apache.ratis.conf.RaftProperties; -import org.apache.ratis.protocol.AlreadyExistsException; +import org.apache.ratis.protocol.exceptions.AlreadyExistsException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftGroup; import org.apache.ratis.protocol.RaftGroupId; diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java index 3ee0a461b1..38bb192e53 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftReconfigurationBaseTest.java @@ -27,6 +27,9 @@ import org.apache.ratis.client.RaftClientRpc; import org.apache.ratis.proto.RaftProtos.LogEntryProto; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.ReconfigurationInProgressException; +import org.apache.ratis.protocol.exceptions.ReconfigurationTimeoutException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.raftlog.RaftLog; import org.apache.ratis.server.storage.RaftStorageTestUtils; diff --git a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java index 04d13a2aea..e6e5c2b624 100644 --- a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java +++ b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftStateMachineExceptionTests.java @@ -26,6 +26,7 @@ import org.apache.ratis.client.RaftClientRpc; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.protocol.*; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.raftlog.RaftLog; import org.apache.ratis.statemachine.SimpleStateMachine4Testing; import org.apache.ratis.statemachine.StateMachine; diff --git a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java index 45761eb2df..6fd9712d6c 100644 --- a/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java +++ b/ratis-server/src/test/java/org/apache/ratis/statemachine/SimpleStateMachine4Testing.java @@ -27,7 +27,7 @@ import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.RaftServer; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerConstants; diff --git a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java index 85d1171bd6..5d71f61eb5 100644 --- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java +++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftServerWithGrpc.java @@ -42,11 +42,11 @@ import org.apache.ratis.grpc.client.GrpcClientProtocolService; import org.apache.ratis.proto.RaftProtos; import org.apache.ratis.proto.RaftProtos.RaftPeerRole; -import org.apache.ratis.protocol.AlreadyClosedException; +import org.apache.ratis.protocol.exceptions.AlreadyClosedException; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.retry.RetryPolicies; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.RaftServerRpc; diff --git a/ratis-test/src/test/java/org/apache/ratis/retry/TestExceptionDependentRetry.java b/ratis-test/src/test/java/org/apache/ratis/retry/TestExceptionDependentRetry.java index 675635e618..8fa02c9860 100644 --- a/ratis-test/src/test/java/org/apache/ratis/retry/TestExceptionDependentRetry.java +++ b/ratis-test/src/test/java/org/apache/ratis/retry/TestExceptionDependentRetry.java @@ -25,8 +25,8 @@ import org.apache.ratis.client.RaftClientConfigKeys; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.grpc.MiniRaftClusterWithGrpc; -import org.apache.ratis.protocol.RaftRetryFailureException; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.RaftRetryFailureException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.statemachine.SimpleStateMachine4Testing; diff --git a/ratis-test/src/test/java/org/apache/ratis/retry/TestRetryPolicy.java b/ratis-test/src/test/java/org/apache/ratis/retry/TestRetryPolicy.java index 005dab0fd4..d1dcc82506 100644 --- a/ratis-test/src/test/java/org/apache/ratis/retry/TestRetryPolicy.java +++ b/ratis-test/src/test/java/org/apache/ratis/retry/TestRetryPolicy.java @@ -24,13 +24,13 @@ import org.apache.ratis.proto.RaftProtos.RaftClientRequestProto; import org.apache.ratis.proto.RaftProtos.ReplicationLevel; import org.apache.ratis.protocol.ClientId; -import org.apache.ratis.protocol.LeaderNotReadyException; -import org.apache.ratis.protocol.NotLeaderException; +import org.apache.ratis.protocol.exceptions.LeaderNotReadyException; +import org.apache.ratis.protocol.exceptions.NotLeaderException; import org.apache.ratis.protocol.RaftClientRequest; import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.protocol.exceptions.ResourceUnavailableException; import org.apache.ratis.util.TimeDuration; import org.junit.Assert; diff --git a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java index 9a6c8160b5..f8cec9a40e 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/ServerRestartTests.java @@ -25,11 +25,11 @@ import org.apache.ratis.client.RaftClient; import org.apache.ratis.conf.RaftProperties; import org.apache.ratis.proto.RaftProtos.LogEntryProto; -import org.apache.ratis.protocol.ChecksumException; +import org.apache.ratis.protocol.exceptions.ChecksumException; import org.apache.ratis.protocol.Message; import org.apache.ratis.protocol.RaftClientReply; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.StateMachineException; +import org.apache.ratis.protocol.exceptions.StateMachineException; import org.apache.ratis.server.impl.RaftServerImpl; import org.apache.ratis.server.impl.RaftServerProxy; import org.apache.ratis.server.impl.ServerProtoUtils; diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java index aff1e2305d..c2ac82edd2 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestRaftLogReadWrite.java @@ -20,7 +20,7 @@ import org.apache.ratis.BaseTest; import org.apache.ratis.RaftTestUtil.SimpleOperation; import org.apache.ratis.conf.RaftProperties; -import org.apache.ratis.protocol.ChecksumException; +import org.apache.ratis.protocol.exceptions.ChecksumException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.impl.RaftServerConstants.StartupOption; diff --git a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java index 14580d2a48..5ba5e912af 100644 --- a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java +++ b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestSegmentedRaftLog.java @@ -25,7 +25,7 @@ import org.apache.ratis.protocol.RaftGroupId; import org.apache.ratis.protocol.RaftGroupMemberId; import org.apache.ratis.protocol.RaftPeerId; -import org.apache.ratis.protocol.TimeoutIOException; +import org.apache.ratis.protocol.exceptions.TimeoutIOException; import org.apache.ratis.server.RaftServerConfigKeys; import org.apache.ratis.server.impl.RaftServerConstants; import org.apache.ratis.server.impl.RetryCacheTestUtil;