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/AtomixDistributedSet.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java
index 5add8b4..5483c74 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/primitives/impl/AtomixDistributedSet.java
@@ -26,6 +26,8 @@
 import org.onosproject.store.service.SetEvent;
 import org.onosproject.store.service.SetEventListener;
 
+import static org.onosproject.store.atomix.primitives.impl.AtomixFutures.adaptFuture;
+
 /**
  * Atomix distributed set.
  */
@@ -45,52 +47,52 @@
 
     @Override
     public CompletableFuture<Integer> size() {
-        return atomixSet.size();
+        return adaptFuture(atomixSet.size());
     }
 
     @Override
     public CompletableFuture<Boolean> add(E element) {
-        return atomixSet.add(element);
+        return adaptFuture(atomixSet.add(element));
     }
 
     @Override
     public CompletableFuture<Boolean> remove(E element) {
-        return atomixSet.remove(element);
+        return adaptFuture(atomixSet.remove(element));
     }
 
     @Override
     public CompletableFuture<Boolean> isEmpty() {
-        return atomixSet.isEmpty();
+        return adaptFuture(atomixSet.isEmpty());
     }
 
     @Override
     public CompletableFuture<Void> clear() {
-        return atomixSet.clear();
+        return adaptFuture(atomixSet.clear());
     }
 
     @Override
     public CompletableFuture<Boolean> contains(E element) {
-        return atomixSet.contains(element);
+        return adaptFuture(atomixSet.contains(element));
     }
 
     @Override
     public CompletableFuture<Boolean> addAll(Collection<? extends E> c) {
-        return atomixSet.addAll(c);
+        return adaptFuture(atomixSet.addAll(c));
     }
 
     @Override
     public CompletableFuture<Boolean> containsAll(Collection<? extends E> c) {
-        return atomixSet.containsAll(c);
+        return adaptFuture(atomixSet.containsAll(c));
     }
 
     @Override
     public CompletableFuture<Boolean> retainAll(Collection<? extends E> c) {
-        return atomixSet.retainAll(c);
+        return adaptFuture(atomixSet.retainAll(c));
     }
 
     @Override
     public CompletableFuture<Boolean> removeAll(Collection<? extends E> c) {
-        return atomixSet.removeAll(c);
+        return adaptFuture(atomixSet.removeAll(c));
     }
 
     @Override
@@ -106,14 +108,14 @@
                 SetEvent.Type.valueOf(event.type().name()),
                 event.element()));
         listenerMap.put(listener, atomixListener);
-        return atomixSet.addListener(atomixListener);
+        return adaptFuture(atomixSet.addListener(atomixListener));
     }
 
     @Override
     public CompletableFuture<Void> removeListener(SetEventListener<E> listener) {
         io.atomix.core.collection.CollectionEventListener<E> atomixListener = listenerMap.remove(listener);
         if (atomixListener != null) {
-            return atomixSet.removeListener(atomixListener);
+            return adaptFuture(atomixSet.removeListener(atomixListener));
         }
         return CompletableFuture.completedFuture(null);
     }