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/AtomixDocumentTreeOperations.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTreeOperations.java
index d05215c..6ec6091 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTreeOperations.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixDocumentTreeOperations.java
@@ -35,29 +35,27 @@
* {@link AtomixDocumentTree} resource state machine operations.
*/
public enum AtomixDocumentTreeOperations implements OperationId {
- ADD_LISTENER("set", OperationType.COMMAND),
- REMOVE_LISTENER("compareAndSet", OperationType.COMMAND),
- GET("incrementAndGet", OperationType.QUERY),
- GET_CHILDREN("getAndIncrement", OperationType.QUERY),
- UPDATE("addAndGet", OperationType.COMMAND),
- CLEAR("getAndAdd", OperationType.COMMAND),
- BEGIN("begin", OperationType.COMMAND),
- PREPARE("prepare", OperationType.COMMAND),
- PREPARE_AND_COMMIT("prepareAndCommit", OperationType.COMMAND),
- COMMIT("commit", OperationType.COMMAND),
- ROLLBACK("rollback", OperationType.COMMAND);
+ ADD_LISTENER(OperationType.COMMAND),
+ REMOVE_LISTENER(OperationType.COMMAND),
+ GET(OperationType.QUERY),
+ GET_CHILDREN(OperationType.QUERY),
+ UPDATE(OperationType.COMMAND),
+ CLEAR(OperationType.COMMAND),
+ BEGIN(OperationType.COMMAND),
+ PREPARE(OperationType.COMMAND),
+ PREPARE_AND_COMMIT(OperationType.COMMAND),
+ COMMIT(OperationType.COMMAND),
+ ROLLBACK(OperationType.COMMAND);
- private final String id;
private final OperationType type;
- AtomixDocumentTreeOperations(String id, OperationType type) {
- this.id = id;
+ AtomixDocumentTreeOperations(OperationType type) {
this.type = type;
}
@Override
public String id() {
- return id;
+ return name();
}
@Override