Take advantage of AugmentationIdentifier.create()

[controller.git] / opendaylight / md-sal / sal-clustering-commons / src / main / java / org / opendaylight / controller / cluster / datastore / node / utils / stream / LithiumNormalizedNodeInputStreamReader.java

diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumNormalizedNodeInputStreamReader.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumNormalizedNodeInputStreamReader.java
index d94503120d8a86e3533341d368c93fe036501dbf..84e96bfb917f90ade240fd3a5671f38edafd5b78 100755 (executable)
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumNormalizedNodeInputStreamReader.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/LithiumNormalizedNodeInputStreamReader.java
@@ -250,7 +250,7 @@ class LithiumNormalizedNodeInputStreamReader extends ForwardingDataInput impleme
     }
 
     AugmentationIdentifier readAugmentationIdentifier() throws IOException {
-        return new AugmentationIdentifier(readQNameSet());
+        return AugmentationIdentifier.create(readQNameSet());
     }
 
     NodeIdentifier readNodeIdentifier() throws IOException {
@@ -262,9 +262,9 @@ class LithiumNormalizedNodeInputStreamReader extends ForwardingDataInput impleme
         final int count = input.readInt();
         switch (count) {
             case 0:
-                return new NodeIdentifierWithPredicates(qname);
+                return NodeIdentifierWithPredicates.of(qname);
             case 1:
-                return new NodeIdentifierWithPredicates(qname, readQName(), readObject());
+                return NodeIdentifierWithPredicates.of(qname, readQName(), readObject());
             default:
                 // ImmutableList is used by ImmutableOffsetMapTemplate for lookups, hence we use that.
                 final Builder<QName> keys = ImmutableList.builderWithExpectedSize(count);
@@ -274,7 +274,7 @@ class LithiumNormalizedNodeInputStreamReader extends ForwardingDataInput impleme
                     values[i] = readObject();
                 }
 
-                return new NodeIdentifierWithPredicates(qname, ImmutableOffsetMapTemplate.ordered(keys.build())
+                return NodeIdentifierWithPredicates.of(qname, ImmutableOffsetMapTemplate.ordered(keys.build())
                     .instantiateWithValues(values));
         }
     }