commit 65f24bb7f389d90857673d673dc1866a45acb67f
author Madan Jampani <madan@onlab.us> Tue Mar 15 15:16:18 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Mar 22 22:38:10 2016 +0000
tree 9dc47766bb500a2775600edd1a2275060564a144
parent 0da01a47f8bae10e0ea4f4ab6a8eb38d757207ef

Moving to Atomix version 1.0.0-rc3

Change-Id: I75572a52b530741f482455d59922327121a03999

core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java

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);