Rename: NodeCommunicationProvider -> InstanceConnectionProvider

Author: pda4code

src/it/java/org/tarantool/TestTarantoolClient.java

@@ -33,7 +33,7 @@ public static class TarantoolClientTestImpl extends TarantoolClientImpl {
         final Semaphore s = new Semaphore(0);
         long latency = 1L;
 
-        public TarantoolClientTestImpl(NodeCommunicationProvider nodeComm, TarantoolClientConfig options) {
+        public TarantoolClientTestImpl(InstanceConnectionProvider nodeComm, TarantoolClientConfig options) {
             super(nodeComm, options);
             Thread t = new Thread(new Runnable() {
                 @Override
@@ -93,7 +93,7 @@ public static void main(String[] args) throws IOException, InterruptedException,
 
         //config.sharedBufferSize = 0;
 
-        NodeCommunicationProvider nodeComm =
+        InstanceConnectionProvider nodeComm =
                 new SingleNodeConnectionProvider("localhost:3301", config.username, config.password);
 
 

src/main/java/org/tarantool/NodeCommunicationProvider.java renamed to src/main/java/org/tarantool/InstanceConnectionProvider.java

@@ -5,7 +5,7 @@
 import java.io.*;
 import java.nio.*;
 
-public interface NodeCommunicationProvider {
+public interface InstanceConnectionProvider {
 
     TarantoolInstanceConnection connect() throws IOException;
 

src/main/java/org/tarantool/RoundRobinNodeCommunicationProvider.java renamed to src/main/java/org/tarantool/RoundRobinInstanceConnectionProvider.java

@@ -3,12 +3,10 @@
 import org.tarantool.server.*;
 
 import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
 import java.util.*;
 import java.util.stream.*;
 
-public class RoundRobinNodeCommunicationProvider implements NodeCommunicationProvider {
+public class RoundRobinInstanceConnectionProvider implements InstanceConnectionProvider {
 
     /** Timeout to establish socket connection with an individual server. */
     private final int timeout; // 0 is infinite.
@@ -21,7 +19,7 @@ public class RoundRobinNodeCommunicationProvider implements NodeCommunicationPro
     private TarantoolInstanceInfo[] nodes;
     private int pos = 0;
 
-    public RoundRobinNodeCommunicationProvider(String[] slaveHosts, String username, String password, int timeout) {
+    public RoundRobinInstanceConnectionProvider(String[] slaveHosts, String username, String password, int timeout) {
         this.timeout = timeout;
         if (slaveHosts == null || slaveHosts.length < 1) {
             throw new IllegalArgumentException("slave hosts is null ot empty");

src/main/java/org/tarantool/SingleNodeConnectionProvider.java

@@ -6,7 +6,7 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-public class SingleNodeConnectionProvider implements NodeCommunicationProvider {
+public class SingleNodeConnectionProvider implements InstanceConnectionProvider {
 
     private final TarantoolInstanceInfo tarantoolInstanceInfo;
 

src/main/java/org/tarantool/TarantoolClientImpl.java

@@ -33,7 +33,7 @@ public class TarantoolClientImpl extends TarantoolBase<Future<?>> implements Tar
     /**
      * External
      */
-    protected NodeCommunicationProvider communicationProvider;
+    protected InstanceConnectionProvider communicationProvider;
 
     /**
      * Max amount of one by one reconnect attempts
@@ -95,12 +95,12 @@ protected TarantoolClientImpl() {
 //        delegate init to a descendant
     }
 
-    public TarantoolClientImpl(NodeCommunicationProvider communicationProvider, TarantoolClientConfig config) {
+    public TarantoolClientImpl(InstanceConnectionProvider communicationProvider, TarantoolClientConfig config) {
         super();
         init(communicationProvider, config);
     }
 
-    protected void init(NodeCommunicationProvider communicationProvider, TarantoolClientConfig config) {
+    protected void init(InstanceConnectionProvider communicationProvider, TarantoolClientConfig config) {
         this.thumbstone = NOT_INIT_EXCEPTION;
         this.config = config;
         this.initialRequestSize = config.defaultRequestSize;
@@ -183,7 +183,7 @@ private boolean areRetriesExhausted(int retries) {
         return retries >= limit;
     }
 
-    protected void connect(final NodeCommunicationProvider communicationProvider) throws Exception {
+    protected void connect(final InstanceConnectionProvider communicationProvider) throws Exception {
         try {
             currConnection = communicationProvider.connect();
         } catch (IOException e) {

src/main/java/org/tarantool/TarantoolClusterClient.java

@@ -13,7 +13,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.locks.LockSupport;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;
 
 import static org.tarantool.TarantoolClientImpl.StateHelper.CLOSED;
 
@@ -47,15 +46,15 @@ public class TarantoolClusterClient extends TarantoolClientImpl {
      */
     public TarantoolClusterClient(TarantoolClusterClientConfig config) {
 //        this(config, new RoundRobinSocketProviderImpl(config.slaveHosts).setTimeout(config.operationExpiryTimeMillis));
-        this(config, new RoundRobinNodeCommunicationProvider(config.slaveHosts,
+        this(config, new RoundRobinInstanceConnectionProvider(config.slaveHosts,
                 config.username, config.password, config.operationExpiryTimeMillis));
     }
 
     /**
      * @param provider Socket channel provider.
      * @param config Configuration.
      */
-    public TarantoolClusterClient(TarantoolClusterClientConfig config, NodeCommunicationProvider provider) {
+    public TarantoolClusterClient(TarantoolClusterClientConfig config, InstanceConnectionProvider provider) {
         init(provider, config);
 
         this.executor = config.executor == null ?
@@ -85,7 +84,7 @@ protected Collection<TarantoolInstanceInfo> refreshServerList() {
         initLock.lock();
         try {
 
-            RoundRobinNodeCommunicationProvider cp = (RoundRobinNodeCommunicationProvider) this.communicationProvider;
+            RoundRobinInstanceConnectionProvider cp = (RoundRobinInstanceConnectionProvider) this.communicationProvider;
 
             int sameNodeIndex = newServerList.indexOf(currConnection.getNodeInfo());
             if (sameNodeIndex != -1) {
@@ -123,7 +122,7 @@ protected Collection<TarantoolInstanceInfo> refreshServerList() {
     }
 
     @Override
-    protected void connect(NodeCommunicationProvider communicationProvider) throws Exception {
+    protected void connect(InstanceConnectionProvider communicationProvider) throws Exception {
         //region drop all registered selectors from channel
 //        if (currConnection != null) {
 //            SelectionKey registeredKey = currConnection.getChannel().keyFor(readSelector);

src/test/java/org/tarantool/AbstractTarantoolConnectorIT.java

@@ -41,7 +41,7 @@ public abstract class AbstractTarantoolConnectorIT {
     protected static final SocketChannelProvider socketChannelProvider = new TestSocketChannelProvider(host, port,
         RESTART_TIMEOUT);
 
-    protected static final NodeCommunicationProvider testNodeCommunicationProvider =
+    protected static final InstanceConnectionProvider TEST_INSTANCE_CONNECTION_PROVIDER =
             new TestNodeConnectionProvider(host + ":" + port, username, password, RESTART_TIMEOUT);
 
     protected static TarantoolControl control;
@@ -137,7 +137,7 @@ protected void checkTupleResult(Object res, List tuple) {
 
     protected TarantoolClient makeClient() {
 //        return new TarantoolClientImpl(socketChannelProvider, makeClientConfig());
-        return new TarantoolClientImpl(testNodeCommunicationProvider, makeClientConfig());
+        return new TarantoolClientImpl(TEST_INSTANCE_CONNECTION_PROVIDER, makeClientConfig());
     }
 
     protected static TarantoolClientConfig makeClientConfig() {

src/test/java/org/tarantool/ClientReconnectIT.java

@@ -7,8 +7,6 @@
 import org.tarantool.server.*;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
@@ -91,21 +89,21 @@ public void testSpuriousReturnFromPark() {
 
         TarantoolClientConfig config = makeClientConfig();
 
-        NodeCommunicationProvider nodeCommunicationProvider = new NodeCommunicationProvider() {
+        InstanceConnectionProvider instanceConnectionProvider = new InstanceConnectionProvider() {
 
             @Override
             public TarantoolInstanceConnection connect() throws IOException {
                 latch.countDown();
-                return testNodeCommunicationProvider.connect();
+                return TEST_INSTANCE_CONNECTION_PROVIDER.connect();
             }
 
             @Override
             public String getDescription() {
-                return testNodeCommunicationProvider.getDescription();
+                return TEST_INSTANCE_CONNECTION_PROVIDER.getDescription();
             }
         };
 
-        client = new TarantoolClientImpl(nodeCommunicationProvider, config);
+        client = new TarantoolClientImpl(instanceConnectionProvider, config);
         client.syncOps().ping();
 
         // The park() will return inside connector thread.
@@ -126,7 +124,7 @@ public String getDescription() {
      */
     @Test
     public void testCloseWhileOperationsAreInProgress() {
-        client = new TarantoolClientImpl(testNodeCommunicationProvider, makeClientConfig()) {
+        client = new TarantoolClientImpl(TEST_INSTANCE_CONNECTION_PROVIDER, makeClientConfig()) {
             @Override
             protected void write(Code code, Long syncId, Long schemaId, Object... args) {
                 // Skip write.
@@ -154,7 +152,7 @@ public void execute() throws Throwable {
     @Test
     public void testReconnectWhileOperationsAreInProgress() {
         final AtomicBoolean writeEnabled = new AtomicBoolean(false);
-        client = new TarantoolClientImpl(testNodeCommunicationProvider, makeClientConfig()) {
+        client = new TarantoolClientImpl(TEST_INSTANCE_CONNECTION_PROVIDER, makeClientConfig()) {
             @Override
             protected void write(Code code, Long syncId, Long schemaId, Object... args) throws Exception {
                 if (writeEnabled.get()) {
@@ -198,9 +196,9 @@ public void execute() throws Throwable {
     @Test
     public void testConcurrentCloseAndReconnect() {
         final CountDownLatch latch = new CountDownLatch(2);
-        client = new TarantoolClientImpl(testNodeCommunicationProvider, makeClientConfig()) {
+        client = new TarantoolClientImpl(TEST_INSTANCE_CONNECTION_PROVIDER, makeClientConfig()) {
             @Override
-            protected void connect(NodeCommunicationProvider communicationProvider) throws Exception {
+            protected void connect(InstanceConnectionProvider communicationProvider) throws Exception {
                 latch.countDown();
                 super.connect(communicationProvider);
             }

src/test/perf/org/tarantool/MyBenchmark.java

@@ -1,11 +1,9 @@
 package org.tarantool;
 
 import org.openjdk.jmh.annotations.*;
-import org.tarantool.server.TarantoolBinaryPackage;
 import org.tarantool.server.TarantoolInstanceConnection;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
 import java.util.concurrent.*;
@@ -29,7 +27,7 @@ public SocketChannel get() {
     /**
      * todo
      */
-    private static class DodgeCommunication implements NodeCommunicationProvider {
+    private static class DodgeCommunication implements InstanceConnectionProvider {
         @Override
         public TarantoolInstanceConnection connect() throws IOException {
             return null;