X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-data-api%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fdata%2Fapi%2FYangInstanceIdentifier.java;h=9944d741e66cd64a99e61c82393646e8c9dae6a3;hb=24d06767f3a0ead8152a745fb05eda1d4a37ba77;hp=46489d31f34847292b238ab8e21f270f7574f025;hpb=a082f1ce5755016ae2933ab0e2f14cdd97d6aee6;p=yangtools.git
diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
index 46489d31f3..9944d741e6 100644
--- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
+++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java
@@ -1,14 +1,18 @@
/*
* Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+ *
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
package org.opendaylight.yangtools.yang.data.api;
+import com.google.common.annotations.Beta;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import java.io.Serializable;
@@ -28,6 +32,8 @@ import org.opendaylight.yangtools.concepts.Builder;
import org.opendaylight.yangtools.concepts.Immutable;
import org.opendaylight.yangtools.concepts.Path;
import org.opendaylight.yangtools.util.HashCodeBuilder;
+import org.opendaylight.yangtools.util.ImmutableOffsetMap;
+import org.opendaylight.yangtools.util.SharedSingletonMap;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.QNameModule;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
@@ -40,16 +46,18 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
* which conceptually is XPath expression minimized to uniquely identify element
* in data tree which conforms to constraints maintained by YANG Model,
* effectively this makes Instance Identifier a path to element in data tree.
+ *
*
* Constraints put in YANG specification on instance-identifier allowed it to be
* effectively represented in Java and it's evaluation does not require
* full-blown XPath processor.
- *
+ *
* Path Arguments
+ *
* Path to the node represented in instance identifier consists of
* {@link PathArgument} which carries necessary information to uniquely identify
* node on particular level in the subtree.
- *
+ *
*
* - {@link NodeIdentifier} - Identifier of node, which has cardinality
*
0..1 in particular subtree in data tree.
@@ -64,7 +72,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
*
* @see RFC6020
*/
-public abstract class YangInstanceIdentifier extends IterablePathArguments implements Path, Immutable, Serializable {
+public abstract class YangInstanceIdentifier implements Path, Immutable, Serializable {
/**
* An empty {@link YangInstanceIdentifier}. It corresponds to the path of the conceptual
* root of the YANG namespace.
@@ -95,31 +103,37 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
*/
public abstract boolean isEmpty();
+ /**
+ * Return an optimized version of this identifier, useful when the identifier
+ * will be used very frequently.
+ *
+ * @return A optimized equivalent instance.
+ */
+ @Beta
+ public abstract YangInstanceIdentifier toOptimized();
+
/**
* Return the conceptual parent {@link YangInstanceIdentifier}, which has
* one item less in {@link #getPathArguments()}.
*
- * @return Parent {@link YangInstanceIdentifier}, or null if this is object is {@link #EMPTY}.
+ * @return Parent {@link YangInstanceIdentifier}, or null if this object is {@link #EMPTY}.
*/
@Nullable public abstract YangInstanceIdentifier getParent();
/**
- * Returns a list of path arguments.
+ * Return the ancestor {@link YangInstanceIdentifier} with a particular depth, e.g. number of path arguments.
*
- * @deprecated Use {@link #getPathArguments()} instead.
- * @return Immutable list of path arguments.
+ * @param depth Ancestor depth
+ * @return Ancestor {@link YangInstanceIdentifier}
+ * @throws IllegalArgumentException if the specified depth is negative or is greater than the depth of this object.
*/
- @Deprecated
- public final List getPath() {
- return getPathArguments();
- }
+ @Nonnull public abstract YangInstanceIdentifier getAncestor(int depth);
/**
* Returns an ordered iteration of path arguments.
*
* @return Immutable iteration of path arguments.
*/
- @Override
public abstract List getPathArguments();
/**
@@ -128,7 +142,6 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
*
* @return Immutable iterable of path arguments in reverse order.
*/
- @Override
public abstract List getReversePathArguments();
/**
@@ -243,6 +256,55 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
return Optional.of(createRelativeIdentifier(common));
}
+ @Override
+ public final boolean contains(final YangInstanceIdentifier other) {
+ Preconditions.checkArgument(other != null, "other should not be null");
+
+ final Iterator lit = getPathArguments().iterator();
+ final Iterator oit = other.getPathArguments().iterator();
+
+ while (lit.hasNext()) {
+ if (!oit.hasNext()) {
+ return false;
+ }
+
+ if (!lit.next().equals(oit.next())) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public final String toString() {
+ /*
+ * The toStringCache is safe, since the object contract requires
+ * immutability of the object and all objects referenced from this
+ * object.
+ * Used lists, maps are immutable. Path Arguments (elements) are also
+ * immutable, since the PathArgument contract requires immutability.
+ * 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;
+ }
+
+ ret = builder.toString();
+ TOSTRINGCACHE_UPDATER.lazySet(this, ret);
+ }
+ return ret;
+ }
+
private static int hashCode(final Object value) {
if (value == null) {
return 0;
@@ -268,7 +330,6 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
// Static factories & helpers
/**
- *
* Returns a new InstanceIdentifier with only one path argument of type {@link NodeIdentifier} with supplied QName
*
* @param name QName of first node identifier
@@ -279,7 +340,6 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
}
/**
- *
* Returns new builder for InstanceIdentifier with empty path arguments.
*
* @return new builder for InstanceIdentifier with empty path arguments.
@@ -292,7 +352,7 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
*
* Returns new builder for InstanceIdentifier with path arguments copied from original instance identifier.
*
- * @param origin Instace Identifier from which path arguments are copied.
+ * @param origin InstanceIdentifier from which path arguments are copied.
* @return new builder for InstanceIdentifier with path arguments copied from original instance identifier.
*/
public static InstanceIdentifierBuilder builder(final YangInstanceIdentifier origin) {
@@ -347,7 +407,7 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
private static final long serialVersionUID = -4546547994250849340L;
private final QName nodeType;
private transient int hashValue;
- private volatile transient boolean hashGuard = false;
+ private transient volatile boolean hashGuard = false;
protected AbstractPathArgument(final QName nodeType) {
this.nodeType = Preconditions.checkNotNull(nodeType);
@@ -407,71 +467,34 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
}
}
- /**
- * Fluent Builder of Instance Identifier instances
- */
- public interface InstanceIdentifierBuilder extends Builder {
- /**
- * Adds a {@link PathArgument} to to path arguments of resulting instance identifier.
- *
- * @param arg A {@link PathArgument} to be added
- * @return this builder
- */
- InstanceIdentifierBuilder node(PathArgument arg);
-
- /**
- * Adds {@link NodeIdentifier} with supplied QName to path arguments of resulting instance identifier.
- *
- * @param nodeType QName of {@link NodeIdentifier} which will be added
- * @return this builder
- */
- InstanceIdentifierBuilder node(QName nodeType);
-
- /**
- * Adds {@link NodeIdentifierWithPredicates} with supplied QName and key values to path arguments of resulting instance identifier.
- *
- * @param nodeType QName of {@link NodeIdentifierWithPredicates} which will be added
- * @param keyValues Map of key components and their respective values for {@link NodeIdentifierWithPredicates}
- * @return this builder
- */
- InstanceIdentifierBuilder nodeWithKey(QName nodeType, Map keyValues);
-
- /**
- * Adds {@link NodeIdentifierWithPredicates} with supplied QName and key, value.
- *
- * @param nodeType QName of {@link NodeIdentifierWithPredicates} which will be added
- * @param key QName of key which will be added
- * @param value value of key which will be added
- * @return this builder
- */
- InstanceIdentifierBuilder nodeWithKey(QName nodeType, QName key, Object value);
-
- /**
- *
- * Builds an {@link YangInstanceIdentifier} with path arguments from this builder
- *
- * @return {@link YangInstanceIdentifier}
- */
- @Override
- YangInstanceIdentifier build();
-
- /*
- * @deprecated use #build()
- */
- @Deprecated
- YangInstanceIdentifier toInstance();
- }
-
/**
* Simple path argument identifying a {@link org.opendaylight.yangtools.yang.data.api.schema.ContainerNode} or
* {@link org.opendaylight.yangtools.yang.data.api.schema.LeafNode} leaf in particular subtree.
*/
public static final class NodeIdentifier extends AbstractPathArgument {
private static final long serialVersionUID = -2255888212390871347L;
+ private static final LoadingCache CACHE = CacheBuilder.newBuilder().weakValues()
+ .build(new CacheLoader() {
+ @Override
+ public NodeIdentifier load(final QName key) {
+ return new NodeIdentifier(key);
+ }
+ });
public NodeIdentifier(final QName node) {
super(node);
}
+
+ /**
+ * Return a NodeIdentifier for a particular QName. Unlike the constructor, this factory method uses a global
+ * instance cache, resulting in object reuse for equal inputs.
+ *
+ * @param node Node's QName
+ * @return A {@link NodeIdentifier}
+ */
+ public static NodeIdentifier create(final QName node) {
+ return CACHE.getUnchecked(node);
+ }
}
/**
@@ -485,11 +508,13 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
public NodeIdentifierWithPredicates(final QName node, final Map keyValues) {
super(node);
- this.keyValues = ImmutableMap.copyOf(keyValues);
+ // Retains ImmutableMap for empty maps. For larger sizes uses a shared key set.
+ this.keyValues = ImmutableOffsetMap.unorderedCopyOf(keyValues);
}
public NodeIdentifierWithPredicates(final QName node, final QName key, final Object value) {
- this(node, ImmutableMap.of(key, value));
+ super(node);
+ this.keyValues = SharedSingletonMap.unorderedOf(key, value);
}
public Map getKeyValues() {
@@ -693,52 +718,52 @@ public abstract class YangInstanceIdentifier extends IterablePathArguments imple
}
}
- @Override
- public final boolean contains(final YangInstanceIdentifier other) {
- Preconditions.checkArgument(other != null, "other should not be null");
-
- final Iterator lit = getPathArguments().iterator();
- final Iterator oit = other.getPathArguments().iterator();
-
- while (lit.hasNext()) {
- if (!oit.hasNext()) {
- return false;
- }
+ /**
+ * Fluent Builder of Instance Identifier instances
+ */
+ public interface InstanceIdentifierBuilder extends Builder {
+ /**
+ * Adds a {@link PathArgument} to to path arguments of resulting instance identifier.
+ *
+ * @param arg A {@link PathArgument} to be added
+ * @return this builder
+ */
+ InstanceIdentifierBuilder node(PathArgument arg);
- if (!lit.next().equals(oit.next())) {
- return false;
- }
- }
+ /**
+ * Adds {@link NodeIdentifier} with supplied QName to path arguments of resulting instance identifier.
+ *
+ * @param nodeType QName of {@link NodeIdentifier} which will be added
+ * @return this builder
+ */
+ InstanceIdentifierBuilder node(QName nodeType);
- return true;
- }
+ /**
+ * Adds {@link NodeIdentifierWithPredicates} with supplied QName and key values to path arguments of resulting instance identifier.
+ *
+ * @param nodeType QName of {@link NodeIdentifierWithPredicates} which will be added
+ * @param keyValues Map of key components and their respective values for {@link NodeIdentifierWithPredicates}
+ * @return this builder
+ */
+ InstanceIdentifierBuilder nodeWithKey(QName nodeType, Map keyValues);
- @Override
- public final String toString() {
- /*
- * The toStringCache is safe, since the object contract requires
- * immutability of the object and all objects referenced from this
- * object.
- * Used lists, maps are immutable. Path Arguments (elements) are also
- * immutable, since the PathArgument contract requires immutability.
- * The cache is thread-safe - if multiple computations occurs at the
- * same time, cache will be overwritten with same result.
+ /**
+ * Adds {@link NodeIdentifierWithPredicates} with supplied QName and key, value.
+ *
+ * @param nodeType QName of {@link NodeIdentifierWithPredicates} which will be added
+ * @param key QName of key which will be added
+ * @param value value of key which will be added
+ * @return this builder
*/
- 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;
- }
+ InstanceIdentifierBuilder nodeWithKey(QName nodeType, QName key, Object value);
- ret = builder.toString();
- TOSTRINGCACHE_UPDATER.lazySet(this, ret);
- }
- return ret;
+ /**
+ *
+ * Builds an {@link YangInstanceIdentifier} with path arguments from this builder
+ *
+ * @return {@link YangInstanceIdentifier}
+ */
+ @Override
+ YangInstanceIdentifier build();
}
}