Upgrade Atomix to 2.0.8 and simplify consistent primitive operation/event IDs
Change-Id: I33b68a134a7f3d016a8947bffc3cea0b90bd4bd2
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixCounterOperations.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixCounterOperations.java
index f6ec6d8..67ff936 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixCounterOperations.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixCounterOperations.java
@@ -24,25 +24,23 @@
* Counter commands.
*/
public enum AtomixCounterOperations implements OperationId {
- SET("set", OperationType.COMMAND),
- COMPARE_AND_SET("compareAndSet", OperationType.COMMAND),
- INCREMENT_AND_GET("incrementAndGet", OperationType.COMMAND),
- GET_AND_INCREMENT("getAndIncrement", OperationType.COMMAND),
- ADD_AND_GET("addAndGet", OperationType.COMMAND),
- GET_AND_ADD("getAndAdd", OperationType.COMMAND),
- GET("get", OperationType.QUERY);
+ SET(OperationType.COMMAND),
+ COMPARE_AND_SET(OperationType.COMMAND),
+ INCREMENT_AND_GET(OperationType.COMMAND),
+ GET_AND_INCREMENT(OperationType.COMMAND),
+ ADD_AND_GET(OperationType.COMMAND),
+ GET_AND_ADD(OperationType.COMMAND),
+ GET(OperationType.QUERY);
- private final String id;
private final OperationType type;
- AtomixCounterOperations(String id, OperationType type) {
- this.id = id;
+ AtomixCounterOperations(OperationType type) {
this.type = type;
}
@Override
public String id() {
- return id;
+ return name();
}
@Override