Rename MainNode methods

CAS_PREV -> casPrev
READ_PREV -> readPrev
WRITE_PREV -> writePrev

Change-Id: Ia918db3c68931d585a5f2922b0923e939814d015
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java
index a24584e2099490954e985874b5e45eb0c94683df..701d608f956f48de113632bb389c865f02bf0d65 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/INode.java
@@ -45,7 +45,7 @@ final class INode<K, V> extends BasicNode {
 
     private MainNode<K, V> GCAS_READ(final TrieMap<?, ?> ct) {
         MainNode<K, V> m = /* READ */ mainnode;
-        MainNode<K, V> prevval = /* READ */ m.READ_PREV();
+        MainNode<K, V> prevval = /* READ */ m.readPrev();
         if (prevval == null) {
             return m;
         }
@@ -57,7 +57,7 @@ final class INode<K, V> extends BasicNode {
         MainNode<K, V> m = oldmain;
         while (m != null) {
             // complete the GCAS
-            final MainNode<K, V> prev = /* READ */ m.READ_PREV();
+            final MainNode<K, V> prev = /* READ */ m.readPrev();
             final INode<?, ?> ctr = ct.readRoot(true);
             if (prev == null) {
                 return m;
@@ -66,8 +66,8 @@ final class INode<K, V> extends BasicNode {
             if (prev instanceof FailedNode) {
                 // try to commit to previous value
                 FailedNode<K, V> fn = (FailedNode<K, V>) prev;
-                if (MAINNODE_UPDATER.compareAndSet(this, m, fn.READ_PREV())) {
-                    return fn.READ_PREV();
+                if (MAINNODE_UPDATER.compareAndSet(this, m, fn.readPrev())) {
+                    return fn.readPrev();
                 }
 
                 // Tail recursion: return GCAS_Complete(/* READ */ mainnode, ct);
@@ -85,7 +85,7 @@ final class INode<K, V> extends BasicNode {
             // or both
             if (ctr.gen == gen && !ct.isReadOnly()) {
                 // try to commit
-                if (m.CAS_PREV(prev, null)) {
+                if (m.casPrev(prev, null)) {
                     return m;
                 }
 
@@ -94,7 +94,7 @@ final class INode<K, V> extends BasicNode {
             }
 
             // try to abort
-            m.CAS_PREV(prev, new FailedNode<>(prev));
+            m.casPrev(prev, new FailedNode<>(prev));
 
             // Tail recursion: return GCAS_Complete(/* READ */ mainnode, ct);
             m = /* READ */ mainnode;
@@ -104,10 +104,10 @@ final class INode<K, V> extends BasicNode {
     }
 
     private boolean GCAS(final MainNode<K, V> old, final MainNode<K, V> n, final TrieMap<?, ?> ct) {
-        n.WRITE_PREV(old);
+        n.writePrev(old);
         if (MAINNODE_UPDATER.compareAndSet(this, old, n)) {
             GCAS_Complete(n, ct);
-            return /* READ */ n.READ_PREV() == null;
+            return /* READ */ n.readPrev() == null;
         }
 
         return false;

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java
index eb18b7fd7ae27f9dc50eb6b72243bad45845d835..b791b115d4f9eb1601a98bcfe894ff63c7bf56b8 100644 (file)
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java
@@ -48,15 +48,15 @@ abstract class MainNode<K, V> extends BasicNode {
      */
     abstract int size(ImmutableTrieMap<?, ?> ct);
 
-    final boolean CAS_PREV(final MainNode<K, V> oldval, final MainNode<K, V> nval) {
+    final boolean casPrev(final MainNode<K, V> oldval, final MainNode<K, V> nval) {
         return PREV_UPDATER.compareAndSet(this, oldval, nval);
     }
 
-    final void WRITE_PREV(final MainNode<K, V> nval) {
+    final void writePrev(final MainNode<K, V> nval) {
         prev = nval;
     }
 
-    final MainNode<K, V> READ_PREV() {
+    final MainNode<K, V> readPrev() {
         return prev;
     }
 }