This is an automated email from the ASF dual-hosted git repository.
runzhiwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new ccca25a RATIS-1190. Remove the abstract newRaftServer method in
MiniRaftCluster. (#309)
ccca25a is described below
commit ccca25a7137b9bb65aa9514539381af05492856f
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Tue Dec 1 16:26:57 2020 +0800
RATIS-1190. Remove the abstract newRaftServer method in MiniRaftCluster.
(#309)
---
.../java/org/apache/ratis/TestMultiRaftGroup.java | 1 +
.../ratis/examples/ParameterizedBaseTest.java | 2 +-
.../ratis/examples/arithmetic/TestArithmetic.java | 2 +-
.../examples/arithmetic/TestArithmeticLogDump.java | 2 +-
.../apache/ratis/examples/counter/TestCounter.java | 2 +-
.../examples/filestore/FileStoreAsyncBaseTest.java | 2 +-
.../examples/filestore/FileStoreBaseTest.java | 2 +-
.../apache/ratis/grpc/MiniRaftClusterWithGrpc.java | 12 ++++-------
.../hadooprpc/MiniRaftClusterWithHadoopRpc.java | 16 ++++-----------
.../TestGroupManagementWithHadoopRpc.java | 2 +-
.../TestRaftReconfigurationWithHadoopRpc.java | 6 ------
.../hadooprpc/TestRaftSnapshotWithHadoopRpc.java | 5 +----
.../ratis/hadooprpc/TestRaftWithHadoopRpc.java | 2 +-
.../ratis/logservice/LogServiceReadWriteBase.java | 2 +-
.../ratis/netty/MiniRaftClusterWithNetty.java | 12 ++++-------
.../ratis/InstallSnapshotNotificationTests.java | 1 +
.../java/org/apache/ratis/LogAppenderTests.java | 1 +
.../org/apache/ratis/MessageStreamApiTests.java | 1 +
.../org/apache/ratis/OutputStreamBaseTest.java | 1 +
.../org/apache/ratis/RaftAsyncExceptionTests.java | 1 +
.../test/java/org/apache/ratis/RaftAsyncTests.java | 1 +
.../test/java/org/apache/ratis/RaftBasicTests.java | 1 +
.../org/apache/ratis/RaftExceptionBaseTest.java | 1 +
.../test/java/org/apache/ratis/RaftTestUtil.java | 1 +
.../apache/ratis/RequestLimitAsyncBaseTest.java | 1 +
.../java/org/apache/ratis/RetryCacheTests.java | 3 ++-
.../java/org/apache/ratis/WatchRequestTests.java | 1 +
.../ratis/server/impl/GroupInfoBaseTest.java | 1 -
.../ratis/server/impl/GroupManagementBaseTest.java | 1 -
.../ratis/server/impl/LeaderElectionTests.java | 1 -
.../ratis/{ => server/impl}/MiniRaftCluster.java | 23 +++++++++++-----------
.../server/impl/RaftReconfigurationBaseTest.java | 3 +--
.../ratis/server/impl/RaftServerTestUtil.java | 2 --
.../impl/RaftStateMachineExceptionTests.java | 1 -
.../ratis/server/impl/ServerPauseResumeTest.java | 1 -
.../server/impl/StateMachineShutdownTests.java | 1 -
.../server/impl/TestRatisServerMetricsBase.java | 1 -
.../MiniRaftClusterWithSimulatedRpc.java | 12 ++++-------
.../server/simulation/SimulatedServerRpc.java | 5 ++---
.../ratis/statemachine/RaftSnapshotBaseTest.java | 2 +-
.../ratis/TestRaftServerNoLeaderTimeout.java | 1 +
.../ratis/TestRaftServerSlownessDetection.java | 1 +
.../datastream/DataStreamAsyncClusterTests.java | 2 +-
.../ratis/datastream/DataStreamBaseTest.java | 2 +-
.../ratis/datastream/DataStreamClusterTests.java | 2 +-
...usterWithRpcTypeGrpcAndDataStreamTypeNetty.java | 12 ++++-------
...sterWithRpcTypeNettyAndDataStreamTypeNetty.java | 12 ++++-------
.../ratis/grpc/TestGroupManagementWithGrpc.java | 2 +-
.../apache/ratis/grpc/TestGrpcMessageMetrics.java | 2 +-
.../apache/ratis/grpc/TestLogAppenderWithGrpc.java | 2 +-
.../apache/ratis/grpc/TestRaftServerWithGrpc.java | 2 +-
.../ratis/grpc/TestRaftSnapshotWithGrpc.java | 2 +-
.../org/apache/ratis/grpc/TestRaftWithGrpc.java | 2 +-
.../apache/ratis/grpc/TestRetryCacheWithGrpc.java | 2 +-
.../ratis/netty/TestGroupManagementWithNetty.java | 2 +-
.../ratis/netty/TestRaftSnapshotWithNetty.java | 5 +----
.../ratis/retry/TestExceptionDependentRetry.java | 2 +-
.../apache/ratis/server/ServerRestartTests.java | 2 +-
.../ratis/server/raftlog/TestRaftLogMetrics.java | 2 +-
.../server/raftlog/memory/MemoryRaftLogTest.java | 2 +-
.../raftlog/segmented/TestCacheEviction.java | 2 +-
.../TestGroupManagementWithSimulatedRpc.java | 2 +-
.../TestRaftSnapshotWithSimulatedRpc.java | 5 +----
.../TestRatisServerMetricsWithSimulatedRpc.java | 2 --
.../ratis/statemachine/TestStateMachine.java | 2 +-
65 files changed, 85 insertions(+), 127 deletions(-)
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
b/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
index 6635176..4fb2066 100644
--- a/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
+++ b/ratis-examples/src/test/java/org/apache/ratis/TestMultiRaftGroup.java
@@ -26,6 +26,7 @@ import org.apache.ratis.examples.arithmetic.TestArithmetic;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.util.Log4jUtils;
import org.apache.ratis.util.function.CheckedBiConsumer;
import org.junit.Test;
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/ParameterizedBaseTest.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/ParameterizedBaseTest.java
index cd3b7ef..ba4cdc2 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/ParameterizedBaseTest.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/ParameterizedBaseTest.java
@@ -18,7 +18,7 @@
package org.apache.ratis.examples;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.grpc.MiniRaftClusterWithGrpc;
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
index 184bb3f..e30ae32 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmetic.java
@@ -18,7 +18,7 @@
package org.apache.ratis.examples.arithmetic;
import org.apache.log4j.Level;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.examples.ParameterizedBaseTest;
import org.apache.ratis.examples.arithmetic.expression.DoubleValue;
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
index 4b3f8cc..01da8ed 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/arithmetic/TestArithmeticLogDump.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.server.RaftServer;
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/counter/TestCounter.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/counter/TestCounter.java
index 5c86916..e637891 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/counter/TestCounter.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/counter/TestCounter.java
@@ -18,7 +18,7 @@
package org.apache.ratis.examples.counter;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.examples.ParameterizedBaseTest;
import org.apache.ratis.examples.counter.server.CounterStateMachine;
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreAsyncBaseTest.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreAsyncBaseTest.java
index 80e4f7b..f99d927 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreAsyncBaseTest.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreAsyncBaseTest.java
@@ -18,7 +18,7 @@
package org.apache.ratis.examples.filestore;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.conf.ConfUtils;
import org.apache.ratis.conf.RaftProperties;
diff --git
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreBaseTest.java
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreBaseTest.java
index eac5fba..198ea2b 100644
---
a/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreBaseTest.java
+++
b/ratis-examples/src/test/java/org/apache/ratis/examples/filestore/FileStoreBaseTest.java
@@ -18,7 +18,7 @@
package org.apache.ratis.examples.filestore;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.conf.ConfUtils;
import org.apache.ratis.conf.RaftProperties;
diff --git
a/ratis-grpc/src/test/java/org/apache/ratis/grpc/MiniRaftClusterWithGrpc.java
b/ratis-grpc/src/test/java/org/apache/ratis/grpc/MiniRaftClusterWithGrpc.java
index 9a2cee3..2c68ad5 100644
---
a/ratis-grpc/src/test/java/org/apache/ratis/grpc/MiniRaftClusterWithGrpc.java
+++
b/ratis-grpc/src/test/java/org/apache/ratis/grpc/MiniRaftClusterWithGrpc.java
@@ -17,18 +17,16 @@
*/
package org.apache.ratis.grpc;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftConfigKeys;
import org.apache.ratis.RaftTestUtil;
+import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.grpc.server.GrpcService;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.server.impl.*;
-import org.apache.ratis.statemachine.StateMachine;
-
-import java.io.IOException;
/**
* A {@link MiniRaftCluster} with {{@link SupportedRpcType#GRPC}} and data
stream disabled.
@@ -58,11 +56,9 @@ public class MiniRaftClusterWithGrpc extends
MiniRaftCluster.RpcBase {
}
@Override
- protected RaftServerProxy newRaftServer(
- RaftPeerId id, StateMachine.Registry stateMachineRegistry, RaftGroup
group,
- RaftProperties properties) throws IOException {
+ protected Parameters setPropertiesAndInitParameters(RaftPeerId id, RaftGroup
group, RaftProperties properties) {
GrpcConfigKeys.Server.setPort(properties, getPort(id, group));
- return ServerImplUtils.newRaftServer(id, group, stateMachineRegistry,
properties, null);
+ return null;
}
@Override
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/MiniRaftClusterWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/MiniRaftClusterWithHadoopRpc.java
index 6e35e90..e3d5920 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/MiniRaftClusterWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/MiniRaftClusterWithHadoopRpc.java
@@ -18,24 +18,20 @@
package org.apache.ratis.hadooprpc;
import org.apache.hadoop.conf.Configuration;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftConfigKeys;
import org.apache.ratis.RaftTestUtil;
+import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.hadooprpc.server.HadoopRpcService;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.server.impl.DelayLocalExecutionInjection;
-import org.apache.ratis.server.impl.RaftServerProxy;
-import org.apache.ratis.server.impl.ServerImplUtils;
-import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.JavaUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-
public class MiniRaftClusterWithHadoopRpc extends MiniRaftCluster.RpcBase {
static final Logger LOG =
LoggerFactory.getLogger(MiniRaftClusterWithHadoopRpc.class);
@@ -80,15 +76,11 @@ public class MiniRaftClusterWithHadoopRpc extends
MiniRaftCluster.RpcBase {
}
@Override
- protected RaftServerProxy newRaftServer(
- RaftPeerId id, StateMachine.Registry stateMachineRegistry , RaftGroup
group,
- RaftProperties properties) throws IOException {
+ protected Parameters setPropertiesAndInitParameters(RaftPeerId id, RaftGroup
group, RaftProperties properties) {
final Configuration hconf = new Configuration(hadoopConf);
final String address = "0.0.0.0:" + getPort(id, group);
HadoopConfigKeys.Ipc.setAddress(hconf, address);
-
- return ServerImplUtils.newRaftServer(id, group, stateMachineRegistry,
properties,
- HadoopFactory.newRaftParameters(hconf));
+ return HadoopFactory.newRaftParameters(hconf);
}
@Override
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestGroupManagementWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestGroupManagementWithHadoopRpc.java
index af0074f..d16ac38 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestGroupManagementWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestGroupManagementWithHadoopRpc.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.hadooprpc;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
public class TestGroupManagementWithHadoopRpc extends GroupManagementBaseTest {
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java
index 75fcbe3..6128a55 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftReconfigurationWithHadoopRpc.java
@@ -17,15 +17,9 @@
*/
package org.apache.ratis.hadooprpc;
-import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.ipc.Client;
-import org.apache.log4j.Level;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftReconfigurationBaseTest;
-import java.io.IOException;
-
import static
org.apache.hadoop.fs.CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_MAX_RETRIES_KEY;
import static
org.apache.hadoop.fs.CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_TIMEOUT_KEY;
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftSnapshotWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftSnapshotWithHadoopRpc.java
index db8eeaf..a2ed8ea 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftSnapshotWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftSnapshotWithHadoopRpc.java
@@ -17,12 +17,9 @@
*/
package org.apache.ratis.hadooprpc;
-import org.apache.ratis.MiniRaftCluster;
-import org.apache.ratis.conf.RaftProperties;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.RaftSnapshotBaseTest;
-import java.io.IOException;
-
public class TestRaftSnapshotWithHadoopRpc extends RaftSnapshotBaseTest {
@Override
public MiniRaftCluster.Factory<?> getFactory() {
diff --git
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
index 4808726..f5c6dfa 100644
---
a/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
+++
b/ratis-hadoop/src/test/java/org/apache/ratis/hadooprpc/TestRaftWithHadoopRpc.java
@@ -20,7 +20,7 @@ package org.apache.ratis.hadooprpc;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.log4j.Level;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftBasicTests;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.server.impl.BlockRequestHandlingInjection;
diff --git
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/LogServiceReadWriteBase.java
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/LogServiceReadWriteBase.java
index 84aba03..0270b3f 100644
---
a/ratis-logservice/src/test/java/org/apache/ratis/logservice/LogServiceReadWriteBase.java
+++
b/ratis-logservice/src/test/java/org/apache/ratis/logservice/LogServiceReadWriteBase.java
@@ -34,7 +34,7 @@ import java.util.List;
import javax.management.ObjectName;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
diff --git
a/ratis-netty/src/test/java/org/apache/ratis/netty/MiniRaftClusterWithNetty.java
b/ratis-netty/src/test/java/org/apache/ratis/netty/MiniRaftClusterWithNetty.java
index f5a9b15..d444549 100644
---
a/ratis-netty/src/test/java/org/apache/ratis/netty/MiniRaftClusterWithNetty.java
+++
b/ratis-netty/src/test/java/org/apache/ratis/netty/MiniRaftClusterWithNetty.java
@@ -17,18 +17,16 @@
*/
package org.apache.ratis.netty;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftConfigKeys;
import org.apache.ratis.RaftTestUtil;
+import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.netty.server.NettyRpcService;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.rpc.SupportedRpcType;
import org.apache.ratis.server.impl.*;
-import org.apache.ratis.statemachine.StateMachine;
-
-import java.io.IOException;
/**
* A {@link MiniRaftCluster} with {{@link SupportedRpcType#NETTY}} and data
stream disabled.
@@ -58,11 +56,9 @@ public class MiniRaftClusterWithNetty extends
MiniRaftCluster.RpcBase {
}
@Override
- protected RaftServerProxy newRaftServer(
- RaftPeerId id, StateMachine.Registry stateMachineRegistry , RaftGroup
group,
- RaftProperties properties) throws IOException {
+ protected Parameters setPropertiesAndInitParameters(RaftPeerId id, RaftGroup
group, RaftProperties properties) {
NettyConfigKeys.Server.setPort(properties, getPort(id, group));
- return ServerImplUtils.newRaftServer(id, group, stateMachineRegistry,
properties, null);
+ return null;
}
@Override
diff --git
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
index 3771e01..80bb73e 100644
---
a/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/InstallSnapshotNotificationTests.java
@@ -25,6 +25,7 @@ import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.server.raftlog.RaftLog;
diff --git a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
index f710ed1..8d2362d 100644
--- a/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/LogAppenderTests.java
@@ -31,6 +31,7 @@ import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.LogAppender;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.metrics.RaftServerMetrics;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.impl.ServerProtoUtils;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
b/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
index ba5719c..f48d8e1 100644
--- a/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/MessageStreamApiTests.java
@@ -26,6 +26,7 @@ import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.Message;
import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.server.RaftServer;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
index b68285b..2042093 100644
--- a/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/OutputStreamBaseTest.java
@@ -21,6 +21,7 @@ import org.apache.ratis.client.impl.RaftOutputStream;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.proto.RaftProtos.LogEntryProto.LogEntryBodyCase;
import org.apache.ratis.server.RaftServer;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.server.raftlog.RaftLog;
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 e267584..187cd0a 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncExceptionTests.java
@@ -27,6 +27,7 @@ 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;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.util.Log4jUtils;
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 23ff350..a4a8685 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftAsyncTests.java
@@ -38,6 +38,7 @@ import org.apache.ratis.retry.RetryPolicy;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.DelayLocalExecutionInjection;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
index 8d07d1f..dbbbed4 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftBasicTests.java
@@ -33,6 +33,7 @@ import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.BlockRequestHandlingInjection;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.metrics.RaftServerMetrics;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.impl.RetryCacheTestUtil;
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 6adb65e..864dd47 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftExceptionBaseTest.java
@@ -28,6 +28,7 @@ import
org.apache.ratis.protocol.exceptions.StaleReadException;
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.MiniRaftCluster;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.util.JavaUtils;
diff --git a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
index b664fd7..5a2428f 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RaftTestUtil.java
@@ -30,6 +30,7 @@ import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
import org.apache.ratis.server.impl.BlockRequestHandlingInjection;
import org.apache.ratis.server.impl.DelayLocalExecutionInjection;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.impl.ServerProtoUtils;
import org.apache.ratis.server.protocol.TermIndex;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
index 9b5a378..36272da 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RequestLimitAsyncBaseTest.java
@@ -28,6 +28,7 @@ import
org.apache.ratis.protocol.exceptions.ResourceUnavailableException;
import org.apache.ratis.retry.RetryPolicies;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.util.Log4jUtils;
diff --git a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
index b85e180..990c0d2 100644
--- a/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/RetryCacheTests.java
@@ -18,7 +18,8 @@
package org.apache.ratis;
import org.apache.log4j.Level;
-import org.apache.ratis.MiniRaftCluster.PeerChanges;
+import org.apache.ratis.server.impl.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster.PeerChanges;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.RaftClientRpc;
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 ddc649b..9ac5012 100644
--- a/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
+++ b/ratis-server/src/test/java/org/apache/ratis/WatchRequestTests.java
@@ -32,6 +32,7 @@ import org.apache.ratis.retry.RetryPolicies;
import org.apache.ratis.retry.RetryPolicy;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
import org.apache.ratis.statemachine.StateMachine;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
index 055cc95..94959aa 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/GroupInfoBaseTest.java
@@ -19,7 +19,6 @@ package org.apache.ratis.server.impl;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.api.GroupManagementApi;
import org.apache.ratis.protocol.*;
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 5531def..44bc676 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
@@ -19,7 +19,6 @@ package org.apache.ratis.server.impl;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.api.GroupManagementApi;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
index 880ddac..fd0b126 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/LeaderElectionTests.java
@@ -19,7 +19,6 @@ package org.apache.ratis.server.impl;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.metrics.RatisMetricRegistry;
diff --git a/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
similarity index 97%
rename from ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java
rename to
ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
index d0a1510..5c6acef 100644
--- a/ratis-server/src/test/java/org/apache/ratis/MiniRaftCluster.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/MiniRaftCluster.java
@@ -15,8 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ratis;
+package org.apache.ratis.server.impl;
+import org.apache.ratis.BaseTest;
+import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
@@ -33,10 +35,6 @@ import org.apache.ratis.retry.RetryPolicies;
import org.apache.ratis.retry.RetryPolicy;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
-import org.apache.ratis.server.impl.BlockRequestHandlingInjection;
-import org.apache.ratis.server.impl.RaftServerImpl;
-import org.apache.ratis.server.impl.RaftServerProxy;
-import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.raftlog.memory.MemoryRaftLog;
import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.statemachine.StateMachine;
@@ -361,15 +359,15 @@ public abstract class MiniRaftCluster implements
Closeable {
}
final RaftProperties prop = new RaftProperties(properties);
RaftServerConfigKeys.setStorageDir(prop, Collections.singletonList(dir));
- return newRaftServer(id, getStateMachineRegistry(properties), group,
prop);
+ return ServerImplUtils.newRaftServer(id, group,
getStateMachineRegistry(prop), prop,
+ setPropertiesAndInitParameters(id, group, prop));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
- protected abstract RaftServerProxy newRaftServer(
- RaftPeerId id, StateMachine.Registry stateMachineRegistry , RaftGroup
group,
- RaftProperties properties) throws IOException;
+ protected abstract Parameters setPropertiesAndInitParameters(
+ RaftPeerId id, RaftGroup group, RaftProperties properties);
public void setStateMachineRegistry(StateMachine.Registry
stateMachineRegistry) {
this.stateMachineRegistry = stateMachineRegistry;
@@ -519,12 +517,13 @@ public abstract class MiniRaftCluster implements
Closeable {
return leader;
}
- IllegalStateException newIllegalStateExceptionForNoLeaders(RaftGroupId
groupId) {
+ public IllegalStateException
newIllegalStateExceptionForNoLeaders(RaftGroupId groupId) {
final String g = groupId == null? "": " for " + groupId;
return new IllegalStateException("No leader yet " + g + ": " +
printServers(groupId));
}
- IllegalStateException newIllegalStateExceptionForMultipleLeaders(RaftGroupId
groupId, List<RaftServer.Division> leaders) {
+ public IllegalStateException
newIllegalStateExceptionForMultipleLeaders(RaftGroupId groupId,
+ List<RaftServer.Division> leaders) {
final String g = groupId == null? "": " for " + groupId;
return new IllegalStateException("Found multiple leaders" + g
+ " at the same term (=" +
RaftServerTestUtil.getCurrentTerm(leaders.get(0))
@@ -545,7 +544,7 @@ public abstract class MiniRaftCluster implements Closeable {
});
}
- RaftServer.Division getLeader(RaftGroupId groupId, Runnable handleNoLeaders,
+ public RaftServer.Division getLeader(RaftGroupId groupId, Runnable
handleNoLeaders,
Consumer<List<RaftServer.Division>> handleMultipleLeaders) {
return getLeader(getLeaders(groupId), handleNoLeaders,
handleMultipleLeaders);
}
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 351434b..d0f99a5 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
@@ -19,8 +19,7 @@ package org.apache.ratis.server.impl;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
-import org.apache.ratis.MiniRaftCluster.PeerChanges;
+import org.apache.ratis.server.impl.MiniRaftCluster.PeerChanges;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
index 4df2680..e57dc37 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/RaftServerTestUtil.java
@@ -18,7 +18,6 @@
package org.apache.ratis.server.impl;
import org.apache.log4j.Level;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.proto.RaftProtos.RaftPeerRole;
import org.apache.ratis.protocol.ClientId;
import org.apache.ratis.protocol.ClientInvocationId;
@@ -40,7 +39,6 @@ import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.Collection;
-import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
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 e48888c..9c3649d 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
@@ -19,7 +19,6 @@ package org.apache.ratis.server.impl;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerPauseResumeTest.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerPauseResumeTest.java
index 216d2c5..da41625 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerPauseResumeTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/ServerPauseResumeTest.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.protocol.RaftPeerId;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/StateMachineShutdownTests.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/StateMachineShutdownTests.java
index 6008f2e..80ce505 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/StateMachineShutdownTests.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/StateMachineShutdownTests.java
@@ -19,7 +19,6 @@
package org.apache.ratis.server.impl;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
index de94d28..d87004e 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/impl/TestRatisServerMetricsBase.java
@@ -25,7 +25,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.protocol.ClientId;
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
b/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
index ea36a4a..907ea51 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/simulation/MiniRaftClusterWithSimulatedRpc.java
@@ -18,15 +18,13 @@
package org.apache.ratis.server.simulation;
import java.util.concurrent.TimeUnit;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftConfigKeys;
import org.apache.ratis.conf.ConfUtils;
+import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
-import org.apache.ratis.server.impl.RaftServerProxy;
-import org.apache.ratis.server.impl.ServerImplUtils;
-import org.apache.ratis.statemachine.StateMachine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,12 +87,10 @@ public class MiniRaftClusterWithSimulatedRpc extends
MiniRaftCluster {
}
@Override
- protected RaftServerProxy newRaftServer(
- RaftPeerId id, StateMachine.Registry stateMachineRegistry , RaftGroup
group,
- RaftProperties properties) throws IOException {
+ protected Parameters setPropertiesAndInitParameters(RaftPeerId id, RaftGroup
group, RaftProperties properties) {
serverRequestReply.addPeer(id);
client2serverRequestReply.addPeer(id);
- return ServerImplUtils.newRaftServer(id, group, stateMachineRegistry,
properties, parameters);
+ return parameters;
}
@Override
diff --git
a/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java
b/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java
index 507d04d..85b1d83 100644
---
a/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java
+++
b/ratis-server/src/test/java/org/apache/ratis/server/simulation/SimulatedServerRpc.java
@@ -33,7 +33,6 @@ import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.protocol.SetConfigurationRequest;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerRpc;
-import org.apache.ratis.server.impl.RaftServerProxy;
import org.apache.ratis.util.Daemon;
import org.apache.ratis.util.IOUtils;
import org.apache.ratis.util.JavaUtils;
@@ -52,7 +51,7 @@ import java.util.function.Supplier;
class SimulatedServerRpc implements RaftServerRpc {
static final Logger LOG = LoggerFactory.getLogger(SimulatedServerRpc.class);
- private final RaftServerProxy server;
+ private final RaftServer server;
private final RequestHandler<RaftServerRequest, RaftServerReply>
serverHandler;
private final RequestHandler<RaftClientRequest, RaftClientReply>
clientHandler;
private final ExecutorService executor = Executors.newFixedThreadPool(3,
Daemon::new);
@@ -60,7 +59,7 @@ class SimulatedServerRpc implements RaftServerRpc {
SimulatedServerRpc(RaftServer server,
SimulatedRequestReply<RaftServerRequest, RaftServerReply>
serverRequestReply,
SimulatedRequestReply<RaftClientRequest, RaftClientReply>
clientRequestReply) {
- this.server = (RaftServerProxy)server;
+ this.server = server;
final Supplier<String> id = () -> server.getId().toString();
this.serverHandler = new RequestHandler<>(id, "serverHandler",
serverRequestReply, serverHandlerImpl, 3);
diff --git
a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
index 89ab2da..3c55e16 100644
---
a/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
+++
b/ratis-server/src/test/java/org/apache/ratis/statemachine/RaftSnapshotBaseTest.java
@@ -25,7 +25,7 @@ import static
org.apache.ratis.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRI
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
index f2bf587..fc1ecb4 100644
---
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
+++
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerNoLeaderTimeout.java
@@ -22,6 +22,7 @@ import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.proto.RaftProtos;
import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
index 2888fe3..0d28bb5 100644
---
a/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
+++
b/ratis-test/src/test/java/org/apache/ratis/TestRaftServerSlownessDetection.java
@@ -23,6 +23,7 @@ import org.apache.ratis.metrics.RatisMetricRegistry;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.server.RaftServer;
import org.apache.ratis.server.RaftServerConfigKeys;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.RaftServerTestUtil;
import org.apache.ratis.server.simulation.MiniRaftClusterWithSimulatedRpc;
import org.apache.ratis.proto.RaftProtos;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
index a4121ff..a0192fe 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamAsyncClusterTests.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.datastream;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.impl.DataStreamClientImpl.DataStreamOutputImpl;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
index c7ff300..d3f82cd 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamBaseTest.java
@@ -18,7 +18,7 @@
package org.apache.ratis.datastream;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.impl.ClientProtoUtils;
import org.apache.ratis.client.impl.DataStreamClientImpl.DataStreamOutputImpl;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamClusterTests.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamClusterTests.java
index 2bc8c20..d9b7f5e 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamClusterTests.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/DataStreamClusterTests.java
@@ -18,7 +18,7 @@
package org.apache.ratis.datastream;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.client.impl.DataStreamClientImpl.DataStreamOutputImpl;
import
org.apache.ratis.datastream.DataStreamTestUtils.MultiDataStreamStateMachine;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
index a68b2e1..f5e97c1 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty.java
@@ -17,18 +17,15 @@
*/
package org.apache.ratis.datastream;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftConfigKeys;
+import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.grpc.MiniRaftClusterWithGrpc;
import org.apache.ratis.netty.NettyConfigKeys;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.rpc.SupportedRpcType;
-import org.apache.ratis.server.impl.RaftServerProxy;
-import org.apache.ratis.statemachine.StateMachine;
-
-import java.io.IOException;
/**
* A {@link MiniRaftCluster} with {{@link SupportedRpcType#GRPC}} and {@link
SupportedDataStreamType#NETTY}.
@@ -56,9 +53,8 @@ public class
MiniRaftClusterWithRpcTypeGrpcAndDataStreamTypeNetty extends MiniRa
}
@Override
- protected RaftServerProxy newRaftServer(RaftPeerId id, StateMachine.Registry
stateMachineRegistry, RaftGroup group,
- RaftProperties properties) throws IOException {
+ protected Parameters setPropertiesAndInitParameters(RaftPeerId id, RaftGroup
group, RaftProperties properties) {
NettyConfigKeys.DataStream.setPort(properties, getDataStreamPort(id,
group));
- return super.newRaftServer(id, stateMachineRegistry, group, properties);
+ return super.setPropertiesAndInitParameters(id, group, properties);
}
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
index 1a493e4..dc3465c 100644
---
a/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/datastream/MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty.java
@@ -17,18 +17,15 @@
*/
package org.apache.ratis.datastream;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftConfigKeys;
+import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.netty.MiniRaftClusterWithNetty;
import org.apache.ratis.netty.NettyConfigKeys;
import org.apache.ratis.protocol.RaftGroup;
import org.apache.ratis.protocol.RaftPeerId;
import org.apache.ratis.rpc.SupportedRpcType;
-import org.apache.ratis.server.impl.RaftServerProxy;
-import org.apache.ratis.statemachine.StateMachine;
-
-import java.io.IOException;
/**
* A {@link MiniRaftCluster} with {{@link SupportedRpcType#NETTY}} and {@link
SupportedDataStreamType#NETTY}.
@@ -56,9 +53,8 @@ public class
MiniRaftClusterWithRpcTypeNettyAndDataStreamTypeNetty extends MiniR
}
@Override
- protected RaftServerProxy newRaftServer(RaftPeerId id, StateMachine.Registry
stateMachineRegistry, RaftGroup group,
- RaftProperties properties) throws IOException {
+ protected Parameters setPropertiesAndInitParameters(RaftPeerId id, RaftGroup
group, RaftProperties properties) {
NettyConfigKeys.DataStream.setPort(properties, getDataStreamPort(id,
group));
- return super.newRaftServer(id, stateMachineRegistry, group, properties);
+ return super.setPropertiesAndInitParameters(id, group, properties);
}
}
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGroupManagementWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGroupManagementWithGrpc.java
index 657bfd1..1334eb5 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGroupManagementWithGrpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGroupManagementWithGrpc.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.grpc;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
public class TestGroupManagementWithGrpc extends GroupManagementBaseTest {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
index ff14230..350b246 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestGrpcMessageMetrics.java
@@ -18,7 +18,7 @@
package org.apache.ratis.grpc;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.grpc.server.GrpcService;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
index 1477a94..38d31c5 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestLogAppenderWithGrpc.java
@@ -19,7 +19,7 @@ package org.apache.ratis.grpc;
import org.apache.log4j.Level;
import org.apache.ratis.LogAppenderTests;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
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 ebee514..eddf1eb 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
@@ -30,7 +30,7 @@ import com.codahale.metrics.Gauge;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java
index c128d28..3830177 100644
---
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftSnapshotWithGrpc.java
@@ -19,7 +19,7 @@ package org.apache.ratis.grpc;
import java.util.Optional;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.metrics.MetricRegistries;
import org.apache.ratis.metrics.MetricRegistryInfo;
import org.apache.ratis.metrics.RatisMetricRegistry;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftWithGrpc.java
index 621b6ca..d89ae4a 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftWithGrpc.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRaftWithGrpc.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.grpc;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftBasicTests;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
index f6e8cfc..113386a 100644
--- a/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
+++ b/ratis-test/src/test/java/org/apache/ratis/grpc/TestRetryCacheWithGrpc.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.grpc;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RetryCacheTests;
import org.apache.ratis.conf.RaftProperties;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/netty/TestGroupManagementWithNetty.java
b/ratis-test/src/test/java/org/apache/ratis/netty/TestGroupManagementWithNetty.java
index e049e32..6a5f721 100644
---
a/ratis-test/src/test/java/org/apache/ratis/netty/TestGroupManagementWithNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/netty/TestGroupManagementWithNetty.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.netty;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
public class TestGroupManagementWithNetty extends GroupManagementBaseTest {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/netty/TestRaftSnapshotWithNetty.java
b/ratis-test/src/test/java/org/apache/ratis/netty/TestRaftSnapshotWithNetty.java
index da861d5..f1340ef 100644
---
a/ratis-test/src/test/java/org/apache/ratis/netty/TestRaftSnapshotWithNetty.java
+++
b/ratis-test/src/test/java/org/apache/ratis/netty/TestRaftSnapshotWithNetty.java
@@ -17,12 +17,9 @@
*/
package org.apache.ratis.netty;
-import org.apache.ratis.MiniRaftCluster;
-import org.apache.ratis.conf.RaftProperties;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.RaftSnapshotBaseTest;
-import java.io.IOException;
-
public class TestRaftSnapshotWithNetty extends RaftSnapshotBaseTest {
@Override
public MiniRaftCluster.Factory<?> getFactory() {
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 00b1e7c..a219175 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
@@ -19,7 +19,7 @@
package org.apache.ratis.retry;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.retry.ClientRetryEvent;
import org.apache.ratis.client.RaftClient;
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 85ab3e7..ec82692 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
@@ -19,7 +19,7 @@ package org.apache.ratis.server;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.RaftTestUtil.SimpleMessage;
import org.apache.ratis.client.RaftClient;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
index 6714e1c..7891141 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/TestRaftLogMetrics.java
@@ -35,7 +35,7 @@ import static
org.apache.ratis.metrics.RatisMetrics.RATIS_APPLICATION_NAME_METRI
import com.codahale.metrics.Timer;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.metrics.JVMMetrics;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
index 75c4d95..6047fef 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.util.concurrent.CompletableFuture;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.protocol.RaftGroupId;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
index ae6ddd0..1cfbf82 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/segmented/TestCacheEviction.java
@@ -18,7 +18,7 @@
package org.apache.ratis.server.raftlog.segmented;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil.SimpleOperation;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestGroupManagementWithSimulatedRpc.java
b/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestGroupManagementWithSimulatedRpc.java
index 73fbae9..2ae818a 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestGroupManagementWithSimulatedRpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestGroupManagementWithSimulatedRpc.java
@@ -17,7 +17,7 @@
*/
package org.apache.ratis.server.simulation;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.server.impl.GroupManagementBaseTest;
public class TestGroupManagementWithSimulatedRpc extends
GroupManagementBaseTest {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRaftSnapshotWithSimulatedRpc.java
b/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRaftSnapshotWithSimulatedRpc.java
index 8345872..1c76f7b 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRaftSnapshotWithSimulatedRpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRaftSnapshotWithSimulatedRpc.java
@@ -17,12 +17,9 @@
*/
package org.apache.ratis.server.simulation;
-import org.apache.ratis.MiniRaftCluster;
-import org.apache.ratis.conf.RaftProperties;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.statemachine.RaftSnapshotBaseTest;
-import java.io.IOException;
-
public class TestRaftSnapshotWithSimulatedRpc extends RaftSnapshotBaseTest {
@Override
public MiniRaftCluster.Factory<?> getFactory() {
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRatisServerMetricsWithSimulatedRpc.java
b/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRatisServerMetricsWithSimulatedRpc.java
index f7173bf..b4c4e82 100644
---
a/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRatisServerMetricsWithSimulatedRpc.java
+++
b/ratis-test/src/test/java/org/apache/ratis/server/simulation/TestRatisServerMetricsWithSimulatedRpc.java
@@ -17,8 +17,6 @@
*/
package org.apache.ratis.server.simulation;
-import org.apache.ratis.MiniRaftCluster;
-import org.apache.ratis.grpc.MiniRaftClusterWithGrpc;
import org.apache.ratis.server.impl.TestRatisServerMetricsBase;
/** Tests on Ratis server metrics with simulated rpc. */
diff --git
a/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
b/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
index 993118c..039fe1c 100644
---
a/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
+++
b/ratis-test/src/test/java/org/apache/ratis/statemachine/TestStateMachine.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.concurrent.TimeUnit;
import org.apache.log4j.Level;
import org.apache.ratis.BaseTest;
-import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.server.impl.MiniRaftCluster;
import org.apache.ratis.RaftTestUtil;
import org.apache.ratis.client.RaftClient;
import org.apache.ratis.conf.RaftProperties;
