X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=data%2Fyang-data-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fapi%2FYangInstanceIdentifier.java;h=a2ff3b598bf57300570a771a019461fb57780f95;hb=78162149ce31641891c1afe0d86aa8447e021320;hp=31ea97a0279cd82d1fe737eb7f5915f1be12390c;hpb=ce393b58bbeebe85e7725f357f9eb73c8cfafe13;p=yangtools.git

diff --git a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index 31ea97a027..a2ff3b598b 100644
--- a/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/data/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -23,6 +23,8 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Serializable;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.lang.reflect.Array;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.ArrayList;
@@ -36,13 +38,12 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.function.Function;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.concepts.HierarchicalIdentifier;
 import org.opendaylight.yangtools.concepts.Immutable;
+import org.opendaylight.yangtools.concepts.Mutable;
 import org.opendaylight.yangtools.util.HashCodeBuilder;
 import org.opendaylight.yangtools.util.ImmutableOffsetMap;
 import org.opendaylight.yangtools.util.SingletonSet;
@@ -80,12 +81,22 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
 //               to data nodes -- most notably XPath expressions and {@code default} statement arguments need to be able
 //               to represent these.
 public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<YangInstanceIdentifier> {
-    private static final AtomicReferenceFieldUpdater<YangInstanceIdentifier, String> TOSTRINGCACHE_UPDATER =
-            AtomicReferenceFieldUpdater.newUpdater(YangInstanceIdentifier.class, String.class, "toStringCache");
     private static final long serialVersionUID = 4L;
+    private static final VarHandle TO_STRING_CACHE;
+
+    static {
+        try {
+            TO_STRING_CACHE = MethodHandles.lookup().findVarHandle(YangInstanceIdentifier.class, "toStringCache",
+                String.class);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
 
     private final int hash;
-    private transient volatile String toStringCache = null;
+    @SuppressWarnings("unused")
+    private transient String toStringCache = null;
 
     // Package-private to prevent outside subclassing
     YangInstanceIdentifier(final int hash) {
@@ -343,22 +354,24 @@ public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<Y
          * The cache is thread-safe - if multiple computations occurs at the
          * same time, cache will be overwritten with same result.
          */
-        String ret = toStringCache;
-        if (ret == null) {
-            final StringBuilder builder = new StringBuilder("/");
-            PathArgument prev = null;
-            for (PathArgument argument : getPathArguments()) {
-                if (prev != null) {
-                    builder.append('/');
-                }
-                builder.append(argument.toRelativeString(prev));
-                prev = argument;
-            }
+        final String ret = (String) TO_STRING_CACHE.getAcquire(this);
+        return ret != null ? ret : loadToString();
+    }
 
-            ret = builder.toString();
-            TOSTRINGCACHE_UPDATER.lazySet(this, ret);
+    private String loadToString() {
+        final StringBuilder builder = new StringBuilder("/");
+        PathArgument prev = null;
+        for (PathArgument argument : getPathArguments()) {
+            if (prev != null) {
+                builder.append('/');
+            }
+            builder.append(argument.toRelativeString(prev));
+            prev = argument;
         }
-        return ret;
+
+        final String ret = builder.toString();
+        final String witness = (String) TO_STRING_CACHE.compareAndExchangeRelease(this, null, ret);
+        return witness == null ? ret : witness;
     }
 
     @Override
@@ -1036,7 +1049,7 @@ public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<Y
     /**
      * Fluent Builder of Instance Identifier instances.
      */
-    public interface InstanceIdentifierBuilder extends Builder<YangInstanceIdentifier> {
+    public interface InstanceIdentifierBuilder extends Mutable {
         /**
          * Adds a {@link PathArgument} to path arguments of resulting instance identifier.
          *
@@ -1098,7 +1111,6 @@ public abstract class YangInstanceIdentifier implements HierarchicalIdentifier<Y
          *
          * @return {@link YangInstanceIdentifier}
          */
-        @Override
-        YangInstanceIdentifier build();
+        @NonNull YangInstanceIdentifier build();
     }
 }