Skip to content

Commit 6e98d22

Browse files
committed
Rename: SingleNodeCommunicationProvider -> SingleNodeConnectionProvider
1 parent 7d7bafd commit 6e98d22

File tree

6 files changed

+38
-11
lines changed

6 files changed

+38
-11
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
import org.tarantool.server.TarantoolBinaryPackage;
44

55
import java.io.IOException;
6-
import java.net.InetSocketAddress;
76
import java.nio.ByteBuffer;
8-
import java.nio.channels.SocketChannel;
97
import java.sql.SQLException;
108
import java.util.Arrays;
119
import java.util.concurrent.CompletableFuture;
@@ -96,7 +94,7 @@ public static void main(String[] args) throws IOException, InterruptedException,
9694
//config.sharedBufferSize = 0;
9795

9896
NodeCommunicationProvider nodeComm =
99-
new SingleNodeCommunicationProvider("localhost:3301", config.username, config.password);
97+
new SingleNodeConnectionProvider("localhost:3301", config.username, config.password);
10098

10199

102100
final TarantoolClientTestImpl client = new TarantoolClientTestImpl(nodeComm, config);

src/main/java/org/tarantool/SingleNodeCommunicationProvider.java renamed to src/main/java/org/tarantool/SingleNodeConnectionProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
import java.io.IOException;
77
import java.net.InetSocketAddress;
88

9-
public class SingleNodeCommunicationProvider implements NodeCommunicationProvider {
9+
public class SingleNodeConnectionProvider implements NodeCommunicationProvider {
1010

1111
private final TarantoolInstanceInfo tarantoolInstanceInfo;
1212

1313
private TarantoolInstanceConnection nodeConnection;
1414

15-
public SingleNodeCommunicationProvider(InetSocketAddress socketAddress, String username, String password) {
15+
public SingleNodeConnectionProvider(InetSocketAddress socketAddress, String username, String password) {
1616
this.tarantoolInstanceInfo = TarantoolInstanceInfo.create(socketAddress, username, password);
1717
}
1818

19-
public SingleNodeCommunicationProvider(String address, String username, String password) {
19+
public SingleNodeConnectionProvider(String address, String username, String password) {
2020
this.tarantoolInstanceInfo = TarantoolInstanceInfo.create(address, username, password);
2121
}
2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ public void run() {
8484
});
8585

8686
public TarantoolClientImpl(InetSocketAddress socketAddress, TarantoolClientConfig config) {
87-
this(new SingleNodeCommunicationProvider(socketAddress, config.username, config.password), config);
87+
this(new SingleNodeConnectionProvider(socketAddress, config.username, config.password), config);
8888
}
8989

9090
public TarantoolClientImpl(String address, TarantoolClientConfig config) {
91-
this(new SingleNodeCommunicationProvider(address, config.username, config.password), config);
91+
this(new SingleNodeConnectionProvider(address, config.username, config.password), config);
9292
}
9393

9494
protected TarantoolClientImpl() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class AbstractTarantoolConnectorIT {
4242
RESTART_TIMEOUT);
4343

4444
protected static final NodeCommunicationProvider testNodeCommunicationProvider =
45-
new TestNodeCommunicationProvider(host + ":" + port, username, password, RESTART_TIMEOUT);
45+
new TestNodeConnectionProvider(host + ":" + port, username, password, RESTART_TIMEOUT);
4646

4747
protected static TarantoolControl control;
4848
protected static TarantoolConsole console;

src/test/java/org/tarantool/ClientReconnectClusterIT.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,33 @@ private TarantoolClusterClient makeClient(String...addrs) {
115115
config.slaveHosts = addrs;
116116
return new TarantoolClusterClient(config);
117117
}
118+
119+
120+
@Test
121+
void testUpdateNodeList() {
122+
control.start(SRV1);
123+
control.start(SRV2);
124+
control.start(SRV3);
125+
126+
control.waitStarted(SRV1);
127+
control.waitStarted(SRV2);
128+
control.waitStarted(SRV3);
129+
130+
String srv1_address = "localhost:" + PORTS[0];
131+
String srv2_address = "127.0.0.1:" + PORTS[1];
132+
String srv3_address = "localhost:" + PORTS[2];
133+
final TarantoolClusterClient client = makeClient(
134+
srv1_address,
135+
srv2_address);
136+
137+
138+
List<?> ids = client.syncOps().eval(
139+
"return box.schema.space.create('rr_test').id, " +
140+
"box.space.rr_test:create_index('primary').id");
141+
142+
143+
// client.ref
144+
//todo
145+
146+
}
118147
}

src/test/java/org/tarantool/TestNodeCommunicationProvider.java renamed to src/test/java/org/tarantool/TestNodeConnectionProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
import java.io.IOException;
66

7-
public class TestNodeCommunicationProvider extends SingleNodeCommunicationProvider {
7+
public class TestNodeConnectionProvider extends SingleNodeConnectionProvider {
88
private final long restartTimeout;
99

10-
public TestNodeCommunicationProvider(String address, String username, String password, long restartTimeout1) {
10+
public TestNodeConnectionProvider(String address, String username, String password, long restartTimeout1) {
1111
super(address, username, password);
1212

1313
this.restartTimeout = restartTimeout1;

0 commit comments

Comments
 (0)