From: Robert Varga Date: Sat, 5 Aug 2023 12:48:07 +0000 (+0200) Subject: Migrate users of YangInstanceIdentifier.create() X-Git-Tag: v6.0.1~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=639ef12c279d863325116b869e9e5714d031e618;p=netconf.git Migrate users of YangInstanceIdentifier.create() Most of these are trivial changes to of(PathArgument...), but in some cases we take advantage of of(QName...). Change-Id: I18054dbe04c127f4c74305f418cbad7018af7ef2 Signed-off-by: Robert Varga (cherry picked from commit 370ad6b69d8e68d6201424b34f529d70bcb0ceb2) --- diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java index 52dac16d32..30d47e305c 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java @@ -553,7 +553,7 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest { final QName testQName = QName.create("test", "2019-08-16", "TestActionQname"); final Absolute schemaPath = Absolute.of(testQName); - final YangInstanceIdentifier yangIIdPath = YangInstanceIdentifier.create(new NodeIdentifier(testQName)); + final YangInstanceIdentifier yangIIdPath = YangInstanceIdentifier.of(testQName); final DOMDataTreeIdentifier domDataTreeIdentifier = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, yangIIdPath); diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java index 697b3502ae..4e25566a07 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java @@ -110,7 +110,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas { .getShared(LIBRARY_CONTEXT); private static final YangInstanceIdentifier MODULES_STATE_MODULE_LIST = - YangInstanceIdentifier.create(MODULES_STATE_NID, MODULE_NID); + YangInstanceIdentifier.of(MODULES_STATE_NID, MODULE_NID); private static final @NonNull ContainerNode GET_MODULES_STATE_MODULE_LIST_RPC = Builders.containerBuilder() .withNodeIdentifier(NETCONF_GET_NODEID) diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java index 29829c4e6d..7e89609f91 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOps.java @@ -310,8 +310,8 @@ public final class NetconfBaseOps { private DataContainerChild getSubtreeFilterFromRootFields(final List fields) { return transformer.toFilterStructure(fields.stream() .map(fieldPath -> Map.entry( - YangInstanceIdentifier.create(Iterables.limit(fieldPath.getPathArguments(), 1)), - YangInstanceIdentifier.create(Iterables.skip(fieldPath.getPathArguments(), 1)))) + YangInstanceIdentifier.of(Iterables.limit(fieldPath.getPathArguments(), 1)), + YangInstanceIdentifier.of(Iterables.skip(fieldPath.getPathArguments(), 1)))) .collect(Collectors.groupingBy(Entry::getKey, Collectors.mapping(Entry::getValue, Collectors.toUnmodifiableList()))) .entrySet().stream() diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/FieldsSchemalessRpcStructureTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/FieldsSchemalessRpcStructureTransformerTest.java index e2a2d7df37..5bf209af60 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/FieldsSchemalessRpcStructureTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/FieldsSchemalessRpcStructureTransformerTest.java @@ -88,11 +88,11 @@ public class FieldsSchemalessRpcStructureTransformerTest { @Test public void toFilterStructureWithSingleRootTest() throws SAXException, IOException, URISyntaxException { - final YangInstanceIdentifier rootPath = YangInstanceIdentifier.create(C1_NID); - final YangInstanceIdentifier leaf1Field = YangInstanceIdentifier.create(LEAF1_NID); - final YangInstanceIdentifier leaf3Field = YangInstanceIdentifier.create(NodeIdentifierWithPredicates.of( + final YangInstanceIdentifier rootPath = YangInstanceIdentifier.of(C1_NID); + final YangInstanceIdentifier leaf1Field = YangInstanceIdentifier.of(LEAF1_NID); + final YangInstanceIdentifier leaf3Field = YangInstanceIdentifier.of(NodeIdentifierWithPredicates.of( LIST1_QNAME, Map.of(KEY1_QNAME, "key1", KEY2_QNAME, "key2")), C2_NID, LEAF3_NID); - final YangInstanceIdentifier key1Field = YangInstanceIdentifier.create(NodeIdentifierWithPredicates.of( + final YangInstanceIdentifier key1Field = YangInstanceIdentifier.of(NodeIdentifierWithPredicates.of( LIST1_QNAME, Map.of(KEY1_QNAME, "key1", KEY2_QNAME, "key2")), KEY1_NID); final FieldsFilter filter = FieldsFilter.of(rootPath, List.of(leaf1Field, leaf3Field, key1Field)); @@ -104,11 +104,11 @@ public class FieldsSchemalessRpcStructureTransformerTest { @Test public void toFilterStructureWithTwoRootContainersTest() throws SAXException, IOException, URISyntaxException { - final YangInstanceIdentifier c1RootPath = YangInstanceIdentifier.create(C1_NID); - final YangInstanceIdentifier cxRootPath = YangInstanceIdentifier.create(CX_NID); - final YangInstanceIdentifier c2Field = YangInstanceIdentifier.create(LIST1_NID, C2_NID); - final YangInstanceIdentifier leaf2Field = YangInstanceIdentifier.create(LIST1_NID, C2_NID, LEAF2_NID); - final YangInstanceIdentifier lxField = YangInstanceIdentifier.create(LX_NID); + final YangInstanceIdentifier c1RootPath = YangInstanceIdentifier.of(C1_NID); + final YangInstanceIdentifier cxRootPath = YangInstanceIdentifier.of(CX_NID); + final YangInstanceIdentifier c2Field = YangInstanceIdentifier.of(LIST1_NID, C2_NID); + final YangInstanceIdentifier leaf2Field = YangInstanceIdentifier.of(LIST1_NID, C2_NID, LEAF2_NID); + final YangInstanceIdentifier lxField = YangInstanceIdentifier.of(LX_NID); final FieldsFilter filter1 = FieldsFilter.of(c1RootPath, List.of(c2Field, leaf2Field)); final FieldsFilter filter2 = FieldsFilter.of(cxRootPath, Collections.singletonList(lxField)); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java index b29b988075..ec64755cdb 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java @@ -267,9 +267,9 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetWithFields() throws ExecutionException, InterruptedException { - final YangInstanceIdentifier path = YangInstanceIdentifier.create(CONTAINER_C_NID); - final YangInstanceIdentifier leafAField = YangInstanceIdentifier.create(LEAF_A_NID); - final YangInstanceIdentifier leafBField = YangInstanceIdentifier.create(LEAF_B_NID); + final YangInstanceIdentifier path = YangInstanceIdentifier.of(CONTAINER_C_NID); + final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(LEAF_A_NID); + final YangInstanceIdentifier leafBField = YangInstanceIdentifier.of(LEAF_B_NID); baseOps.getData(callback, Optional.of(path), List.of(leafAField, leafBField)).get(); verify(listener).sendRequest(msg("/netconfMessages/get-fields-request.xml"), @@ -278,9 +278,9 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetConfigWithFields() throws ExecutionException, InterruptedException { - final YangInstanceIdentifier path = YangInstanceIdentifier.create(CONTAINER_C_NID); - final YangInstanceIdentifier leafAField = YangInstanceIdentifier.create(LEAF_A_NID); - final YangInstanceIdentifier leafBField = YangInstanceIdentifier.create(LEAF_B_NID); + final YangInstanceIdentifier path = YangInstanceIdentifier.of(CONTAINER_C_NID); + final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(LEAF_A_NID); + final YangInstanceIdentifier leafBField = YangInstanceIdentifier.of(LEAF_B_NID); baseOps.getConfigRunningData(callback, Optional.of(path), List.of(leafAField, leafBField)).get(); verify(listener).sendRequest(msg("/netconfMessages/get-config-fields-request.xml"), @@ -301,10 +301,10 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetWithFieldsAndEmptyParentPath() throws ExecutionException, InterruptedException { - final YangInstanceIdentifier leafAField = YangInstanceIdentifier.create(CONTAINER_C_NID, LEAF_A_NID); - final YangInstanceIdentifier leafXField = YangInstanceIdentifier.create( + final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(CONTAINER_C_NID, LEAF_A_NID); + final YangInstanceIdentifier leafXField = YangInstanceIdentifier.of( CONTAINER_C_NID, CONTAINER_D_NID, LEAF_X_NID); - final YangInstanceIdentifier leafZField = YangInstanceIdentifier.create(CONTAINER_E_NID, LEAF_Z_NID); + final YangInstanceIdentifier leafZField = YangInstanceIdentifier.of(CONTAINER_E_NID, LEAF_Z_NID); baseOps.getData(callback, Optional.of(YangInstanceIdentifier.of()), List.of(leafAField, leafXField, leafZField)).get(); @@ -314,10 +314,10 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetConfigWithFieldsAndEmptyParentPath() throws ExecutionException, InterruptedException { - final YangInstanceIdentifier leafAField = YangInstanceIdentifier.create(CONTAINER_C_NID, LEAF_A_NID); - final YangInstanceIdentifier leafXField = YangInstanceIdentifier.create( + final YangInstanceIdentifier leafAField = YangInstanceIdentifier.of(CONTAINER_C_NID, LEAF_A_NID); + final YangInstanceIdentifier leafXField = YangInstanceIdentifier.of( CONTAINER_C_NID, CONTAINER_D_NID, LEAF_X_NID); - final YangInstanceIdentifier leafZField = YangInstanceIdentifier.create(CONTAINER_E_NID, LEAF_Z_NID); + final YangInstanceIdentifier leafZField = YangInstanceIdentifier.of(CONTAINER_E_NID, LEAF_Z_NID); baseOps.getConfigRunningData(callback, Optional.of(YangInstanceIdentifier.of()), List.of(leafAField, leafXField, leafZField)).get(); @@ -327,8 +327,8 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetWithRootFieldsAndEmptyParentPath() throws ExecutionException, InterruptedException { - final YangInstanceIdentifier contCField = YangInstanceIdentifier.create(CONTAINER_C_NID); - final YangInstanceIdentifier contDField = YangInstanceIdentifier.create(CONTAINER_E_NID); + final YangInstanceIdentifier contCField = YangInstanceIdentifier.of(CONTAINER_C_NID); + final YangInstanceIdentifier contDField = YangInstanceIdentifier.of(CONTAINER_E_NID); baseOps.getData(callback, Optional.of(YangInstanceIdentifier.of()), List.of(contCField, contDField)).get(); verify(listener).sendRequest(msg("/netconfMessages/get-with-multiple-root-subtrees.xml"), diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java index fe25de3e5e..1ecb0d3dfd 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java @@ -345,7 +345,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void testGetConfigLeafRequest() throws Exception { final AnyxmlNode filter = toFilterStructure( - YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Schemas.QNAME), toId(Schema.QNAME), + YangInstanceIdentifier.of(toId(NetconfState.QNAME), toId(Schemas.QNAME), toId(Schema.QNAME), NodeIdentifierWithPredicates.of(Schema.QNAME), toId(QName.create(Schemas.QNAME, "version"))), SCHEMA); @@ -375,7 +375,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void testGetConfigRequest() throws Exception { final AnyxmlNode filter = toFilterStructure( - YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Schemas.QNAME)), SCHEMA); + YangInstanceIdentifier.of(toId(NetconfState.QNAME), toId(Schemas.QNAME)), SCHEMA); final ContainerNode source = NetconfBaseOps.getSourceNode(NETCONF_RUNNING_NODEID); @@ -456,7 +456,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { final QName capability = QName.create(Capabilities.QNAME, "capability"); final DataContainerChild filter = toFilterStructure( - YangInstanceIdentifier.create(toId(NetconfState.QNAME), toId(Capabilities.QNAME), toId(capability), + YangInstanceIdentifier.of(toId(NetconfState.QNAME), toId(Capabilities.QNAME), toId(capability), new NodeWithValue<>(capability, "a:b:c")), SCHEMA); final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME, @@ -477,10 +477,10 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void testGetLeafList() throws IOException, SAXException { - final YangInstanceIdentifier path = YangInstanceIdentifier.create( - toId(NetconfState.QNAME), - toId(Capabilities.QNAME), - toId(QName.create(Capabilities.QNAME, "capability"))); + final YangInstanceIdentifier path = YangInstanceIdentifier.of( + NetconfState.QNAME, + Capabilities.QNAME, + QName.create(Capabilities.QNAME, "capability")); final DataContainerChild filter = toFilterStructure(path, SCHEMA); final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME, NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filter)); @@ -500,10 +500,10 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void testGetList() throws IOException, SAXException { - final YangInstanceIdentifier path = YangInstanceIdentifier.create( - toId(NetconfState.QNAME), - toId(Datastores.QNAME), - toId(QName.create(Datastores.QNAME, "datastore"))); + final YangInstanceIdentifier path = YangInstanceIdentifier.of( + NetconfState.QNAME, + Datastores.QNAME, + QName.create(Datastores.QNAME, "datastore")); final DataContainerChild filter = toFilterStructure(path, SCHEMA); final NetconfMessage netconfMessage = netconfMessageTransformer.toRpcRequest(NETCONF_GET_QNAME, NetconfMessageTransformUtil.wrap(toId(NETCONF_GET_QNAME), filter)); @@ -865,10 +865,10 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getTwoNonOverlappingFieldsTest() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); - final YangInstanceIdentifier netconfStartTimeField = YangInstanceIdentifier.create(toId(Statistics.QNAME), - toId(QName.create(Statistics.QNAME, "netconf-start-time"))); - final YangInstanceIdentifier datastoresField = YangInstanceIdentifier.create(toId(Datastores.QNAME)); + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(NetconfState.QNAME); + final YangInstanceIdentifier netconfStartTimeField = YangInstanceIdentifier.of(Statistics.QNAME, + QName.create(Statistics.QNAME, "netconf-start-time")); + final YangInstanceIdentifier datastoresField = YangInstanceIdentifier.of(Datastores.QNAME); // building filter structure and NETCONF message final AnyxmlNode filterStructure = toFilterStructure( @@ -894,12 +894,12 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getOverlappingFieldsTest() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); - final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.create(toId(Capabilities.QNAME)); - final YangInstanceIdentifier capabilityField = YangInstanceIdentifier.create(toId(Capabilities.QNAME), - toId(QName.create(Capabilities.QNAME, "capability").intern())); - final YangInstanceIdentifier datastoreField = YangInstanceIdentifier.create(toId(Datastores.QNAME)); - final YangInstanceIdentifier locksFields = YangInstanceIdentifier.create(toId(Datastores.QNAME), + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(NetconfState.QNAME); + final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.of(Capabilities.QNAME); + final YangInstanceIdentifier capabilityField = YangInstanceIdentifier.of(Capabilities.QNAME, + QName.create(Capabilities.QNAME, "capability")); + final YangInstanceIdentifier datastoreField = YangInstanceIdentifier.of(Datastores.QNAME); + final YangInstanceIdentifier locksFields = YangInstanceIdentifier.of(toId(Datastores.QNAME), toId(Datastore.QNAME), NodeIdentifierWithPredicates.of(Datastore.QNAME), toId(Locks.QNAME)); // building filter structure and NETCONF message @@ -926,8 +926,8 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getOverlappingFieldsWithEmptyFieldTest() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); - final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.create(toId(Capabilities.QNAME)); + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(NetconfState.QNAME); + final YangInstanceIdentifier capabilitiesField = YangInstanceIdentifier.of(Capabilities.QNAME); // building filter structure and NETCONF message final AnyxmlNode filterStructure = toFilterStructure( @@ -949,12 +949,12 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getSpecificFieldsUnderListTest() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME), + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(toId(NetconfState.QNAME), toId(Schemas.QNAME), toId(Schema.QNAME), NodeIdentifierWithPredicates.of(Schema.QNAME)); - final YangInstanceIdentifier versionField = YangInstanceIdentifier.create( - toId(QName.create(Schema.QNAME, "version").intern())); - final YangInstanceIdentifier identifierField = YangInstanceIdentifier.create( - toId(QName.create(Schema.QNAME, "namespace").intern())); + final YangInstanceIdentifier versionField = YangInstanceIdentifier.of( + QName.create(Schema.QNAME, "version")); + final YangInstanceIdentifier identifierField = YangInstanceIdentifier.of( + QName.create(Schema.QNAME, "namespace")); // building filter structure and NETCONF message final AnyxmlNode filterStructure = toFilterStructure( @@ -985,9 +985,8 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getSpecificFieldsUnderMultipleLists() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create( - toId(NetconfState.QNAME), toId(Datastores.QNAME)); - final YangInstanceIdentifier partialLockYiid = YangInstanceIdentifier.create(toId(Datastore.QNAME), + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(NetconfState.QNAME, Datastores.QNAME); + final YangInstanceIdentifier partialLockYiid = YangInstanceIdentifier.of(toId(Datastore.QNAME), NodeIdentifierWithPredicates.of(Datastore.QNAME), toId(Locks.QNAME), toId(QName.create(Locks.QNAME, "lock-type").intern()), toId(PartialLock.QNAME), NodeIdentifierWithPredicates.of(PartialLock.QNAME)); @@ -1029,10 +1028,10 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getWholeListsUsingFieldsTest() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME)); - final YangInstanceIdentifier datastoreListField = YangInstanceIdentifier.create(toId(Datastores.QNAME), + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(NetconfState.QNAME); + final YangInstanceIdentifier datastoreListField = YangInstanceIdentifier.of(toId(Datastores.QNAME), toId(Datastore.QNAME), NodeIdentifierWithPredicates.of(Datastore.QNAME)); - final YangInstanceIdentifier sessionListField = YangInstanceIdentifier.create(toId(Sessions.QNAME), + final YangInstanceIdentifier sessionListField = YangInstanceIdentifier.of(toId(Sessions.QNAME), toId(Session.QNAME), NodeIdentifierWithPredicates.of(Session.QNAME)); // building filter structure and NETCONF message @@ -1061,12 +1060,11 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest { @Test public void getSpecificListEntriesWithSpecificFieldsTest() throws IOException, SAXException { // preparation of the fields - final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.create(toId(NetconfState.QNAME), - toId(Sessions.QNAME)); + final YangInstanceIdentifier parentYiid = YangInstanceIdentifier.of(NetconfState.QNAME, Sessions.QNAME); final QName sessionId = QName.create(Session.QNAME, "session-id").intern(); - final YangInstanceIdentifier session1Field = YangInstanceIdentifier.create(toId(Session.QNAME), + final YangInstanceIdentifier session1Field = YangInstanceIdentifier.of(toId(Session.QNAME), NodeIdentifierWithPredicates.of(Session.QNAME, sessionId, 1)); - final YangInstanceIdentifier session2TransportField = YangInstanceIdentifier.create(toId(Session.QNAME), + final YangInstanceIdentifier session2TransportField = YangInstanceIdentifier.of(toId(Session.QNAME), NodeIdentifierWithPredicates.of(Session.QNAME, sessionId, 2), toId(QName.create(Session.QNAME, "transport").intern())); diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java index 8a23461c50..747310015f 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceWriteOnlyTxTest.java @@ -45,7 +45,6 @@ import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.MountPointContext; @@ -77,10 +76,8 @@ public class NetconfDeviceWriteOnlyTxTest extends AbstractBaseSchemasTest { final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(MountPointContext.class)), false); final MapNode emptyList = ImmutableNodes.mapNodeBuilder(NETCONF_FILTER_QNAME).build(); - tx.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier - .create(new NodeIdentifier(NETCONF_FILTER_QNAME)), emptyList); - tx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier - .create(new NodeIdentifier(NETCONF_FILTER_QNAME)), emptyList); + tx.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.of(NETCONF_FILTER_QNAME), emptyList); + tx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.of(NETCONF_FILTER_QNAME), emptyList); verify(rpc, atMost(1)).invokeNetconf(any(), any()); } diff --git a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.java b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.java index d17a011adc..47eb0a2f00 100644 --- a/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.java +++ b/plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/DataTreeChange.java @@ -29,7 +29,7 @@ public final class DataTreeChange { final Builder builder = ImmutableList.builderWithExpectedSize(path.size()); path.descendingIterator().forEachRemaining(builder::add); - this.path = YangInstanceIdentifier.create(builder.build()); + this.path = YangInstanceIdentifier.of(builder.build()); } public NormalizedNode getChangeRoot() {