commit dd2b4c633a62c9ab46d3eea7b1ff217823ea4901
author Jordan Halterman <jordan@opennetworking.org> Wed Nov 29 14:05:33 2017 -0800
committer Ray Milkey <ray@opennetworking.org> Wed Dec 20 16:36:21 2017 -0800
tree 6386d2dde384bb767b2bca8977af22375a193b3b
parent c957199b838a84671ab5d281de154ba751ba1f56

Upgrade Atomix to 2.0.8 and simplify consistent primitive operation/event IDs

Change-Id: I33b68a134a7f3d016a8947bffc3cea0b90bd4bd2

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

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java
index 8350499..6639f72 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/StorageNamespaces.java
@@ -76,19 +76,6 @@
 import io.atomix.protocols.raft.storage.log.entry.QueryEntry;
 import io.atomix.protocols.raft.storage.system.Configuration;
 import org.onlab.util.KryoNamespace;
-import org.onosproject.store.primitives.resources.impl.AtomixAtomicCounterMapOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixConsistentMapEvents;
-import org.onosproject.store.primitives.resources.impl.AtomixConsistentMapOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixConsistentSetMultimapEvents;
-import org.onosproject.store.primitives.resources.impl.AtomixConsistentSetMultimapOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixConsistentTreeMapOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixCounterOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixDocumentTreeEvents;
-import org.onosproject.store.primitives.resources.impl.AtomixDocumentTreeOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixLeaderElectorEvents;
-import org.onosproject.store.primitives.resources.impl.AtomixLeaderElectorOperations;
-import org.onosproject.store.primitives.resources.impl.AtomixWorkQueueEvents;
-import org.onosproject.store.primitives.resources.impl.AtomixWorkQueueOperations;
 import org.onosproject.store.serializers.KryoNamespaces;
 
 /**
@@ -137,7 +124,11 @@
             .register(RaftResponse.Status.class)
             .register(RaftError.class)
             .register(RaftError.Type.class)
-            .register(ReadConsistency.class)
+            .register(RaftOperation.class)
+            .register(DefaultOperationId.class)
+            .register(OperationType.class)
+            .register(RaftEvent.class)
+            .register(DefaultEventType.class)
             .register(RaftSessionMetadata.class)
             .register(CloseSessionEntry.class)
             .register(CommandEntry.class)
@@ -147,11 +138,6 @@
             .register(MetadataEntry.class)
             .register(OpenSessionEntry.class)
             .register(QueryEntry.class)
-            .register(RaftOperation.class)
-            .register(RaftEvent.class)
-            .register(DefaultEventType.class)
-            .register(DefaultOperationId.class)
-            .register(OperationType.class)
             .register(ReadConsistency.class)
             .register(ArrayList.class)
             .register(LinkedList.class)
@@ -163,19 +149,6 @@
             .register(RaftMember.Type.class)
             .register(Instant.class)
             .register(Configuration.class)
-            .register(AtomixAtomicCounterMapOperations.class)
-            .register(AtomixConsistentMapEvents.class)
-            .register(AtomixConsistentMapOperations.class)
-            .register(AtomixConsistentSetMultimapOperations.class)
-            .register(AtomixConsistentSetMultimapEvents.class)
-            .register(AtomixConsistentTreeMapOperations.class)
-            .register(AtomixCounterOperations.class)
-            .register(AtomixDocumentTreeEvents.class)
-            .register(AtomixDocumentTreeOperations.class)
-            .register(AtomixLeaderElectorEvents.class)
-            .register(AtomixLeaderElectorOperations.class)
-            .register(AtomixWorkQueueEvents.class)
-            .register(AtomixWorkQueueOperations.class)
             .build("RaftProtocol");
 
     /**
@@ -193,6 +166,8 @@
             .register(OpenSessionEntry.class)
             .register(QueryEntry.class)
             .register(RaftOperation.class)
+            .register(DefaultOperationId.class)
+            .register(OperationType.class)
             .register(ReadConsistency.class)
             .register(ArrayList.class)
             .register(HashSet.class)
@@ -201,14 +176,6 @@
             .register(RaftMember.Type.class)
             .register(Instant.class)
             .register(Configuration.class)
-            .register(AtomixAtomicCounterMapOperations.class)
-            .register(AtomixConsistentMapOperations.class)
-            .register(AtomixConsistentSetMultimapOperations.class)
-            .register(AtomixConsistentTreeMapOperations.class)
-            .register(AtomixCounterOperations.class)
-            .register(AtomixDocumentTreeOperations.class)
-            .register(AtomixLeaderElectorOperations.class)
-            .register(AtomixWorkQueueOperations.class)
             .build("RaftStorage");
 
     private StorageNamespaces() {