BUG-3263: return a List of PathArguments

[yangtools.git] / yang / yang-data-api / src / main / java / org / opendaylight / yangtools / yang / data / api / StackedYangInstanceIdentifier.java

diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java
index dc803ece58e5a94b43e13daf0a89929c88f591b4..ac1d8606ac7be91f23ebaca5225638398164b88d 100644 (file)
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/StackedYangInstanceIdentifier.java
@@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.data.api;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Verify;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import java.io.IOException;
@@ -17,7 +16,6 @@ import java.io.ObjectOutputStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 final class StackedYangInstanceIdentifier extends YangInstanceIdentifier {
     private static final long serialVersionUID = 1L;
@@ -35,16 +33,11 @@ final class StackedYangInstanceIdentifier extends YangInstanceIdentifier {
         PARENT_FIELD = f;
     }
 
-    @SuppressWarnings("rawtypes")
-    private static final AtomicReferenceFieldUpdater<StackedYangInstanceIdentifier, ImmutableList> LEGACYPATH_UPDATER =
-            AtomicReferenceFieldUpdater.newUpdater(StackedYangInstanceIdentifier.class, ImmutableList.class, "legacyPath");
-
     private final YangInstanceIdentifier parent;
     private final PathArgument pathArgument;
 
-    private transient volatile ImmutableList<PathArgument> legacyPath;
-    private transient volatile Iterable<PathArgument> pathArguments;
-    private transient volatile Iterable<PathArgument> reversePathArguments;
+    private transient volatile StackedPathArguments pathArguments;
+    private transient volatile StackedReversePathArguments reversePathArguments;
 
     StackedYangInstanceIdentifier(final YangInstanceIdentifier parent, final PathArgument pathArgument, final int hash) {
         super(hash);
@@ -63,30 +56,16 @@ final class StackedYangInstanceIdentifier extends YangInstanceIdentifier {
     }
 
     @Override
-    public List<PathArgument> getPath() {
-        // Temporary variable saves a volatile read
-        ImmutableList<PathArgument> ret = legacyPath;
+    public List<PathArgument> getPathArguments() {
+        StackedPathArguments ret = tryPathArguments();
         if (ret == null) {
-            // We could have used a synchronized block, but the window is quite
-            // small and worst that can happen is duplicate object construction.
-            ret = ImmutableList.copyOf(getPathArguments());
-            LEGACYPATH_UPDATER.lazySet(this, ret);
-        }
-
-        return ret;
-    }
-
-    @Override
-    public Iterable<PathArgument> getPathArguments() {
-        Iterable<PathArgument> ret = tryPathArguments();
-        if (ret == null) {
-            List<StackedYangInstanceIdentifier> stack = new ArrayList<>();
+            List<PathArgument> stack = new ArrayList<>();
             YangInstanceIdentifier current = this;
             while (current.tryPathArguments() == null) {
                 Verify.verify(current instanceof StackedYangInstanceIdentifier);
 
                 final StackedYangInstanceIdentifier stacked = (StackedYangInstanceIdentifier) current;
-                stack.add(stacked);
+                stack.add(stacked.getLastPathArgument());
                 current = stacked.getParent();
             }
 
@@ -98,8 +77,8 @@ final class StackedYangInstanceIdentifier extends YangInstanceIdentifier {
     }
 
     @Override
-    public Iterable<PathArgument> getReversePathArguments() {
-        Iterable<PathArgument> ret = reversePathArguments;
+    public List<PathArgument> getReversePathArguments() {
+        StackedReversePathArguments ret = tryReversePathArguments();
         if (ret == null) {
             ret = new StackedReversePathArguments(this);
             reversePathArguments = ret;
@@ -113,10 +92,15 @@ final class StackedYangInstanceIdentifier extends YangInstanceIdentifier {
     }
 
     @Override
-    Iterable<PathArgument> tryPathArguments() {
+    StackedPathArguments tryPathArguments() {
         return pathArguments;
     }
 
+    @Override
+    StackedReversePathArguments tryReversePathArguments() {
+        return reversePathArguments;
+    }
+
     @Override
     YangInstanceIdentifier createRelativeIdentifier(final int skipFromRoot) {
         // TODO: can we optimize this one?