From: Robert Varga Date: Wed, 28 Aug 2019 12:10:30 +0000 (+0200) Subject: Update NodeIdentifierWithPredicates construction X-Git-Tag: release/magnesium~58 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0ac3eab084cf86ed3bba4aa75e02585d4123248b;p=netconf.git Update NodeIdentifierWithPredicates construction Direct constructors are going away, use factory methods instead. Change-Id: I14092a254320f12269c72304e70dcf7ee5f86e97 Signed-off-by: Robert Varga --- diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java index c4240e2338..064cbabab7 100644 --- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java +++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/StreamingContext.java @@ -205,7 +205,7 @@ abstract class StreamingContext implements Identifiable< AbstractMapMixin(final ListSchemaNode list) { super(NodeIdentifier.create(list.getQName())); - this.innerNode = new ListEntry(new NodeIdentifierWithPredicates(list.getQName(), ImmutableMap.of()), list); + this.innerNode = new ListEntry(NodeIdentifierWithPredicates.of(list.getQName()), list); } @Override diff --git a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java index 1a8ebca07d..04f3e3d860 100644 --- a/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java +++ b/netconf/netconf-util/src/test/java/org/opendaylight/netconf/util/NetconfUtilTest.java @@ -25,7 +25,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Sessions; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -60,20 +61,20 @@ public class NetconfUtilTest { moduleInfoBackedContext.addModuleInfos(Collections.singletonList($YangModuleInfoImpl.getInstance())); final SchemaContext context = moduleInfoBackedContext.getSchemaContext(); final LeafNode username = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(Session.QNAME, "username"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(Session.QNAME, "username"))) .withValue("admin") .build(); final MapEntryNode session1 = Builders.mapEntryBuilder() - .withNodeIdentifier(new YangInstanceIdentifier - .NodeIdentifierWithPredicates(Session.QNAME, QName.create(Session.QNAME, "session-id"), 1L)) + .withNodeIdentifier( + NodeIdentifierWithPredicates.of(Session.QNAME, QName.create(Session.QNAME, "session-id"), 1L)) .withChild(username) .build(); final MapNode sessionList = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Session.QNAME)) + .withNodeIdentifier(new NodeIdentifier(Session.QNAME)) .withChild(session1) .build(); final ContainerNode sessions = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Sessions.QNAME)) + .withNodeIdentifier(new NodeIdentifier(Sessions.QNAME)) .withChild(sessionList) .build(); final DOMResult result = new DOMResult(XmlUtil.newDocument()); diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java index bc30126a52..796ec2f8ba 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java @@ -48,12 +48,12 @@ public final class RemoteDeviceId { private RemoteDeviceId(final String name) { this.name = Preconditions.checkNotNull(name); this.topologyPath = DEFAULT_TOPOLOGY_NODE - .node(new NodeIdentifierWithPredicates(Node.QNAME, NODE_ID_QNAME, name)); + .node(NodeIdentifierWithPredicates.of(Node.QNAME, NODE_ID_QNAME, name)); this.key = new NodeKey(new NodeId(name)); this.topologyBindingPath = DEFAULT_TOPOLOGY_IID.child(Node.class, key); } - public RemoteDeviceId(final String name, InetSocketAddress address) { + public RemoteDeviceId(final String name, final InetSocketAddress address) { this(name); this.address = address; this.host = buildHost(); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java index b602d7b9df..ebba506493 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/schema/mapping/NetconfMessageTransformerTest.java @@ -29,7 +29,6 @@ import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTr import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath; import static org.opendaylight.netconf.util.NetconfUtil.NETCONF_DATA_QNAME; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import java.io.IOException; @@ -68,8 +67,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.Schema; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -276,17 +277,17 @@ public class NetconfMessageTransformerTest { assertTrue(compositeNodeRpcResult.getErrors().isEmpty()); assertNotNull(compositeNodeRpcResult.getResult()); - final List> values = Lists.newArrayList( + final List> values = Lists.newArrayList( NetconfRemoteSchemaYangSourceProvider .createGetSchemaRequest("module", Optional.of("2012-12-12")).getValue()); final Map keys = new HashMap<>(); - for (final DataContainerChild value : values) { + for (final DataContainerChild value : values) { keys.put(value.getNodeType(), value.getValue()); } - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifierWithPredicates = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(Schema.QNAME, keys); + final NodeIdentifierWithPredicates identifierWithPredicates = + NodeIdentifierWithPredicates.of(Schema.QNAME, keys); final MapEntryNode schemaNode = Builders.mapEntryBuilder().withNodeIdentifier(identifierWithPredicates).withValue(values).build(); @@ -308,7 +309,7 @@ public class NetconfMessageTransformerTest { public void testGetConfigLeafRequest() throws Exception { final DataContainerChild filter = toFilterStructure( YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Schemas.QNAME), toId(Schema.QNAME), - new NodeIdentifierWithPredicates(Schema.QNAME, ImmutableMap.of()), + NodeIdentifierWithPredicates.of(Schema.QNAME), toId(QName.create(Schemas.QNAME, "version"))), SCHEMA); final DataContainerChild source = NetconfBaseOps.getSourceNode(NETCONF_RUNNING_QNAME); @@ -360,17 +361,17 @@ public class NetconfMessageTransformerTest { @Test public void testEditConfigRequest() throws Exception { - final List> values = Lists.newArrayList( + final List> values = Lists.newArrayList( NetconfRemoteSchemaYangSourceProvider .createGetSchemaRequest("module", Optional.of("2012-12-12")).getValue()); final Map keys = new HashMap<>(); - for (final DataContainerChild value : values) { + for (final DataContainerChild value : values) { keys.put(value.getNodeType(), value.getValue()); } - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifierWithPredicates = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(Schema.QNAME, keys); + final NodeIdentifierWithPredicates identifierWithPredicates = + NodeIdentifierWithPredicates.of(Schema.QNAME, keys); final MapEntryNode schemaNode = Builders.mapEntryBuilder().withNodeIdentifier(identifierWithPredicates).withValue(values).build(); @@ -421,7 +422,7 @@ public class NetconfMessageTransformerTest { final QName capability = QName.create(Capabilities.QNAME, "capability"); final DataContainerChild filter = toFilterStructure( YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Capabilities.QNAME), toId(capability), - new YangInstanceIdentifier.NodeWithValue<>(capability, "a:b:c")), SCHEMA); + new NodeWithValue<>(capability, "a:b:c")), SCHEMA); final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(toPath(NETCONF_GET_QNAME), NetconfMessageTransformUtil.wrap(NETCONF_GET_QNAME, filter)); @@ -479,7 +480,7 @@ public class NetconfMessageTransformerTest { QName nameQname = QName.create(SERVER_QNAME, "name"); List nodeIdentifiers = new ArrayList<>(); nodeIdentifiers.add(new NodeIdentifier(SERVER_QNAME)); - nodeIdentifiers.add(new NodeIdentifierWithPredicates(SERVER_QNAME, nameQname, "test")); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(SERVER_QNAME, nameQname, "test")); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); ContainerNode data = initInputAction(QName.create(SERVER_QNAME, "reset-at"), "now"); @@ -549,7 +550,7 @@ public class NetconfMessageTransformerTest { List nodeIdentifiers = new ArrayList<>(); nodeIdentifiers.add(NodeIdentifier.create(DEVICE_QNAME)); nodeIdentifiers.add(NodeIdentifier.create(INTERFACE_QNAME)); - nodeIdentifiers.add(new NodeIdentifierWithPredicates(INTERFACE_QNAME, nameQname, "test")); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(INTERFACE_QNAME, nameQname, "test")); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); @@ -582,12 +583,11 @@ public class NetconfMessageTransformerTest { List nodeIdentifiers = new ArrayList<>(); nodeIdentifiers.add(NodeIdentifier.create(SERVER_QNAME)); - nodeIdentifiers.add(new NodeIdentifierWithPredicates(SERVER_QNAME, serverNameQname, "testServer")); - nodeIdentifiers.add(new YangInstanceIdentifier - .AugmentationIdentifier(Collections.singleton(APPLICATIONS_QNAME))); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(SERVER_QNAME, serverNameQname, "testServer")); + nodeIdentifiers.add(new AugmentationIdentifier(Collections.singleton(APPLICATIONS_QNAME))); nodeIdentifiers.add(NodeIdentifier.create(APPLICATIONS_QNAME)); nodeIdentifiers.add(NodeIdentifier.create(APPLICATION_QNAME)); - nodeIdentifiers.add(new NodeIdentifierWithPredicates(APPLICATION_QNAME, + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(APPLICATION_QNAME, applicationNameQname, "testApplication")); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); @@ -632,7 +632,7 @@ public class NetconfMessageTransformerTest { List nodeIdentifiers = new ArrayList<>(); nodeIdentifiers.add(NodeIdentifier.create(BAR_QNAME)); - nodeIdentifiers.add(new NodeIdentifierWithPredicates(BAR_QNAME, barIdQname, "test")); + nodeIdentifiers.add(NodeIdentifierWithPredicates.of(BAR_QNAME, barIdQname, "test")); DOMDataTreeIdentifier domDataTreeIdentifier = prepareDataTreeId(nodeIdentifiers); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java index 437844ee76..1171726e91 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/SchemalessRpcStructureTransformerTest.java @@ -31,6 +31,8 @@ import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.w3c.dom.Document; @@ -141,18 +143,16 @@ public class SchemalessRpcStructureTransformerTest { Assert.assertTrue(String.format("Input %s: %s", testDataset, diff.toString()), diff.similar()); } - private static YangInstanceIdentifier.NodeIdentifier createNodeId(final String name) { - return new YangInstanceIdentifier.NodeIdentifier(QName.create(NAMESPACE, name)); + private static NodeIdentifier createNodeId(final String name) { + return new NodeIdentifier(QName.create(NAMESPACE, name)); } - private static YangInstanceIdentifier.NodeIdentifierWithPredicates createListNodeId( + private static NodeIdentifierWithPredicates createListNodeId( final String nodeName, final String keyName, final String id) { - return new YangInstanceIdentifier - .NodeIdentifierWithPredicates(QName.create(NAMESPACE, nodeName), QName.create(NAMESPACE, keyName), id); + return NodeIdentifierWithPredicates.of(QName.create(NAMESPACE, nodeName), QName.create(NAMESPACE, keyName), id); } - private static YangInstanceIdentifier.NodeIdentifierWithPredicates createListNodeId( - final String nodeName, final Map keys) { - return new YangInstanceIdentifier.NodeIdentifierWithPredicates(QName.create(NAMESPACE, nodeName), keys); + private static NodeIdentifierWithPredicates createListNodeId(final String nodeName, final Map keys) { + return NodeIdentifierWithPredicates.of(QName.create(NAMESPACE, nodeName), keys); } } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java index 11c009c34f..ae396dc056 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java @@ -50,6 +50,9 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; @@ -174,9 +177,9 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory { final QName namespace = QName.create(Schema.QNAME, "namespace"); CollectionNodeBuilder schemaMapEntryNodeMapNodeCollectionNodeBuilder = Builders - .mapBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Schema.QNAME)); + .mapBuilder().withNodeIdentifier(new NodeIdentifier(Schema.QNAME)); LeafSetEntryNode locationLeafSetEntryNode = Builders.leafSetEntryBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeWithValue(location, "NETCONF")).withValue("NETCONF").build(); + new NodeWithValue<>(location, "NETCONF")).withValue("NETCONF").build(); Map keyValues = Maps.newHashMap(); for (final Schema schema : monitor.getSchemas().getSchema()) { @@ -184,18 +187,18 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory { keyValues.put(version, schema.getVersion()); keyValues.put(format, Yang.QNAME); - MapEntryNode schemaMapEntryNode = Builders.mapEntryBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifierWithPredicates(Schema.QNAME, keyValues)) - .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( - identifier)).withValue(schema.getIdentifier()).build()) - .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( - version)).withValue(schema.getVersion()).build()) - .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( - format)).withValue(Yang.QNAME).build()) - .withChild(Builders.leafBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( - namespace)).withValue(schema.getNamespace().getValue()).build()) + MapEntryNode schemaMapEntryNode = Builders.mapEntryBuilder() + .withNodeIdentifier(NodeIdentifierWithPredicates.of(Schema.QNAME, keyValues)) + .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(identifier)) + .withValue(schema.getIdentifier()).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(version)) + .withValue(schema.getVersion()).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(format)) + .withValue(Yang.QNAME).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(namespace)) + .withValue(schema.getNamespace().getValue()).build()) .withChild((DataContainerChild) Builders.leafSetBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(location)) + new NodeIdentifier(location)) .withChild(locationLeafSetEntryNode).build()) .build(); @@ -205,9 +208,9 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory { DataContainerChild schemaList = schemaMapEntryNodeMapNodeCollectionNodeBuilder.build(); ContainerNode schemasContainer = Builders.containerBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(Schemas.QNAME)).withChild(schemaList).build(); + new NodeIdentifier(Schemas.QNAME)).withChild(schemaList).build(); return Builders.containerBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(NetconfState.QNAME)).withChild(schemasContainer).build(); + new NodeIdentifier(NetconfState.QNAME)).withChild(schemasContainer).build(); } private static DOMDataBroker createDataStore(final DOMSchemaService schemaService, final long sessionId) { diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java index 6cf6783036..f3bea93690 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestCodec.java @@ -288,7 +288,7 @@ public final class RestCodec { validNamespace); predicatesMap.put(listKey.getQName(), predicate.getValue()); } - pathArgument = new NodeIdentifierWithPredicates(qName, predicatesMap); + pathArgument = NodeIdentifierWithPredicates.of(qName, predicatesMap); } else { LOG.info("Node {} is not List or Leaf-list.", node); LOG.info("Instance-identifier will be translated as NULL for data - {}", diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java index 96d7b5e385..669c7601fe 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java @@ -5,7 +5,6 @@ * 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.controller.sal.restconf.impl.test; import static org.junit.Assert.assertEquals; @@ -44,7 +43,7 @@ public class Bug3595Test { @Test public void testLeafrefListKeyDeserializtion() { final YangInstanceIdentifier node1IIexpected = YangInstanceIdentifier.of(CONT_QNAME) - .node(LST_WITH_LFREF_KEY_QNAME).node(new NodeIdentifierWithPredicates( + .node(LST_WITH_LFREF_KEY_QNAME).node(NodeIdentifierWithPredicates.of( LST_WITH_LFREF_KEY_QNAME, LFREF_KEY_QNAME, "node1")); final InstanceIdentifierContext iiContext = controllerContext.toInstanceIdentifier("leafref-module:cont/lst-with-lfref-key/node1"); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java index 27c497d607..81ec299c29 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java @@ -24,6 +24,7 @@ import org.opendaylight.netconf.sal.restconf.impl.ControllerContext; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -64,7 +65,7 @@ public class Bug8072Test { keyValues.put(NAME_QNAME, "name"); keyValues.put(TYPE_QNAME, MODULE_TYPE_QNAME); final YangInstanceIdentifier expectedYII = YangInstanceIdentifier.of(MODULES_QNAME).node(MODULE_QNAME) - .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates(MODULE_QNAME, keyValues)); + .node(NodeIdentifierWithPredicates.of(MODULE_QNAME, keyValues)); assertEquals(expectedYII, ctx.getInstanceIdentifier()); } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java index dc049410da..f55030c293 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java @@ -132,7 +132,7 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch keyValues.put(QName.create(new URI("augment:module"), "keyvalue111"), "value1"); keyValues.put(QName.create(new URI("augment:module"), "keyvalue112"), "value2"); final NodeIdentifierWithPredicates nodeIdentifierWithPredicates = - new NodeIdentifierWithPredicates(qName, keyValues); + NodeIdentifierWithPredicates.of(qName, keyValues); pathArguments.add(nodeIdentifierWithPredicates); pathArguments.add(new NodeIdentifier(QName.create(new URI("augment:augment:module"), "lf112"))); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java index 0128a9323f..6c448e26ee 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java @@ -309,8 +309,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { } private static NodeIdentifierWithPredicates toIdentifier(final String localName, final Map keys) { - return new NodeIdentifierWithPredicates(QName.create("urn:nested:module", "2014-06-03", localName), - keys); + return NodeIdentifierWithPredicates.of(QName.create("urn:nested:module", "2014-06-03", localName), keys); } private static NodeWithValue toIdentifier(final String localName, final Object value) { diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java index 3c87380b11..15e48cd6af 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/JSONRestconfServiceImplTest.java @@ -243,7 +243,7 @@ public class JSONRestconfServiceImplTest { assertTrue("Expected MapNode. Actual " + mapChild.get().getClass(), mapChild.get() instanceof MapNode); final MapNode mapNode = (MapNode)mapChild.get(); - final NodeIdentifierWithPredicates entryNodeID = new NodeIdentifierWithPredicates( + final NodeIdentifierWithPredicates entryNodeID = NodeIdentifierWithPredicates.of( INTERFACE_QNAME, NAME_QNAME, "eth0"); final java.util.Optional entryChild = mapNode.getChild(entryNodeID); assertEquals(entryNodeID.toString() + " present", true, entryChild.isPresent()); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java index e595877373..f29942df10 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java @@ -206,10 +206,9 @@ public class RestGetOperationTest extends JerseyTest { final QName qNameList = newTestModuleQName("lst1"); final QName qNameKeyList = newTestModuleQName("lf11"); - parameters.add(new YangInstanceIdentifier.NodeIdentifier(qNameCont)); - parameters.add(new YangInstanceIdentifier.NodeIdentifier(qNameList)); - parameters.add(new YangInstanceIdentifier.NodeIdentifierWithPredicates(qNameList, qNameKeyList, - "GigabitEthernet0/0/0/0")); + parameters.add(new NodeIdentifier(qNameCont)); + parameters.add(new NodeIdentifier(qNameList)); + parameters.add(NodeIdentifierWithPredicates.of(qNameList, qNameKeyList, "GigabitEthernet0/0/0/0")); return YangInstanceIdentifier.create(parameters); } @@ -234,15 +233,15 @@ public class RestGetOperationTest extends JerseyTest { setControllerContext(schemaContextTestModule); final QName moduleQN = newTestModuleQName("module"); - final ImmutableMap keyMap = ImmutableMap.builder() - .put(newTestModuleQName("type"), newTestModuleQName("test-identity")) - .put(newTestModuleQName("name"), "foo").build(); + final ImmutableMap keyMap = ImmutableMap.of( + newTestModuleQName("type"), newTestModuleQName("test-identity"), + newTestModuleQName("name"), "foo"); final YangInstanceIdentifier iid = YangInstanceIdentifier.builder().node(newTestModuleQName("modules")) .node(moduleQN).nodeWithKey(moduleQN, keyMap).build(); @SuppressWarnings("rawtypes") final NormalizedNode data = ImmutableMapNodeBuilder.create().withNodeIdentifier( new NodeIdentifier(moduleQN)).withChild(ImmutableNodes.mapEntryBuilder() - .withNodeIdentifier(new NodeIdentifierWithPredicates(moduleQN, keyMap)) + .withNodeIdentifier(NodeIdentifierWithPredicates.of(moduleQN, keyMap)) .withChild(ImmutableNodes.leafNode(newTestModuleQName("type"), newTestModuleQName("test-identity"))) .withChild(ImmutableNodes.leafNode(newTestModuleQName("name"), "foo")) .withChild(ImmutableNodes.leafNode(newTestModuleQName("data"), "bar")).build()).build(); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java index 55fc13830a..be7060d1e2 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java @@ -64,7 +64,7 @@ public class RestPutConfigTest { final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "interface"); final QName qNameKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "name"); final NodeIdentifierWithPredicates identWithPredicates = - new NodeIdentifierWithPredicates(qName, qNameKey, "key"); + NodeIdentifierWithPredicates.of(qName, qNameKey, "key"); Mockito.when(data.getNodeType()).thenReturn(qName); Mockito.when(data.getIdentifier()).thenReturn(identWithPredicates); final NormalizedNodeContext payload = new NormalizedNodeContext(iiCx, data); @@ -86,7 +86,7 @@ public class RestPutConfigTest { final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "sub-interface"); final QName qNameSubKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "sub-name"); final NodeIdentifierWithPredicates identWithPredicates = - new NodeIdentifierWithPredicates(qName, qNameSubKey, "subkey"); + NodeIdentifierWithPredicates.of(qName, qNameSubKey, "subkey"); Mockito.when(data.getNodeType()).thenReturn(qName); Mockito.when(data.getIdentifier()).thenReturn(identWithPredicates); final NormalizedNodeContext payload = new NormalizedNodeContext(iiCx, data); @@ -114,7 +114,7 @@ public class RestPutConfigTest { final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "interface"); final QName qNameKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "name"); final NodeIdentifierWithPredicates identWithPredicates = - new NodeIdentifierWithPredicates(qName, qNameKey, "notSameKey"); + NodeIdentifierWithPredicates.of(qName, qNameKey, "notSameKey"); Mockito.when(data.getNodeType()).thenReturn(qName); Mockito.when(data.getIdentifier()).thenReturn(identWithPredicates); final NormalizedNodeContext payload = new NormalizedNodeContext(iiCx, data); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java index 79d08e6ebf..0498291fe5 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java @@ -109,7 +109,7 @@ public class RestconfImplTest { final MapEntryNode payload = mock(MapEntryNode.class); final NodeIdentifierWithPredicates nodeIdWithPred = - new NodeIdentifierWithPredicates(keyDef, keyDef, al2.toArray()); + NodeIdentifierWithPredicates.of(keyDef, keyDef, al2.toArray()); when(payload.getIdentifier()).thenReturn(nodeIdWithPred); final List keyDefinitions = new ArrayList<>(); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java index bd5a8c0ccd..8a72334a5b 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java @@ -217,7 +217,7 @@ public final class TestUtils { predicate.put(QName.create(namespace, revision, key), keys.get(key)); } - return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate); + return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate); } public static NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName, @@ -231,7 +231,7 @@ public final class TestUtils { predicate.put(QName.create(namespace, revision, keysAndValues[index++]), keysAndValues[index++]); } - return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate); + return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate); } public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException { diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java index 9b724416e4..c086c98cb5 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/rest/impl/DepthAwareNormalizedNodeWriterTest.java @@ -25,7 +25,6 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; @@ -95,8 +94,8 @@ public class DepthAwareNormalizedNodeWriterTest { keyLeafNodeIdentifier = NodeIdentifier.create(mapEntryNodeKey); keyLeafNodeValue = "key-value"; - mapEntryNodeIdentifier = new YangInstanceIdentifier.NodeIdentifierWithPredicates( - QName.create("namespace", "list-entry"), Collections.singletonMap(mapEntryNodeKey, keyLeafNodeValue)); + mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of( + QName.create("namespace", "list-entry"), mapEntryNodeKey, keyLeafNodeValue); when(mapEntryNodeData.getIdentifier()).thenReturn(mapEntryNodeIdentifier); when(mapEntryNodeData.getChild(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData)); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java index 44940b4a5a..441be7bce6 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/restconf/impl/InstanceIdentifierCodecImplTest.java @@ -5,7 +5,6 @@ * 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.netconf.sal.restconf.impl; import static org.junit.Assert.assertEquals; @@ -21,6 +20,7 @@ import org.opendaylight.restconf.common.util.IdentityValuesDTO; import org.opendaylight.yangtools.concepts.Codec; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -54,7 +54,7 @@ public class InstanceIdentifierCodecImplTest { .build(); this.instanceIdentifierOKList = YangInstanceIdentifier.builder() - .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates( + .node(NodeIdentifierWithPredicates.of( QName.create(baseQName, "list-one-key"), QName.create(QName.create(baseQName, "list-one-key"), "name"), "value")) .build(); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java index 079f14f71f..7038e23666 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/netconf/sal/streams/listeners/NotificationListenerTest.java @@ -187,7 +187,7 @@ public class NotificationListenerTest { final MapEntryNode entry = mock(MapEntryNode.class); final Map keyValues = new HashMap<>(); keyValues.put(leaf.getNodeType(), "value"); - final NodeIdentifierWithPredicates nodeId = new NodeIdentifierWithPredicates(leaf.getNodeType(), keyValues); + final NodeIdentifierWithPredicates nodeId = NodeIdentifierWithPredicates.of(leaf.getNodeType(), keyValues); when(entry.getIdentifier()).thenReturn(nodeId); when(entry.getChild(any())).thenReturn(Optional.of(leaf)); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java index 52bebecf37..84a2037cf1 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/codecs/RestCodec.java @@ -295,7 +295,7 @@ public final class RestCodec { predicate.getName().getValue(), validNamespace); predicatesMap.put(listKey.getQName(), predicate.getValue()); } - pathArgument = new NodeIdentifierWithPredicates(qName, predicatesMap); + pathArgument = NodeIdentifierWithPredicates.of(qName, predicatesMap); } else { LOG.info("Node {} is not List or Leaf-list.", node); LOG.info("Instance-identifier will be translated as NULL for data - {}", diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java index 0b3fd47f14..aa79fdedf9 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java @@ -230,7 +230,7 @@ public final class TestUtils { predicate.put(QName.create(namespace, revision, key), keys.get(key)); } - return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate); + return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate); } public static NodeIdentifierWithPredicates getNodeIdentifierPredicate(final String localName, @@ -244,7 +244,7 @@ public final class TestUtils { predicate.put(QName.create(namespace, revision, keysAndValues[index++]), keysAndValues[index++]); } - return new NodeIdentifierWithPredicates(QName.create(namespace, revision, localName), predicate); + return NodeIdentifierWithPredicates.of(QName.create(namespace, revision, localName), predicate); } public static NormalizedNode prepareNormalizedNodeWithIetfInterfacesInterfacesData() throws ParseException { diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java index a3e1f635cc..91be11e251 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java @@ -25,7 +25,6 @@ import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; @@ -99,8 +98,8 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { keyLeafNodeIdentifier = NodeIdentifier.create(mapEntryNodeKey); keyLeafNodeValue = "key-value"; - mapEntryNodeIdentifier = new YangInstanceIdentifier.NodeIdentifierWithPredicates( - QName.create("namespace", "list-entry"), Collections.singletonMap(mapEntryNodeKey, keyLeafNodeValue)); + mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of( + QName.create("namespace", "list-entry"), mapEntryNodeKey, keyLeafNodeValue); when(mapEntryNodeData.getIdentifier()).thenReturn(mapEntryNodeIdentifier); when(mapEntryNodeData.getChild(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData)); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java index 883218ee1c..4bba8c5e1e 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java @@ -97,8 +97,8 @@ public class ParameterAwareNormalizedNodeWriterFieldsTest { keyLeafNodeIdentifier = NodeIdentifier.create(mapEntryNodeKey); keyLeafNodeValue = "key-value"; - mapEntryNodeIdentifier = new NodeIdentifierWithPredicates( - QName.create("namespace", "list-entry"), Collections.singletonMap(mapEntryNodeKey, keyLeafNodeValue)); + mapEntryNodeIdentifier = NodeIdentifierWithPredicates.of( + QName.create("namespace", "list-entry"), mapEntryNodeKey, keyLeafNodeValue); Mockito.when(mapEntryNodeData.getIdentifier()).thenReturn(mapEntryNodeIdentifier); Mockito.when(mapEntryNodeData.getNodeType()).thenReturn(mapEntryNodeIdentifier.getNodeType()); Mockito.when(mapEntryNodeData.getChild(keyLeafNodeIdentifier)).thenReturn(Optional.of(keyLeafNodeData)); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java index 1587d0fbe7..e660130860 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040ImplTest.java @@ -290,13 +290,12 @@ public class JSONRestconfServiceRfc8040ImplTest { final ContainerNode actualNode = (ContainerNode) capturedNode.getValue(); assertEquals("ContainerNode node type", INTERFACES_QNAME, actualNode.getNodeType()); - final Optional> mapChild = actualNode.getChild( - new NodeIdentifier(INTERFACE_QNAME)); + final Optional> mapChild = actualNode.getChild(new NodeIdentifier(INTERFACE_QNAME)); assertEquals(INTERFACE_QNAME.toString() + " present", true, mapChild.isPresent()); assertTrue("Expected MapNode. Actual " + mapChild.get().getClass(), mapChild.get() instanceof MapNode); final MapNode mapNode = (MapNode)mapChild.get(); - final NodeIdentifierWithPredicates entryNodeID = new NodeIdentifierWithPredicates( + final NodeIdentifierWithPredicates entryNodeID = NodeIdentifierWithPredicates.of( INTERFACE_QNAME, NAME_QNAME, "eth0"); final Optional entryChild = mapNode.getChild(entryNodeID); assertEquals(entryNodeID.toString() + " present", true, entryChild.isPresent()); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java index 97dfe38202..c42d0dc531 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java @@ -65,6 +65,7 @@ import org.opendaylight.restconf.nb.rfc8040.rests.services.api.RestconfStreamsSu import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -136,38 +137,38 @@ public class RestconfDataServiceImplTest { final QName listPlaylistQName = QName.create(this.baseQName, "playlist"); final LeafNode buildLeaf = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(this.leafQname)) + .withNodeIdentifier(new NodeIdentifier(this.leafQname)) .withValue(0.2) .build(); this.buildPlayerCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(this.containerPlayerQname)) + .withNodeIdentifier(new NodeIdentifier(this.containerPlayerQname)) .withChild(buildLeaf) .build(); this.buildLibraryCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(containerLibraryQName)) + .withNodeIdentifier(new NodeIdentifier(containerLibraryQName)) .build(); this.buildPlaylistList = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listPlaylistQName)) + .withNodeIdentifier(new NodeIdentifier(listPlaylistQName)) .build(); this.buildBaseCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(this.baseQName)) + .withNodeIdentifier(new NodeIdentifier(this.baseQName)) .withChild(this.buildPlayerCont) .build(); // config contains one child the same as in operational and one additional this.buildBaseContConfig = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(this.baseQName)) + .withNodeIdentifier(new NodeIdentifier(this.baseQName)) .withChild(this.buildPlayerCont) .withChild(this.buildLibraryCont) .build(); // operational contains one child the same as in config and one additional this.buildBaseContOperational = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(this.baseQName)) + .withNodeIdentifier(new NodeIdentifier(this.baseQName)) .withChild(this.buildPlayerCont) .withChild(this.buildPlaylistList) .build(); @@ -383,14 +384,14 @@ public class RestconfDataServiceImplTest { public void testPostData() { final QName listQname = QName.create(this.baseQName, "playlist"); final QName listKeyQname = QName.create(this.baseQName, "name"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band"); + final NodeIdentifierWithPredicates nodeWithKey = + NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band"); final LeafNode content = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(this.baseQName, "name"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(this.baseQName, "name"))) .withValue("name of band") .build(); final LeafNode content2 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(this.baseQName, "description"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(this.baseQName, "description"))) .withValue("band description") .build(); final MapEntryNode mapEntryNode = Builders.mapEntryBuilder() @@ -399,7 +400,7 @@ public class RestconfDataServiceImplTest { .withChild(content2) .build(); final MapNode buildList = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname)) + .withNodeIdentifier(new NodeIdentifier(listQname)) .withChild(mapEntryNode) .build(); @@ -410,7 +411,7 @@ public class RestconfDataServiceImplTest { doReturn(immediateFluentFuture(Optional.empty())) .when(this.read).read(LogicalDatastoreType.CONFIGURATION, this.iidBase); final MapNode data = (MapNode) payload.getData(); - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifier = + final NodeIdentifierWithPredicates identifier = data.getValue().iterator().next().getIdentifier(); final YangInstanceIdentifier node = payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java index 9446e5c478..36cefb6444 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java @@ -43,6 +43,8 @@ import org.opendaylight.restconf.nb.rfc8040.references.SchemaContextRef; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.TransactionVarsWrapper; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -89,8 +91,8 @@ public class PatchDataTransactionUtilTest { final QName containerLibraryQName = QName.create(baseQName, "library"); final QName listArtistQName = QName.create(baseQName, "artist"); final QName leafNameQName = QName.create(baseQName, "name"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listArtistQName, leafNameQName, "name of artist"); + final NodeIdentifierWithPredicates nodeWithKey = NodeIdentifierWithPredicates.of(listArtistQName, leafNameQName, + "name of artist"); /* instance identifier for accessing container node "player" */ this.instanceIdContainer = YangInstanceIdentifier.builder() @@ -103,17 +105,17 @@ public class PatchDataTransactionUtilTest { /* values that are used for creating leaf for testPatchDataCreateAndDelete test */ final LeafNode buildGapLeaf = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(leafGapQName)) + .withNodeIdentifier(new NodeIdentifier(leafGapQName)) .withValue(0.2) .build(); final ContainerNode buildPlayerContainer = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(containerPlayerQName)) + .withNodeIdentifier(new NodeIdentifier(containerPlayerQName)) .withChild(buildGapLeaf) .build(); this.buildBaseContainerForTests = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName)) + .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildPlayerContainer) .build(); @@ -133,12 +135,12 @@ public class PatchDataTransactionUtilTest { /* values that are used for creating leaf for testPatchDataReplaceMergeAndRemove test */ final LeafNode contentName = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "name"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "name"))) .withValue("name of artist") .build(); final LeafNode contentDescription = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description"))) .withValue("description of artist") .build(); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java index 2b33730f9d..922c566136 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java @@ -41,6 +41,8 @@ import org.opendaylight.restconf.nb.rfc8040.rests.transactions.TransactionVarsWr import org.opendaylight.yangtools.util.SingletonSet; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -89,31 +91,31 @@ public class PostDataTransactionUtilTest { final QName leafQname = QName.create(baseQName, "gap"); final QName listQname = QName.create(baseQName, "playlist"); final QName listKeyQname = QName.create(baseQName, "name"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band"); + final NodeIdentifierWithPredicates nodeWithKey = NodeIdentifierWithPredicates.of(listQname, listKeyQname, + "name of band"); this.iid2 = YangInstanceIdentifier.builder() .node(baseQName) .build(); final LeafNode buildLeaf = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(leafQname)) + .withNodeIdentifier(new NodeIdentifier(leafQname)) .withValue(0.2) .build(); final ContainerNode buildPlayerCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(containerQname)) + .withNodeIdentifier(new NodeIdentifier(containerQname)) .withChild(buildLeaf) .build(); this.buildBaseCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName)) + .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildPlayerCont) .build(); final LeafNode content = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "name"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "name"))) .withValue("name of band") .build(); final LeafNode content2 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description"))) .withValue("band description") .build(); final MapEntryNode mapEntryNode = Builders.mapEntryBuilder() @@ -122,7 +124,7 @@ public class PostDataTransactionUtilTest { .withChild(content2) .build(); this.buildList = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname)) + .withNodeIdentifier(new NodeIdentifier(listQname)) .withChild(mapEntryNode) .build(); @@ -142,7 +144,7 @@ public class PostDataTransactionUtilTest { doReturn(immediateFalseFluentFuture()).when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2); - final YangInstanceIdentifier.NodeIdentifier identifier = + final NodeIdentifier identifier = ((ContainerNode) ((SingletonSet) payload.getData().getValue()).iterator().next()).getIdentifier(); final YangInstanceIdentifier node = payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); @@ -166,8 +168,7 @@ public class PostDataTransactionUtilTest { final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildList); final MapNode data = (MapNode) payload.getData(); - final YangInstanceIdentifier.NodeIdentifierWithPredicates identifier = - data.getValue().iterator().next().getIdentifier(); + final NodeIdentifierWithPredicates identifier = data.getValue().iterator().next().getIdentifier(); final YangInstanceIdentifier node = payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); doReturn(immediateFalseFluentFuture()).when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); @@ -190,7 +191,7 @@ public class PostDataTransactionUtilTest { doReturn(immediateFalseFluentFuture()).when(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, this.iid2); - final YangInstanceIdentifier.NodeIdentifier identifier = + final NodeIdentifier identifier = ((ContainerNode) ((SingletonSet) payload.getData().getValue()).iterator().next()).getIdentifier(); final YangInstanceIdentifier node = payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java index dfb3ad4e32..6d026c5d7d 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java @@ -33,6 +33,8 @@ import org.opendaylight.restconf.nb.rfc8040.references.SchemaContextRef; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.TransactionVarsWrapper; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -85,10 +87,10 @@ public class PutDataTransactionUtilTest { final QName listQname = QName.create(baseQName, "playlist"); final QName listKeyQname = QName.create(baseQName, "name"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey2 = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQname, "name of band 2"); + final NodeIdentifierWithPredicates nodeWithKey = + NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band"); + final NodeIdentifierWithPredicates nodeWithKey2 = + NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band 2"); this.iid = YangInstanceIdentifier.builder() .node(baseQName) @@ -110,23 +112,23 @@ public class PutDataTransactionUtilTest { this.schemaNode3 = DataSchemaContextTree.from(this.schema).getChild(this.iid3).getDataSchemaNode(); this.buildLeaf = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(leafQname)) + .withNodeIdentifier(new NodeIdentifier(leafQname)) .withValue(0.2) .build(); final ContainerNode buildPlayerCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(containerQname)) + .withNodeIdentifier(new NodeIdentifier(containerQname)) .withChild(this.buildLeaf) .build(); this.buildBaseCont = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName)) + .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildPlayerCont) .build(); final LeafNode content = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "name"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "name"))) .withValue("name of band") .build(); final LeafNode content2 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description"))) .withValue("band description") .build(); this.buildListEntry = Builders.mapEntryBuilder() @@ -135,11 +137,11 @@ public class PutDataTransactionUtilTest { .withChild(content2) .build(); final LeafNode content3 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "name"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "name"))) .withValue("name of band 2") .build(); final LeafNode content4 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(baseQName, "description"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(baseQName, "description"))) .withValue("band description 2") .build(); final MapEntryNode buildListEntry2 = Builders.mapEntryBuilder() @@ -148,12 +150,12 @@ public class PutDataTransactionUtilTest { .withChild(content4) .build(); final MapNode buildList = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname)) + .withNodeIdentifier(new NodeIdentifier(listQname)) .withChild(this.buildListEntry) .withChild(buildListEntry2) .build(); this.buildBaseContWithList = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(baseQName)) + .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildList) .build(); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java index 94905d21b1..130b0c8ec7 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TestData.java @@ -9,6 +9,8 @@ package org.opendaylight.restconf.nb.rfc8040.rests.utils; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; @@ -57,22 +59,21 @@ class TestData { final QName listQname = QName.create(base, "list"); TestData() { - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQName, "keyValue"); - final YangInstanceIdentifier.NodeIdentifierWithPredicates nodeWithKey2 = - new YangInstanceIdentifier.NodeIdentifierWithPredicates(listQname, listKeyQName, "keyValue2"); + final NodeIdentifierWithPredicates nodeWithKey = + NodeIdentifierWithPredicates.of(listQname, listKeyQName, "keyValue"); + final NodeIdentifierWithPredicates nodeWithKey2 = + NodeIdentifierWithPredicates.of(listQname, listKeyQName, "keyValue2"); final LeafNode content = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(base, "leaf-content"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(base, "leaf-content"))) .withValue("content") .build(); final LeafNode content2 = Builders.leafBuilder() - .withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(QName.create(base, "leaf-content-different"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(base, "leaf-content-different"))) .withValue("content-different") .build(); - final DataContainerChild dataContainer = + final DataContainerChild dataContainer = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(listQname, "identifier"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(listQname, "identifier"))) .withValue("id") .build(); data = Builders.mapEntryBuilder() @@ -89,11 +90,11 @@ class TestData { .withChild(content) .build(); listData = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(listQname, "list"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(listQname, "list"))) .withChild(data) .build(); listData2 = Builders.mapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(listQname, "list"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(listQname, "list"))) .withChild(data) .withChild(data2) .build(); @@ -112,15 +113,15 @@ class TestData { .node(listQname) .build(); contentLeaf = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(base, "content"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(base, "content"))) .withValue("test") .build(); contentLeaf2 = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(base, "content2"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(base, "content2"))) .withValue("test2") .build(); data3 = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(base, "container"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(base, "container"))) .withChild(contentLeaf) .build(); data4 = Builders.containerBuilder() @@ -130,30 +131,30 @@ class TestData { leafSetNodePath = YangInstanceIdentifier.builder().node(QName.create(base, "cont")) .node(leafListQname).build(); - leafSetNode1 = Builders.leafSetBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( + leafSetNode1 = Builders.leafSetBuilder().withNodeIdentifier(new NodeIdentifier( leafListQname)).withChildValue("one").withChildValue("two").build(); - leafSetNode2 = Builders.leafSetBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( + leafSetNode2 = Builders.leafSetBuilder().withNodeIdentifier(new NodeIdentifier( leafListQname)).withChildValue("three").build(); orderedLeafSetNode1 = Builders.orderedLeafSetBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(leafListQname)).withChildValue("one") + new NodeIdentifier(leafListQname)).withChildValue("one") .withChildValue("two").build(); orderedLeafSetNode2 = Builders.orderedLeafSetBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(leafListQname)).withChildValue("three") + new NodeIdentifier(leafListQname)).withChildValue("three") .withChildValue("four").build(); orderedMapNode1 = Builders.orderedMapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(data).build(); + .withNodeIdentifier(new NodeIdentifier(listQname)).withChild(data).build(); orderedMapNode2 = Builders.orderedMapBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(data) + .withNodeIdentifier(new NodeIdentifier(listQname)).withChild(data) .withChild(data2).build(); unkeyedListEntryNode1 = Builders.unkeyedListEntryBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(content).build(); + new NodeIdentifier(listQname)).withChild(content).build(); unkeyedListNode1 = Builders.unkeyedListBuilder().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(unkeyedListEntryNode1).build(); + new NodeIdentifier(listQname)).withChild(unkeyedListEntryNode1).build(); unkeyedListEntryNode2 = Builders.unkeyedListEntryBuilder().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(listQname)).withChild(content2).build(); @@ -165,19 +166,19 @@ class TestData { rpc = SchemaPath.create(true, rpcQname); errorRpc = SchemaPath.create(true, errorRpcQname); final LeafNode contentLeafNode = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(rpcQname, "content"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(rpcQname, "content"))) .withValue("test") .build(); input = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(rpcQname, "input"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(rpcQname, "input"))) .withChild(contentLeafNode) .build(); final LeafNode resultLeafNode = Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(rpcQname, "content"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(rpcQname, "content"))) .withValue("operation result") .build(); output = Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create(rpcQname, "output"))) + .withNodeIdentifier(new NodeIdentifier(QName.create(rpcQname, "output"))) .withChild(resultLeafNode) .build(); } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerTest.java index 8b1ede4116..4f923eb120 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/NotificationListenerTest.java @@ -17,8 +17,6 @@ import com.google.common.collect.Lists; import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import java.util.Optional; import org.junit.Before; import org.junit.Test; @@ -173,9 +171,8 @@ public class NotificationListenerTest { private static MapEntryNode mockMapEntry(final QName entryQName, final LeafNode leaf) { final MapEntryNode entry = mock(MapEntryNode.class); - final Map keyValues = new HashMap<>(); - keyValues.put(leaf.getNodeType(), "value"); - final NodeIdentifierWithPredicates nodeId = new NodeIdentifierWithPredicates(leaf.getNodeType(), keyValues); + final NodeIdentifierWithPredicates nodeId = NodeIdentifierWithPredicates.of(leaf.getNodeType(), + leaf.getNodeType(), "value"); when(entry.getIdentifier()).thenReturn(nodeId); when(entry.getChild(any())).thenReturn(Optional.of(leaf)); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java index 5ca01ff2eb..58e6a44e8a 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializerTest.java @@ -5,7 +5,6 @@ * 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.restconf.nb.rfc8040.utils.parser; import static org.junit.Assert.assertEquals; @@ -18,6 +17,7 @@ import java.io.FileNotFoundException; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Map.Entry; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -27,6 +27,10 @@ import org.opendaylight.restconf.common.errors.RestconfError; import org.opendaylight.restconf.nb.rfc8040.TestRestconfUtils; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -54,12 +58,12 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeContainerTest() { - final Iterable result = YangInstanceIdentifierDeserializer + final Iterable result = YangInstanceIdentifierDeserializer .create(this.schemaContext, "deserializer-test:contA"); assertEquals("Result does not contains expected number of path arguments", 1, Iterables.size(result)); assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), + NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), result.iterator().next()); } @@ -69,17 +73,17 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeContainerWithLeafTest() { - final Iterable result = YangInstanceIdentifierDeserializer + final Iterable result = YangInstanceIdentifierDeserializer .create(this.schemaContext, "deserializer-test:contA/leaf-A"); assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), + NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), iterator.next()); assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "leaf-A")), + NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "leaf-A")), iterator.next()); } @@ -89,36 +93,28 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeContainerWithListWithLeafListTest() { - final Iterable result = YangInstanceIdentifierDeserializer + final Iterable result = YangInstanceIdentifierDeserializer .create(this.schemaContext, "deserializer-test:contA/list-A=100/leaf-list-AA=instance"); assertEquals("Result does not contains expected number of path arguments", 5, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); // container assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), + NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), iterator.next()); // list final QName list = QName.create("deserializer:test", "2016-06-06", "list-A"); - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates( - list, QName.create(list, "list-key"), 100).toString(), - iterator.next().toString()); + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifierWithPredicates.of( + list, QName.create(list, "list-key"), 100).toString(), iterator.next().toString()); // leaf list final QName leafList = QName.create("deserializer:test", "2016-06-06", "leaf-list-AA"); - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(leafList), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeWithValue<>(leafList, "instance"), - iterator.next()); + assertEquals("Not expected path argument", NodeIdentifier.create(leafList), iterator.next()); + assertEquals("Not expected path argument", new NodeWithValue<>(leafList, "instance"), iterator.next()); } /** @@ -127,27 +123,26 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeContainerWithListWithActionTest() { - final Iterable result = YangInstanceIdentifierDeserializer - .create(this.schemaContext, "example-actions:interfaces/interface=eth0/reset"); + final Iterable result = YangInstanceIdentifierDeserializer.create(this.schemaContext, + "example-actions:interfaces/interface=eth0/reset"); assertEquals("Result does not contains expected number of path arguments", 4, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); // container - assertEquals("Not expected path argument", YangInstanceIdentifier.NodeIdentifier - .create(QName.create("https://example.com/ns/example-actions", "2016-07-07", "interfaces")), + assertEquals("Not expected path argument", + NodeIdentifier.create(QName.create("https://example.com/ns/example-actions", "2016-07-07", "interfaces")), iterator.next()); // list final QName list = QName.create("https://example.com/ns/example-actions", "2016-07-07", "interface"); - assertEquals("Not expected path argument", YangInstanceIdentifier.NodeIdentifier.create(list), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates(list, QName.create(list, "name"), "eth0"), - iterator.next()); + NodeIdentifierWithPredicates.of(list, QName.create(list, "name"), "eth0"), iterator.next()); // action QName final QName action = QName.create("https://example.com/ns/example-actions", "2016-07-07", "reset"); - assertEquals("Not expected path argument", YangInstanceIdentifier.NodeIdentifier.create(action), + assertEquals("Not expected path argument", NodeIdentifier.create(action), iterator.next()); } @@ -157,20 +152,16 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeListWithNoKeysTest() { - final Iterable result = YangInstanceIdentifierDeserializer - .create(this.schemaContext, "deserializer-test:list-no-key"); + final Iterable result = YangInstanceIdentifierDeserializer.create(this.schemaContext, + "deserializer-test:list-no-key"); assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); final QName list = QName.create("deserializer:test", "2016-06-06", "list-no-key"); - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); } /** @@ -179,20 +170,17 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeListWithOneKeyTest() { - final Iterable result = YangInstanceIdentifierDeserializer - .create(this.schemaContext, "deserializer-test:list-one-key=value"); + final Iterable result = YangInstanceIdentifierDeserializer.create(this.schemaContext, + "deserializer-test:list-one-key=value"); assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); final QName list = QName.create("deserializer:test", "2016-06-06", "list-one-key"); + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates(list, QName.create(list, "name"), "value"), - iterator.next()); + NodeIdentifierWithPredicates.of(list, QName.create(list, "name"), "value"), iterator.next()); } /** @@ -207,18 +195,15 @@ public class YangInstanceIdentifierDeserializerTest { values.put(QName.create(list, "number"), 100); values.put(QName.create(list, "enabled"), false); - final Iterable result = YangInstanceIdentifierDeserializer - .create(this.schemaContext, "deserializer-test:list-multiple-keys=value,100,false"); + final Iterable result = YangInstanceIdentifierDeserializer.create(this.schemaContext, + "deserializer-test:list-multiple-keys=value,100,false"); assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates(list, values).toString(), + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifierWithPredicates.of(list, values).toString(), iterator.next().toString()); } @@ -228,20 +213,17 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializeLeafListTest() { - final Iterable result = YangInstanceIdentifierDeserializer - .create(this.schemaContext, "deserializer-test:leaf-list-0=true"); + final Iterable result = YangInstanceIdentifierDeserializer.create(this.schemaContext, + "deserializer-test:leaf-list-0=true"); assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); final QName leafList = QName.create("deserializer:test", "2016-06-06", "leaf-list-0"); + assertEquals("Not expected path argument", new NodeIdentifier(leafList), iterator.next()); assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifier(leafList), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeWithValue<>(leafList, true).toString(), - iterator.next().toString()); + new NodeWithValue<>(leafList, true).toString(), iterator.next().toString()); } /** @@ -264,28 +246,23 @@ public class YangInstanceIdentifierDeserializerTest { assertEquals("Result does not contains expected number of path arguments", 4, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); // container assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), + NodeIdentifier.create(QName.create("deserializer:test", "2016-06-06", "contA")), iterator.next()); // list final QName list = QName.create("deserializer:test", "2016-06-06", "list-A"); + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates( - list, QName.create(list, "list-key"), 40).toString(), + NodeIdentifierWithPredicates.of(list, QName.create(list, "list-key"), 40).toString(), iterator.next().toString()); // leaf assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifier( - QName.create("deserializer:test", "2016-06-06", "list-key")), - iterator.next()); + new NodeIdentifier(QName.create("deserializer:test", "2016-06-06", "list-key")), iterator.next()); } /** @@ -482,26 +459,21 @@ public class YangInstanceIdentifierDeserializerTest { values.put(QName.create(list, "number"), ""); values.put(QName.create(list, "enabled"), ""); - final Iterable result = YangInstanceIdentifierDeserializer.create( + final Iterable result = YangInstanceIdentifierDeserializer.create( this.schemaContext, "deserializer-test:list-multiple-keys=%3Afoo,,/string-value"); assertEquals("Result does not contains expected number of path arguments", 3, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); // list - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates(list, values).toString(), + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifierWithPredicates.of(list, values).toString(), iterator.next().toString()); // leaf assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifier( - QName.create("deserializer:test", "2016-06-06", "string-value")), - iterator.next()); + new NodeIdentifier(QName.create("deserializer:test", "2016-06-06", "string-value")), iterator.next()); } /** @@ -535,8 +507,8 @@ public class YangInstanceIdentifierDeserializerTest { final YangInstanceIdentifier result = YangInstanceIdentifier.create( YangInstanceIdentifierDeserializer.create(this.schemaContext, URI)); - final Iterator> resultListKeys = ((YangInstanceIdentifier.NodeIdentifierWithPredicates) - result.getLastPathArgument()).getKeyValues().entrySet().iterator(); + final Iterator> resultListKeys = + ((NodeIdentifierWithPredicates)result.getLastPathArgument()).entrySet().iterator(); assertEquals(":foo", resultListKeys.next().getValue()); assertEquals(new Short("1"), resultListKeys.next().getValue()); @@ -554,18 +526,15 @@ public class YangInstanceIdentifierDeserializerTest { values.put(QName.create(list, "number"), ""); values.put(QName.create(list, "enabled"), ""); - final Iterable result = YangInstanceIdentifierDeserializer + final Iterable result = YangInstanceIdentifierDeserializer .create(this.schemaContext, "deserializer-test:list-multiple-keys=,,"); assertEquals("Result does not contains expected number of path arguments", 2, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), - iterator.next()); - assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates(list, values).toString(), + assertEquals("Not expected path argument", NodeIdentifier.create(list), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifierWithPredicates.of(list, values).toString(), iterator.next().toString()); } @@ -594,33 +563,26 @@ public class YangInstanceIdentifierDeserializerTest { */ @Test public void deserializePartInOtherModuleTest() { - final Iterable result = YangInstanceIdentifierDeserializer.create( - this.schemaContext, "deserializer-test-included:augmented-list=100/augmented-leaf"); + final Iterable result = YangInstanceIdentifierDeserializer.create(this.schemaContext, + "deserializer-test-included:augmented-list=100/augmented-leaf"); assertEquals("Result does not contains expected number of path arguments", 4, Iterables.size(result)); - final Iterator iterator = result.iterator(); + final Iterator iterator = result.iterator(); final QName list = QName.create("deserializer:test:included", "2016-06-06", "augmented-list"); final QName child = QName.create("deserializer:test", "2016-06-06", "augmented-leaf"); // list assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(list), + NodeIdentifier.create(list), iterator.next()); assertEquals("Not expected path argument", - new YangInstanceIdentifier.NodeIdentifierWithPredicates(list, QName.create(list, "list-key"), 100) - .toString(), - iterator.next() - .toString()); + NodeIdentifierWithPredicates.of(list, QName.create(list, "list-key"), 100).toString(), + iterator.next().toString()); // augmented leaf - assertEquals("Not expected path argument", - new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(child)), - iterator.next()); - - assertEquals("Not expected path argument", - YangInstanceIdentifier.NodeIdentifier.create(child), - iterator.next()); + assertEquals("Not expected path argument", new AugmentationIdentifier(Sets.newHashSet(child)), iterator.next()); + assertEquals("Not expected path argument", NodeIdentifier.create(child), iterator.next()); } } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java index 745229aa8d..8721346af1 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java @@ -5,13 +5,12 @@ * 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.restconf.nb.rfc8040.utils.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.common.collect.Sets; +import com.google.common.collect.ImmutableSet; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -24,6 +23,8 @@ import org.opendaylight.restconf.nb.rfc8040.TestRestconfUtils; import org.opendaylight.restconf.nb.rfc8040.utils.parser.builder.ParserBuilderConstants; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -87,8 +88,7 @@ public class YangInstanceIdentifierSerializerTest { final YangInstanceIdentifier data = YangInstanceIdentifier.builder() .node(QName.create("serializer:test", "2016-06-06", "contA")) .node(list) - .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates( - list, QName.create(list, "list-key"), 100)) + .node(NodeIdentifierWithPredicates.of(list, QName.create(list, "list-key"), 100)) .node(leafList) .node(new NodeWithValue<>(leafList, "instance")) .build(); @@ -297,9 +297,8 @@ public class YangInstanceIdentifierSerializerTest { final YangInstanceIdentifier data = YangInstanceIdentifier.builder() .node(list) - .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates( - list, QName.create(list, "list-key"), 100)) - .node(new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(child))) + .node(NodeIdentifierWithPredicates.of(list, QName.create(list, "list-key"), 100)) + .node(new AugmentationIdentifier(ImmutableSet.of(child))) .node(child) .build(); @@ -323,9 +322,8 @@ public class YangInstanceIdentifierSerializerTest { final YangInstanceIdentifier data = YangInstanceIdentifier.builder() .node(list) - .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates( - list, QName.create(list, "list-key"), 100)) - .node(new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(child))) + .node(NodeIdentifierWithPredicates.of(list, QName.create(list, "list-key"), 100)) + .node(new AugmentationIdentifier(ImmutableSet.of(child))) .node(child) .build(); diff --git a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Netconf505Test.java b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Netconf505Test.java index 1fec83b340..a7cb53e2cd 100644 --- a/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Netconf505Test.java +++ b/restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Netconf505Test.java @@ -65,7 +65,7 @@ public class Netconf505Test { final Map keyValues = new HashMap<>(); keyValues.put(KEY_QNAME, "id-string"); final YangInstanceIdentifier expectedYII = YangInstanceIdentifier.of(CONT_QNAME).node(LIST_QNAME) - .node(new YangInstanceIdentifier.NodeIdentifierWithPredicates(LIST_QNAME, keyValues)); + .node(YangInstanceIdentifier.NodeIdentifierWithPredicates.of(LIST_QNAME, keyValues)); assertEquals(expectedYII, ctx.getInstanceIdentifier()); }