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/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java
index 7c59079..72f5dfd 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionServer.java
@@ -22,12 +22,8 @@
 import io.atomix.copycat.server.CopycatServer;
 import io.atomix.copycat.server.storage.Storage;
 import io.atomix.copycat.server.storage.StorageLevel;
-import io.atomix.manager.ResourceManagerTypeResolver;
 import io.atomix.manager.state.ResourceManagerState;
-import io.atomix.resource.ResourceRegistry;
-import io.atomix.resource.ResourceType;
-import io.atomix.resource.ResourceTypeResolver;
-import io.atomix.resource.ServiceLoaderResourceResolver;
+import io.atomix.manager.util.ResourceManagerTypeResolver;
 
 import java.io.File;
 import java.util.Collection;
@@ -37,8 +33,6 @@
 import org.onosproject.store.service.PartitionInfo;
 import org.slf4j.Logger;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * {@link StoragePartition} server.
  */
@@ -52,20 +46,17 @@
     private final Supplier<Transport> transport;
     private final Serializer serializer;
     private final File dataFolder;
-    private final Collection<ResourceType> resourceTypes;
     private CopycatServer server;
 
     public StoragePartitionServer(Address localAddress,
             StoragePartition partition,
             Serializer serializer,
             Supplier<Transport> transport,
-            Collection<ResourceType> resourceTypes,
             File dataFolder) {
         this.partition = partition;
         this.localAddress = localAddress;
         this.serializer = serializer;
         this.transport = transport;
-        this.resourceTypes = ImmutableSet.copyOf(resourceTypes);
         this.dataFolder = dataFolder;
     }
 
@@ -73,13 +64,13 @@
     public CompletableFuture<Void> open() {
         CompletableFuture<CopycatServer> serverOpenFuture;
         if (partition.getMemberAddresses().contains(localAddress)) {
-            if (server != null && server.isOpen()) {
+            if (server != null && server.isRunning()) {
                 return CompletableFuture.completedFuture(null);
             }
             synchronized (this) {
                 server = buildServer(partition.getMemberAddresses());
             }
-            serverOpenFuture = server.open();
+            serverOpenFuture = server.start();
         } else {
             serverOpenFuture = CompletableFuture.completedFuture(null);
         }
@@ -106,19 +97,15 @@
      * @return future that is completed when the operation is complete
      */
     public CompletableFuture<Void> closeAndExit() {
-        return server.close();
+        return server.stop();
     }
 
     private CopycatServer buildServer(Collection<Address> clusterMembers) {
-        ResourceTypeResolver resourceResolver = new ServiceLoaderResourceResolver();
-        ResourceRegistry registry = new ResourceRegistry();
-        resourceTypes.forEach(registry::register);
-        resourceResolver.resolve(registry);
         CopycatServer server = CopycatServer.builder(localAddress, clusterMembers)
                 .withName("partition-" + partition.getId())
                 .withSerializer(serializer.clone())
                 .withTransport(transport.get())
-                .withStateMachine(() -> new ResourceManagerState(registry))
+                .withStateMachine(ResourceManagerState::new)
                 .withStorage(Storage.builder()
                         .withStorageLevel(StorageLevel.DISK)
                         .withCompactionThreads(1)
@@ -126,14 +113,14 @@
                         .withMaxEntriesPerSegment(MAX_ENTRIES_PER_LOG_SEGMENT)
                         .build())
                 .build();
-        server.serializer().resolve(new ResourceManagerTypeResolver(registry));
+        server.serializer().resolve(new ResourceManagerTypeResolver());
         return server;
     }
 
     public CompletableFuture<Void> join(Collection<Address> otherMembers) {
         server = buildServer(otherMembers);
 
-        return server.open().whenComplete((r, e) -> {
+        return server.start().whenComplete((r, e) -> {
             if (e == null) {
                 log.info("Successfully joined partition {}", partition.getId());
             } else {
@@ -144,12 +131,7 @@
 
     @Override
     public boolean isOpen() {
-        return server.isOpen();
-    }
-
-    @Override
-    public boolean isClosed() {
-        return server.isClosed();
+        return server.isRunning();
     }
 
     /**