Use NodeIdentifier.create() in yang-data-util

NodeIdentifiers coming from context nodes should reuse the same
instance, saving lookup and compare costs.

Change-Id: Idb3e342dad372a57224cf11942dad5c56e7820a2
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java
index fa6f64c5069cca456956292a00beb404db304d16..308b41aafb645ee9780277f5726a5222461457aa 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/AnyXmlContextNode.java
@@ -15,7 +15,7 @@ import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode;
 class AnyXmlContextNode extends DataSchemaContextNode<NodeIdentifier> {
 
     protected AnyXmlContextNode(final AnyXmlSchemaNode schema) {
-        super(new NodeIdentifier(schema.getQName()), schema);
+        super(NodeIdentifier.create(schema.getQName()), schema);
     }
 
     @Override
@@ -33,4 +33,4 @@ class AnyXmlContextNode extends DataSchemaContextNode<NodeIdentifier> {
         return false;
     }
 
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java
index 582c50b71fe52eba6158377526ac5481f645492d..e21265581907a593d4c9639a288809e67e314653 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ChoiceNodeContextNode.java
@@ -21,7 +21,7 @@ class ChoiceNodeContextNode extends AbstractMixinContextNode<NodeIdentifier> {
     private final ImmutableMap<PathArgument, DataSchemaContextNode<?>> byArg;
 
     protected ChoiceNodeContextNode(final ChoiceSchemaNode schema) {
-        super(new NodeIdentifier(schema.getQName()), schema);
+        super(NodeIdentifier.create(schema.getQName()), schema);
         ImmutableMap.Builder<QName, DataSchemaContextNode<?>> byQNameBuilder = ImmutableMap.builder();
         ImmutableMap.Builder<PathArgument, DataSchemaContextNode<?>> byArgBuilder = ImmutableMap.builder();
 
@@ -47,4 +47,4 @@ class ChoiceNodeContextNode extends AbstractMixinContextNode<NodeIdentifier> {
     public DataSchemaContextNode<?> getChild(final QName child) {
         return byQName.get(child);
     }
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerContextNode.java
index 10e49b6e32a1427fc4a90d3966b00946b44aae6a..a7a649280a4fcb2266adb5f46e6f42cf7a5bd088 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/ContainerContextNode.java
@@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 final class ContainerContextNode extends DataContainerContextNode<NodeIdentifier> {
 
     protected ContainerContextNode(final ContainerSchemaNode schema) {
-        super(new NodeIdentifier(schema.getQName()), schema, schema);
+        super(NodeIdentifier.create(schema.getQName()), schema, schema);
     }
 
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafContextNode.java
index 378d23525b80db91ba4f2e5a7f1227e01b39bc34..49f4eb1a519a193bccf6fa22c9de239efdd5d5fd 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/LeafContextNode.java
@@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 final class LeafContextNode extends AbstractLeafNodeContext<NodeIdentifier> {
 
     protected LeafContextNode(final LeafSchemaNode potential) {
-        super(new NodeIdentifier(potential.getQName()), potential);
+        super(NodeIdentifier.create(potential.getQName()), potential);
     }
 
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListItemContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListItemContextNode.java
index cbf773d6265345f995d3fa5d4492e04ed8f2f92a..0817d5bba272a32e8f347b33fa090088822403ae 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListItemContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListItemContextNode.java
@@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
 final class UnkeyedListItemContextNode extends DataContainerContextNode<NodeIdentifier> {
 
     protected UnkeyedListItemContextNode(final ListSchemaNode schema) {
-        super(new NodeIdentifier(schema.getQName()), schema, schema);
+        super(NodeIdentifier.create(schema.getQName()), schema, schema);
     }
 
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListMixinContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListMixinContextNode.java
index 6a5a443b70b15c33de0e7af6216362a8db1240c6..3a1546ba2b3861ec0cd69a403875b6c4ceca9f48 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListMixinContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnkeyedListMixinContextNode.java
@@ -17,7 +17,7 @@ class UnkeyedListMixinContextNode extends AbstractMixinContextNode<NodeIdentifie
     private final UnkeyedListItemContextNode innerNode;
 
     public UnkeyedListMixinContextNode(final ListSchemaNode list) {
-        super(new NodeIdentifier(list.getQName()), list);
+        super(NodeIdentifier.create(list.getQName()), list);
         this.innerNode = new UnkeyedListItemContextNode(list);
     }
 
@@ -37,4 +37,4 @@ class UnkeyedListMixinContextNode extends AbstractMixinContextNode<NodeIdentifie
         return null;
     }
 
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java
index 13f77e705114b04e66aac09f9141bd306ee541f6..a5c8f1d3c464eb1155e2d26f1d5da7b8b13279ad 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedLeafListMixinContextNode.java
@@ -18,7 +18,7 @@ class UnorderedLeafListMixinContextNode extends AbstractMixinContextNode<NodeIde
     private final DataSchemaContextNode<?> innerOp;
 
     public UnorderedLeafListMixinContextNode(final LeafListSchemaNode potential) {
-        super(new NodeIdentifier(potential.getQName()), potential);
+        super(NodeIdentifier.create(potential.getQName()), potential);
         innerOp = new LeafListEntryContextNode(potential);
     }
 
@@ -37,4 +37,4 @@ class UnorderedLeafListMixinContextNode extends AbstractMixinContextNode<NodeIde
         }
         return null;
     }
-}
\ No newline at end of file
+}

diff --git a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java
index 10a3d0ec2be46349d81a918aad5915ca63b7ec22..9446ff6b7bf394c6e6de88efa7f2d63e589553e1 100644 (file)
--- a/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java
+++ b/yang/yang-data-util/src/main/java/org/opendaylight/yangtools/yang/data/util/UnorderedMapMixinContextNode.java
@@ -19,7 +19,7 @@ class UnorderedMapMixinContextNode extends AbstractMixinContextNode<NodeIdentifi
     private final ListItemContextNode innerNode;
 
     public UnorderedMapMixinContextNode(final ListSchemaNode list) {
-        super(new NodeIdentifier(list.getQName()), list);
+        super(NodeIdentifier.create(list.getQName()), list);
         this.innerNode = new ListItemContextNode(new NodeIdentifierWithPredicates(list.getQName(),
                 Collections.<QName, Object> emptyMap()), list);
     }
@@ -40,4 +40,4 @@ class UnorderedMapMixinContextNode extends AbstractMixinContextNode<NodeIdentifi
         return null;
     }
 
-}
\ No newline at end of file
+}