Moving to Atomix version 1.0.0-rc3
Change-Id: I75572a52b530741f482455d59922327121a03999
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
index adf9f82..98f7657 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentMapTest.java
@@ -116,7 +116,7 @@
final byte[] rawFooValue = Tools.getBytesUtf8("Hello foo!");
final byte[] rawBarValue = Tools.getBytesUtf8("Hello bar!");
- AtomixConsistentMap map = createAtomixClient().get("test", AtomixConsistentMap.class).join();
+ AtomixConsistentMap map = createAtomixClient().getResource("test", AtomixConsistentMap.class).join();
map.isEmpty().thenAccept(result -> {
assertTrue(result);
@@ -246,7 +246,7 @@
final byte[] value2 = Tools.getBytesUtf8("value2");
final byte[] value3 = Tools.getBytesUtf8("value3");
- AtomixConsistentMap map = createAtomixClient().get("test", AtomixConsistentMap.class).join();
+ AtomixConsistentMap map = createAtomixClient().getResource("test", AtomixConsistentMap.class).join();
map.computeIfAbsent("foo", k -> value1).thenAccept(result -> {
assertTrue(Arrays.equals(Versioned.valueOrElse(result, null), value1));
@@ -284,7 +284,7 @@
final byte[] value2 = Tools.getBytesUtf8("value2");
final byte[] value3 = Tools.getBytesUtf8("value3");
- AtomixConsistentMap map = createAtomixClient().get("test", AtomixConsistentMap.class).join();
+ AtomixConsistentMap map = createAtomixClient().getResource("test", AtomixConsistentMap.class).join();
TestMapEventListener listener = new TestMapEventListener();
// add listener; insert new value into map and verify an INSERT event is received.
@@ -343,7 +343,7 @@
final byte[] value1 = Tools.getBytesUtf8("value1");
final byte[] value2 = Tools.getBytesUtf8("value2");
- AtomixConsistentMap map = createAtomixClient().get("test", AtomixConsistentMap.class).join();
+ AtomixConsistentMap map = createAtomixClient().getResource("test", AtomixConsistentMap.class).join();
TestMapEventListener listener = new TestMapEventListener();
map.addListener(listener).join();
@@ -398,7 +398,7 @@
final byte[] value1 = Tools.getBytesUtf8("value1");
final byte[] value2 = Tools.getBytesUtf8("value2");
- AtomixConsistentMap map = createAtomixClient().get("test", AtomixConsistentMap.class).join();
+ AtomixConsistentMap map = createAtomixClient().getResource("test", AtomixConsistentMap.class).join();
TestMapEventListener listener = new TestMapEventListener();
map.addListener(listener).join();
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorTest.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorTest.java
index 2b1f56b..0c8e5c5 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorTest.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixLeaderElectorTest.java
@@ -60,7 +60,7 @@
private void leaderElectorRunTests(int numServers) throws Throwable {
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).thenAccept(result -> {
assertEquals(node1, result.leaderNodeId());
assertEquals(1, result.leader().term());
@@ -68,7 +68,7 @@
assertEquals(node1, result.candidates().get(0));
}).join();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
elector2.run("foo", node2).thenAccept(result -> {
assertEquals(node1, result.leaderNodeId());
assertEquals(1, result.leader().term());
@@ -91,10 +91,10 @@
private void leaderElectorWithdrawTests(int numServers) throws Throwable {
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).join();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
elector2.run("foo", node2).join();
LeaderEventListener listener1 = new LeaderEventListener();
@@ -133,11 +133,11 @@
private void leaderElectorAnointTests(int numServers) throws Throwable {
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
Atomix client3 = createAtomixClient();
- AtomixLeaderElector elector3 = client3.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector3 = client3.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).join();
elector2.run("foo", node2).join();
@@ -195,11 +195,11 @@
private void leaderElectorPromoteTests(int numServers) throws Throwable {
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
Atomix client3 = createAtomixClient();
- AtomixLeaderElector elector3 = client3.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector3 = client3.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).join();
elector2.run("foo", node2).join();
@@ -252,10 +252,10 @@
private void leaderElectorLeaderSessionCloseTests(int numServers) throws Throwable {
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).join();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
LeaderEventListener listener = new LeaderEventListener();
elector2.run("foo", node2).join();
elector2.addChangeListener(listener).join();
@@ -280,10 +280,10 @@
private void leaderElectorNonLeaderSessionCloseTests(int numServers) throws Throwable {
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).join();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
LeaderEventListener listener = new LeaderEventListener();
elector2.run("foo", node2).join();
elector1.addChangeListener(listener).join();
@@ -309,8 +309,8 @@
createCopycatServers(numServers);
Atomix client1 = createAtomixClient();
Atomix client2 = createAtomixClient();
- AtomixLeaderElector elector1 = client1.get("test-elector", AtomixLeaderElector.class).join();
- AtomixLeaderElector elector2 = client2.get("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector1 = client1.getResource("test-elector", AtomixLeaderElector.class).join();
+ AtomixLeaderElector elector2 = client2.getResource("test-elector", AtomixLeaderElector.class).join();
elector1.run("foo", node1).join();
elector2.run("foo", node2).join();
elector2.run("bar", node2).join();
diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
index a5c197b..bca67a0 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
@@ -26,7 +26,6 @@
import io.atomix.copycat.server.storage.Storage;
import io.atomix.copycat.server.storage.StorageLevel;
import io.atomix.manager.state.ResourceManagerState;
-import io.atomix.resource.ResourceRegistry;
import io.atomix.resource.ResourceType;
import java.io.File;
@@ -90,7 +89,7 @@
for (int i = 0; i < nodes; i++) {
CopycatServer server = createCopycatServer(members.get(i));
- server.open().thenRun(latch::countDown);
+ server.start().thenRun(latch::countDown);
servers.add(server);
}
@@ -103,15 +102,13 @@
* Creates a Copycat server.
*/
protected CopycatServer createCopycatServer(Address address) {
- ResourceRegistry resourceRegistry = new ResourceRegistry();
- resourceRegistry.register(resourceType());
CopycatServer server = CopycatServer.builder(address, members)
.withTransport(new LocalTransport(registry))
.withStorage(Storage.builder()
.withStorageLevel(StorageLevel.DISK)
.withDirectory(TEST_DIR + "/" + address.port())
.build())
- .withStateMachine(() -> new ResourceManagerState(resourceRegistry))
+ .withStateMachine(ResourceManagerState::new)
.withSerializer(serializer.clone())
.withHeartbeatInterval(Duration.ofMillis(25))
.withElectionTimeout(Duration.ofMillis(50))
@@ -134,7 +131,7 @@
.toArray(CompletableFuture[]::new));
closeClients.thenCompose(v -> CompletableFuture.allOf(copycatServers.stream()
- .map(CopycatServer::close)
+ .map(CopycatServer::stop)
.toArray(CompletableFuture[]::new))).join();
deleteDirectory(TEST_DIR);
@@ -171,7 +168,6 @@
Atomix client = AtomixClient.builder(members)
.withTransport(new LocalTransport(registry))
.withSerializer(serializer.clone())
- .withResourceResolver(r -> r.register(resourceType()))
.build();
client.open().thenRun(latch::countDown);
atomixClients.add(client);