commit 6cf60c3f33b5155a8cb51a9cd4d2f60007de92da
author Jordan Halterman <jordan@opennetworking.org> Wed Aug 15 01:22:51 2018 -0700
committer Jordan Halterman <jordan@opennetworking.org> Wed Aug 15 17:41:48 2018 +0000
tree a970263954e49147fe1a59a059d6b199dddb5730
parent 6771f4f49f747c41539331e0484fcda6ea8f1f6d

Convert all Atomix exceptions to ONOS storage exceptions

Change-Id: If4ba6b4fa41643fc3d9a9f2d84dc68fd6399a352

core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java
index a421465..e92eafb 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixLeaderElector.java
@@ -28,6 +28,8 @@
 import org.onosproject.event.Change;
 import org.onosproject.store.service.AsyncLeaderElector;
 
+import static org.onosproject.store.atomix.primitives.impl.AtomixFutures.adaptFuture;
+
 /**
  * Atomix leader elector.
  */
@@ -49,37 +51,37 @@
 
     @Override
     public CompletableFuture<Leadership> run(String topic, NodeId nodeId) {
-        return atomixElector.run(topic, nodeId).thenApply(leadership -> toLeadership(topic, leadership));
+        return adaptFuture(atomixElector.run(topic, nodeId)).thenApply(leadership -> toLeadership(topic, leadership));
     }
 
     @Override
     public CompletableFuture<Void> withdraw(String topic) {
-        return atomixElector.withdraw(topic, localNodeId);
+        return adaptFuture(atomixElector.withdraw(topic, localNodeId));
     }
 
     @Override
     public CompletableFuture<Boolean> anoint(String topic, NodeId nodeId) {
-        return atomixElector.anoint(topic, nodeId);
+        return adaptFuture(atomixElector.anoint(topic, nodeId));
     }
 
     @Override
     public CompletableFuture<Void> evict(NodeId nodeId) {
-        return atomixElector.evict(nodeId);
+        return adaptFuture(atomixElector.evict(nodeId));
     }
 
     @Override
     public CompletableFuture<Boolean> promote(String topic, NodeId nodeId) {
-        return atomixElector.promote(topic, nodeId);
+        return adaptFuture(atomixElector.promote(topic, nodeId));
     }
 
     @Override
     public CompletableFuture<Leadership> getLeadership(String topic) {
-        return atomixElector.getLeadership(topic).thenApply(leadership -> toLeadership(topic, leadership));
+        return adaptFuture(atomixElector.getLeadership(topic)).thenApply(leadership -> toLeadership(topic, leadership));
     }
 
     @Override
     public CompletableFuture<Map<String, Leadership>> getLeaderships() {
-        return atomixElector.getLeaderships()
+        return adaptFuture(atomixElector.getLeaderships())
             .thenApply(leaderships -> leaderships.entrySet().stream()
                 .collect(Collectors.toMap(e -> e.getKey(), e -> toLeadership(e.getKey(), e.getValue()))));
     }
@@ -91,14 +93,14 @@
                 toLeadership(event.topic(), event.oldLeadership()),
                 toLeadership(event.topic(), event.newLeadership())));
         listenerMap.put(consumer, atomixListener);
-        return atomixElector.addListener(atomixListener);
+        return adaptFuture(atomixElector.addListener(atomixListener));
     }
 
     @Override
     public CompletableFuture<Void> removeChangeListener(Consumer<Change<Leadership>> consumer) {
         LeadershipEventListener<NodeId> atomixListener = listenerMap.remove(consumer);
         if (atomixListener != null) {
-            return atomixElector.removeListener(atomixListener);
+            return adaptFuture(atomixElector.removeListener(atomixListener));
         }
         return CompletableFuture.completedFuture(null);
     }