commit 825a8b1437f4feefc82c85ce2cf64265fb1c3120
author Madan Jampani <madan@onlab.us> Mon Jun 06 19:42:01 2016 -0700
committer Madan Jampani <madan@onlab.us> Mon Jun 06 19:42:54 2016 -0700
tree 1273c9de249c5528a376eaace3f0101cdbebb8e0
parent 051bd42c7cbc93c40880e3e224a588dfc2e80c1d

Moved client availability check to copycat client

Change-Id: I411eb74c5d39985d85c5feda976a250e77b88ff5

core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
index 1495524..92170d4 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StoragePartitionClient.java
@@ -51,7 +51,6 @@
 import org.onosproject.store.service.DistributedQueue;
 import org.onosproject.store.service.PartitionClientInfo;
 import org.onosproject.store.service.Serializer;
-import org.onosproject.store.service.StorageException;
 import org.slf4j.Logger;
 
 import com.google.common.base.Supplier;
@@ -120,7 +119,6 @@
 
     @Override
     public <K, V> AsyncConsistentMap<K, V> newAsyncConsistentMap(String name, Serializer serializer) {
-        checkAvailability();
         AtomixConsistentMap atomixConsistentMap = client.getResource(name, AtomixConsistentMap.class).join();
         Consumer<State> statusListener = state -> {
             atomixConsistentMap.statusChangeListeners()
@@ -145,13 +143,11 @@
 
     @Override
     public <E> AsyncDistributedSet<E> newAsyncDistributedSet(String name, Serializer serializer) {
-        checkAvailability();
         return DistributedPrimitives.newSetFromMap(this.<E, Boolean>newAsyncConsistentMap(name, serializer));
     }
 
     @Override
     public AsyncAtomicCounter newAsyncCounter(String name) {
-        checkAvailability();
         DistributedLong distributedLong = client.getLong(name).join();
         return new AtomixCounter(name, distributedLong);
     }
@@ -169,7 +165,6 @@
 
     @Override
     public AsyncLeaderElector newAsyncLeaderElector(String name) {
-        checkAvailability();
         AtomixLeaderElector leaderElector = client.getResource(name, AtomixLeaderElector.class)
                                                   .thenCompose(AtomixLeaderElector::setupCache)
                                                   .join();
@@ -183,13 +178,11 @@
 
     @Override
     public Set<String> getAsyncConsistentMapNames() {
-        checkAvailability();
         return client.keys(AtomixConsistentMap.class).join();
     }
 
     @Override
     public Set<String> getAsyncAtomicCounterNames() {
-        checkAvailability();
         return client.keys(DistributedLong.class).join();
     }
 
@@ -232,12 +225,6 @@
                 throw new ResourceManagerException(e);
             }
         }
-        return new ResourceClient(new QueryRetryingCopycatClient(copycatClient, 2, 100));
-    }
-
-    private void checkAvailability() {
-        if (resourceClient.client().state() == State.SUSPENDED || resourceClient.client().state() == State.CLOSED) {
-            throw new StorageException.Unavailable();
-        }
+        return new ResourceClient(new OnosCopycatClient(copycatClient, 2, 100));
     }
 }