You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by as...@apache.org on 2021/03/01 18:58:46 UTC
[ignite-3] branch ignite-14149 updated: IGNITE-14149 Cleanup code 3.
This is an automated email from the ASF dual-hosted git repository.
ascherbakov pushed a commit to branch ignite-14149
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-14149 by this push:
new 2fb7fbe IGNITE-14149 Cleanup code 3.
2fb7fbe is described below
commit 2fb7fbe111e3fc43cc37967d91bfb73742811655
Author: Alexey Scherbakov <al...@gmail.com>
AuthorDate: Mon Mar 1 21:58:35 2021 +0300
IGNITE-14149 Cleanup code 3.
---
.../message/impl/RaftClientMessageFactoryImpl.java | 3 ++-
.../ignite/raft/client/rpc/RaftGroupRpcClient.java | 2 +-
.../client/service/RaftGroupClientRequestService.java | 6 +++---
.../java/org/apache/ignite/raft/client/MockUtils.java | 8 ++++----
.../ignite/raft/client/rpc/RaftGroupRpcClientTest.java | 10 +++++-----
.../service/RaftGroupClientRequestServiceTest.java | 16 +++++++++-------
6 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/modules/raft-client/src/main/java/org/apache/ignite/raft/client/message/impl/RaftClientMessageFactoryImpl.java b/modules/raft-client/src/main/java/org/apache/ignite/raft/client/message/impl/RaftClientMessageFactoryImpl.java
index 9464368..77b825b 100644
--- a/modules/raft-client/src/main/java/org/apache/ignite/raft/client/message/impl/RaftClientMessageFactoryImpl.java
+++ b/modules/raft-client/src/main/java/org/apache/ignite/raft/client/message/impl/RaftClientMessageFactoryImpl.java
@@ -23,7 +23,8 @@ import org.apache.ignite.raft.client.message.RaftClientMessages;
* Raft client message factory.
*/
public class RaftClientMessageFactoryImpl implements RaftClientMessageFactory {
- public static RaftClientMessageFactoryImpl INSTANCE = new RaftClientMessageFactoryImpl();
+ /** */
+ public static RaftClientMessageFactoryImpl MESSAGE_FACTORY = new RaftClientMessageFactoryImpl();
@Override public RaftClientMessages.AddPeerRequest.Builder createAddPeerRequest() {
return new AddPeerRequestImpl();
diff --git a/modules/raft-client/src/main/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClient.java b/modules/raft-client/src/main/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClient.java
index b4f1a9e..4ca70c2 100644
--- a/modules/raft-client/src/main/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClient.java
+++ b/modules/raft-client/src/main/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClient.java
@@ -148,7 +148,7 @@ public interface RaftGroupRpcClient {
<R> CompletableFuture<UserResponse<R>> submit(UserRequest request);
/**
- * @return A message builder factory.
+ * @return An underlying message builder factory.
*/
RaftClientMessageFactory factory();
}
diff --git a/modules/raft-client/src/main/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestService.java b/modules/raft-client/src/main/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestService.java
index c9e2fe8..722fcfa 100644
--- a/modules/raft-client/src/main/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestService.java
+++ b/modules/raft-client/src/main/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestService.java
@@ -24,10 +24,10 @@ import java.util.concurrent.CompletableFuture;
*/
public interface RaftGroupClientRequestService {
/**
- * Submits a custom request to a raft group leader. If a leader is not initialized yet will try to resolve it.
- * @param request
+ * Submits a custom request to a replication group leader. If a leader is not initialized yet will try to resolve it.
+ * @param request User request.
* @param <R> Response type.
- * @return A future.
+ * @return A future with the result.
*/
<R> CompletableFuture<R> submit(Object request);
}
diff --git a/modules/raft-client/src/test/java/org/apache/ignite/raft/client/MockUtils.java b/modules/raft-client/src/test/java/org/apache/ignite/raft/client/MockUtils.java
index 8a82903..e96c499 100644
--- a/modules/raft-client/src/test/java/org/apache/ignite/raft/client/MockUtils.java
+++ b/modules/raft-client/src/test/java/org/apache/ignite/raft/client/MockUtils.java
@@ -27,7 +27,7 @@ import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import static org.apache.ignite.raft.client.message.impl.RaftClientMessageFactoryImpl.INSTANCE;
+import static org.apache.ignite.raft.client.message.impl.RaftClientMessageFactoryImpl.MESSAGE_FACTORY;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.argThat;
@@ -51,7 +51,7 @@ public class MockUtils {
public static void mockUserInput1(NetworkCluster cluster) {
Mockito.doAnswer(new Answer() {
@Override public Object answer(InvocationOnMock invocation) throws Throwable {
- RaftClientMessages.UserResponse resp = INSTANCE.createUserResponse().setResponse(new TestOutput1()).build();
+ RaftClientMessages.UserResponse resp = MESSAGE_FACTORY.createUserResponse().setResponse(new TestOutput1()).build();
return CompletableFuture.completedFuture(resp);
}
@@ -65,7 +65,7 @@ public class MockUtils {
public static void mockUserInput2(NetworkCluster cluster) {
Mockito.doAnswer(new Answer() {
@Override public Object answer(InvocationOnMock invocation) throws Throwable {
- RaftClientMessages.UserResponse resp = INSTANCE.createUserResponse().setResponse(new TestOutput2()).build();
+ RaftClientMessages.UserResponse resp = MESSAGE_FACTORY.createUserResponse().setResponse(new TestOutput2()).build();
return CompletableFuture.completedFuture(resp);
}
@@ -79,7 +79,7 @@ public class MockUtils {
public static void mockLeaderRequest(NetworkCluster cluster, boolean timeout) {
Mockito.doAnswer(new Answer() {
@Override public Object answer(InvocationOnMock invocation) throws Throwable {
- RaftClientMessages.GetLeaderResponse resp = INSTANCE.createGetLeaderResponse().setLeaderId(LEADER).build();
+ RaftClientMessages.GetLeaderResponse resp = MESSAGE_FACTORY.createGetLeaderResponse().setLeaderId(LEADER).build();
return timeout ? CompletableFuture.failedFuture(new TimeoutException()) : CompletableFuture.completedFuture(resp);
}
diff --git a/modules/raft-client/src/test/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClientTest.java b/modules/raft-client/src/test/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClientTest.java
index d24db8f..9a45a79 100644
--- a/modules/raft-client/src/test/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClientTest.java
+++ b/modules/raft-client/src/test/java/org/apache/ignite/raft/client/rpc/RaftGroupRpcClientTest.java
@@ -38,7 +38,7 @@ import static org.apache.ignite.raft.client.MockUtils.LEADER;
import static org.apache.ignite.raft.client.MockUtils.mockLeaderRequest;
import static org.apache.ignite.raft.client.MockUtils.mockUserInput1;
import static org.apache.ignite.raft.client.MockUtils.mockUserInput2;
-import static org.apache.ignite.raft.client.message.impl.RaftClientMessageFactoryImpl.INSTANCE;
+import static org.apache.ignite.raft.client.message.impl.RaftClientMessageFactoryImpl.MESSAGE_FACTORY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -54,7 +54,7 @@ public class RaftGroupRpcClientTest {
mockLeaderRequest(cluster, false);
- RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, INSTANCE, 5_000, singleton(LEADER.getNode()));
+ RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, MESSAGE_FACTORY, 5_000, singleton(LEADER.getNode()));
PeerId leaderId = client.refreshLeader(groupId).get();
@@ -68,7 +68,7 @@ public class RaftGroupRpcClientTest {
mockLeaderRequest(cluster, false);
- RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, INSTANCE, 5_000, singleton(LEADER.getNode()));
+ RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, MESSAGE_FACTORY, 5_000, singleton(LEADER.getNode()));
int cnt = 20;
@@ -112,7 +112,7 @@ public class RaftGroupRpcClientTest {
mockLeaderRequest(cluster, true);
- RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, INSTANCE, 5_000, singleton(LEADER.getNode()));
+ RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, MESSAGE_FACTORY, 5_000, singleton(LEADER.getNode()));
try {
client.refreshLeader(groupId).get();
@@ -132,7 +132,7 @@ public class RaftGroupRpcClientTest {
mockUserInput1(cluster);
mockUserInput2(cluster);
- RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, INSTANCE, 5_000, singleton(LEADER.getNode()));
+ RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, MESSAGE_FACTORY, 5_000, singleton(LEADER.getNode()));
RaftClientMessages.UserRequest req1 =
client.factory().createUserRequest().setGroupId(groupId).setRequest(new TestInput1()).build();
diff --git a/modules/raft-client/src/test/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestServiceTest.java b/modules/raft-client/src/test/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestServiceTest.java
index 4aaa2a6..ea3adc4 100644
--- a/modules/raft-client/src/test/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestServiceTest.java
+++ b/modules/raft-client/src/test/java/org/apache/ignite/raft/client/service/RaftGroupClientRequestServiceTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.raft.client.MockUtils.TestOutput2;
import org.apache.ignite.raft.client.rpc.RaftGroupRpcClient;
import org.apache.ignite.raft.client.rpc.impl.RaftGroupRpcClientImpl;
import org.apache.ignite.raft.client.service.impl.RaftGroupClientRequestServiceImpl;
+import org.apache.ignite.raft.client.service.impl.RaftGroupManagementServiceImpl;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
@@ -36,7 +37,7 @@ import static org.apache.ignite.raft.client.MockUtils.LEADER;
import static org.apache.ignite.raft.client.MockUtils.mockLeaderRequest;
import static org.apache.ignite.raft.client.MockUtils.mockUserInput1;
import static org.apache.ignite.raft.client.MockUtils.mockUserInput2;
-import static org.apache.ignite.raft.client.message.impl.RaftClientMessageFactoryImpl.INSTANCE;
+import static org.apache.ignite.raft.client.message.impl.RaftClientMessageFactoryImpl.MESSAGE_FACTORY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -54,24 +55,25 @@ public class RaftGroupClientRequestServiceTest {
mockUserInput1(cluster);
mockUserInput2(cluster);
- RaftGroupRpcClient client = new RaftGroupRpcClientImpl(cluster, INSTANCE, 5_000, singleton(LEADER.getNode()));
+ RaftGroupRpcClient rpcClient = new RaftGroupRpcClientImpl(cluster, MESSAGE_FACTORY, 5_000, singleton(LEADER.getNode()));
- RaftGroupClientRequestService service = new RaftGroupClientRequestServiceImpl(client, groupId);
+ RaftGroupClientRequestService reqService = new RaftGroupClientRequestServiceImpl(rpcClient, groupId);
+ RaftGroupManagmentService mgmtService = new RaftGroupManagementServiceImpl(rpcClient, groupId);
- assertNull(client.state(groupId).leader());
+ assertNull(mgmtService.getLeader());
- CompletableFuture<TestOutput1> fut1 = service.submit(new TestInput1());
+ CompletableFuture<TestOutput1> fut1 = reqService.submit(new TestInput1());
TestOutput1 output1 = fut1.get();
assertNotNull(output1);
- CompletableFuture<TestOutput2> fut2 = service.submit(new TestInput2());
+ CompletableFuture<TestOutput2> fut2 = reqService.submit(new TestInput2());
TestOutput2 output2 = fut2.get();
assertNotNull(output2);
- assertEquals(LEADER, client.state(groupId).leader());
+ assertEquals(LEADER, mgmtService.getLeader());
}
}