Migrating to latest Atomix
Change-Id: Ie636d1b2623b7f83572dca0d70bd56734379e61a
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 786a538..82265ad 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
@@ -15,17 +15,16 @@
*/
package org.onosproject.store.primitives.resources.impl;
-import io.atomix.Atomix;
import io.atomix.AtomixClient;
import io.atomix.catalyst.serializer.Serializer;
import io.atomix.catalyst.transport.Address;
-import io.atomix.catalyst.transport.LocalServerRegistry;
-import io.atomix.catalyst.transport.LocalTransport;
+import io.atomix.catalyst.transport.local.LocalServerRegistry;
+import io.atomix.catalyst.transport.local.LocalTransport;
import io.atomix.copycat.client.CopycatClient;
import io.atomix.copycat.server.CopycatServer;
import io.atomix.copycat.server.storage.Storage;
import io.atomix.copycat.server.storage.StorageLevel;
-import io.atomix.manager.state.ResourceManagerState;
+import io.atomix.manager.internal.ResourceManagerState;
import io.atomix.resource.ResourceType;
import java.io.File;
@@ -53,7 +52,7 @@
protected List<Address> members;
protected List<CopycatClient> copycatClients = new ArrayList<>();
protected List<CopycatServer> copycatServers = new ArrayList<>();
- protected List<Atomix> atomixClients = new ArrayList<>();
+ protected List<AtomixClient> atomixClients = new ArrayList<>();
protected List<CopycatServer> atomixServers = new ArrayList<>();
protected Serializer serializer = CatalystSerializers.getSerializer();
@@ -89,7 +88,7 @@
for (int i = 0; i < nodes; i++) {
CopycatServer server = createCopycatServer(members.get(i));
- server.start().thenRun(latch::countDown);
+ server.bootstrap(members).thenRun(latch::countDown);
servers.add(server);
}
@@ -102,7 +101,7 @@
* Creates a Copycat server.
*/
protected CopycatServer createCopycatServer(Address address) {
- CopycatServer server = CopycatServer.builder(address, members)
+ CopycatServer server = CopycatServer.builder(address)
.withTransport(new LocalTransport(registry))
.withStorage(Storage.builder()
.withStorageLevel(StorageLevel.DISK)
@@ -127,11 +126,11 @@
CompletableFuture<Void> closeClients =
CompletableFuture.allOf(atomixClients.stream()
- .map(Atomix::close)
+ .map(AtomixClient::close)
.toArray(CompletableFuture[]::new));
closeClients.thenCompose(v -> CompletableFuture.allOf(copycatServers.stream()
- .map(CopycatServer::stop)
+ .map(CopycatServer::shutdown)
.toArray(CompletableFuture[]::new))).join();
deleteDirectory(TEST_DIR);
@@ -163,13 +162,13 @@
/**
* Creates a Atomix client.
*/
- protected Atomix createAtomixClient() {
+ protected AtomixClient createAtomixClient() {
CountDownLatch latch = new CountDownLatch(1);
- Atomix client = AtomixClient.builder(members)
+ AtomixClient client = AtomixClient.builder()
.withTransport(new LocalTransport(registry))
.withSerializer(serializer.clone())
.build();
- client.open().thenRun(latch::countDown);
+ client.connect(members).thenRun(latch::countDown);
atomixClients.add(client);
Uninterruptibles.awaitUninterruptibly(latch);
return client;