From 2479bc2e261c2256cea881adb02a3cbd9d489645 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Jul 2023 21:11:33 +0200 Subject: [PATCH] Fix deprecation warnings in restconf-nb NormalizedNode and YangInstanceIdentifier have both new methods, switch to using those. Change-Id: If84f273fcb32a3ed2b876ec62209f660ac767482 Signed-off-by: Robert Varga --- .../restconf/nb/rfc8040/Rfc8040.java | 2 +- .../handlers/SchemaContextHandler.java | 2 +- .../JsonNormalizedNodeBodyReader.java | 8 ++-- .../JsonNormalizedNodeBodyWriter.java | 8 ++-- .../ParameterAwareNormalizedNodeWriter.java | 12 ++--- .../XmlNormalizedNodeBodyWriter.java | 10 ++--- .../impl/RestconfDataServiceImpl.java | 14 +++--- .../services/impl/SubscribeToStreamUtil.java | 3 +- .../transactions/BatchedExistenceCheck.java | 4 +- .../MdsalRestconfTransaction.java | 11 ++--- .../NetconfRestconfTransaction.java | 8 ++-- .../rests/utils/PostDataTransactionUtil.java | 14 +++--- .../rests/utils/PutDataTransactionUtil.java | 6 +-- .../rests/utils/ReadDataTransactionUtil.java | 44 +++++++++---------- .../rfc8040/rests/utils/TransactionUtil.java | 16 +++---- .../YangInstanceIdentifierDeserializer.java | 2 +- ...erAwareNormalizedNodeWriterFieldsTest.java | 2 +- .../XmlBodyReaderMountPointTest.java | 4 +- .../patch/JsonPatchBodyReaderTest.java | 12 ++--- .../patch/XmlPatchBodyReaderTest.java | 12 ++--- .../providers/test/XmlBodyReaderTest.java | 8 ++-- .../impl/RestconfDataServiceImplTest.java | 30 ++++++------- ...onfStreamsSubscriptionServiceImplTest.java | 5 +-- .../utils/PostDataTransactionUtilTest.java | 6 +-- .../utils/ReadDataTransactionUtilTest.java | 2 +- .../listeners/ListenerAdapterTest.java | 4 +- .../test/incubate/InMemoryMdsalModule.java | 4 +- .../mapping/RestconfMappingNodeUtilTest.java | 36 +++++++-------- 28 files changed, 137 insertions(+), 152 deletions(-) diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java index 0ac9905818..42a85ca7e4 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/Rfc8040.java @@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent * Common constants defined and relating to RFC8040. */ public final class Rfc8040 { - private static final YangInstanceIdentifier RESTCONF_STATE_STREAMS = YangInstanceIdentifier.create( + private static final YangInstanceIdentifier RESTCONF_STATE_STREAMS = YangInstanceIdentifier.of( NodeIdentifier.create(RestconfState.QNAME), NodeIdentifier.create(Streams.QNAME), NodeIdentifier.create(Stream.QNAME)); private static final QName NAME_QNAME = QName.create(Stream.QNAME, "name").intern(); diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java index 2c684ac6a9..27cdd0dbe3 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/SchemaContextHandler.java @@ -141,7 +141,7 @@ public final class SchemaContextHandler implements EffectiveModelContextListener private void putData(final ContainerNode normNode) { final DOMDataTreeWriteTransaction wTx = domDataBroker.newWriteOnlyTransaction(); wTx.put(LogicalDatastoreType.OPERATIONAL, - YangInstanceIdentifier.create(NodeIdentifier.create(normNode.getIdentifier().getNodeType())), normNode); + YangInstanceIdentifier.of(NodeIdentifier.create(normNode.name().getNodeType())), normNode); try { wTx.commit().get(); } catch (InterruptedException e) { diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java index c443fda249..3e5e641f92 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java @@ -94,19 +94,19 @@ public class JsonNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyRead while (result instanceof ChoiceNode choice) { final var childNode = choice.body().iterator().next(); if (isPost) { - iiToDataList.add(result.getIdentifier()); + iiToDataList.add(result.name()); } result = childNode; } if (isPost) { if (result instanceof MapEntryNode) { - iiToDataList.add(new NodeIdentifier(result.getIdentifier().getNodeType())); - iiToDataList.add(result.getIdentifier()); + iiToDataList.add(new NodeIdentifier(result.name().getNodeType())); + iiToDataList.add(result.name()); } else { final var parentPath = parentSchema.statementPath(); if (parentPath.isEmpty() || !(parentPath.get(parentPath.size() - 1) instanceof OperationDefinition)) { - iiToDataList.add(result.getIdentifier()); + iiToDataList.add(result.name()); } } } else if (result instanceof MapNode map) { diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java index ab63cbe4df..f5ff2761b2 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java @@ -98,7 +98,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit jsonWriter, depth, fields); - final Module module = context.getSchemaContext().findModule(data.getIdentifier().getNodeType().getModule()) + final Module module = context.getSchemaContext().findModule(data.name().getNodeType().getModule()) .orElseThrow(); jsonWriter.name(module.getName() + ":output"); jsonWriter.beginObject(); @@ -111,7 +111,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit stack.enterSchemaTree(action.getOutput().getQName()); nnWriter = createNormalizedNodeWriter(context, stack.toInference(), jsonWriter, depth, fields); - final Module module = context.getSchemaContext().findModule(data.getIdentifier().getNodeType().getModule()) + final Module module = context.getSchemaContext().findModule(data.name().getNodeType().getModule()) .orElseThrow(); jsonWriter.name(module.getName() + ":output"); jsonWriter.beginObject(); @@ -127,9 +127,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit if (data instanceof MapEntryNode mapEntry) { // Restconf allows returning one list item. We need to wrap it // in map node in order to serialize it properly - nnWriter.write(ImmutableNodes.mapNodeBuilder(data.getIdentifier().getNodeType()) - .withChild(mapEntry) - .build()); + nnWriter.write(ImmutableNodes.mapNodeBuilder(data.name().getNodeType()).withChild(mapEntry).build()); } else { nnWriter.write(data); } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java index 62b65c4743..7370b229fb 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java @@ -136,19 +136,19 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod private boolean wasProcessAsSimpleNode(final NormalizedNode node) throws IOException { if (node instanceof LeafSetEntryNode nodeAsLeafList) { if (selectedByParameters(node, false)) { - writer.startLeafSetEntryNode(nodeAsLeafList.getIdentifier()); + writer.startLeafSetEntryNode(nodeAsLeafList.name()); writer.scalarValue(nodeAsLeafList.body()); writer.endNode(); } return true; } else if (node instanceof LeafNode nodeAsLeaf) { - writer.startLeafNode(nodeAsLeaf.getIdentifier()); + writer.startLeafNode(nodeAsLeaf.name()); writer.scalarValue(nodeAsLeaf.body()); writer.endNode(); return true; } else if (node instanceof AnyxmlNode anyxmlNode) { final Class objectModel = anyxmlNode.bodyObjectModel(); - if (writer.startAnyxmlNode(anyxmlNode.getIdentifier(), objectModel)) { + if (writer.startAnyxmlNode(anyxmlNode.name(), objectModel)) { if (DOMSource.class.isAssignableFrom(objectModel)) { writer.domSourceValue((DOMSource) anyxmlNode.body()); } else { @@ -159,7 +159,7 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod return true; } else if (node instanceof AnydataNode anydataNode) { final Class objectModel = anydataNode.bodyObjectModel(); - if (writer.startAnydataNode(anydataNode.getIdentifier(), objectModel)) { + if (writer.startAnydataNode(anydataNode.name(), objectModel)) { writer.scalarValue(anydataNode.body()); writer.endNode(); } @@ -219,7 +219,7 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod if (selectedByParameters(mapEntryNode, false)) { writeChildren(mapEntryNode.body(), false); } else if (fields == null && maxDepth != null && currentDepth == maxDepth) { - writeOnlyKeys(mapEntryNode.getIdentifier().entrySet()); + writeOnlyKeys(mapEntryNode.name().entrySet()); } return true; } @@ -234,7 +234,7 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod } protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException { - writer.startMapEntryNode(node.getIdentifier(), node.size()); + writer.startMapEntryNode(node.name(), node.size()); currentDepth++; writeMapEntryChildren(node); currentDepth--; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java index 3b6544edfc..9cded4e41b 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java @@ -124,9 +124,7 @@ public class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrite if (data instanceof MapEntryNode mapEntry) { // Restconf allows returning one list item. We need to wrap it // in map node in order to serialize it properly - nnWriter.write(ImmutableNodes.mapNodeBuilder(data.getIdentifier().getNodeType()) - .addChild(mapEntry) - .build()); + nnWriter.write(ImmutableNodes.mapNodeBuilder(data.name().getNodeType()).addChild(mapEntry).build()); } else if (isRoot) { if (data instanceof ContainerNode container && container.isEmpty()) { writeEmptyDataNode(xmlWriter, container); @@ -150,7 +148,7 @@ public class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrite private static void writeAndWrapInDataNode(final XMLStreamWriter xmlWriter, final RestconfNormalizedNodeWriter nnWriter, final NormalizedNode data) throws IOException { - final QName nodeType = data.getIdentifier().getNodeType(); + final QName nodeType = data.name().getNodeType(); final String namespace = nodeType.getNamespace().toString(); try { xmlWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, nodeType.getLocalName(), namespace); @@ -165,7 +163,7 @@ public class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrite private static void writeEmptyDataNode(final XMLStreamWriter xmlWriter, final ContainerNode data) throws IOException { - final QName nodeType = data.getIdentifier().getNodeType(); + final QName nodeType = data.name().getNodeType(); final String namespace = nodeType.getNamespace().toString(); try { xmlWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, nodeType.getLocalName(), namespace); @@ -179,7 +177,7 @@ public class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrite private static void writeElements(final XMLStreamWriter xmlWriter, final RestconfNormalizedNodeWriter nnWriter, final ContainerNode data) throws IOException { - final QName nodeType = data.getIdentifier().getNodeType(); + final QName nodeType = data.name().getNodeType(); final String namespace = nodeType.getNamespace().toString(); try { xmlWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX, nodeType.getLocalName(), namespace); diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java index 0eb3ab7ee6..0b19dc2ef3 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java @@ -169,7 +169,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { return switch (readParams.content()) { case ALL, CONFIG -> { - final QName type = node.getIdentifier().getNodeType(); + final QName type = node.name().getNodeType(); yield Response.status(Status.OK) .entity(NormalizedNodePayload.ofReadData(instanceIdentifier, node, queryParams)) .header("ETag", '"' + type.getModule().getRevision().map(Revision::toString).orElse(null) + "-" @@ -208,7 +208,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { listener.getOutputType(), uri); tx.merge(LogicalDatastoreType.OPERATIONAL, - Rfc8040.restconfStateStreamPath(mapToStreams.getIdentifier()), mapToStreams); + Rfc8040.restconfStateStreamPath(mapToStreams.name()), mapToStreams); } @Override @@ -306,7 +306,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { final YangInstanceIdentifier yangIIdContext = context.getInstanceIdentifier(); final NormalizedNode data = payload.getData(); - if (yangIIdContext.isEmpty() && !NETCONF_BASE_QNAME.equals(data.getIdentifier().getNodeType())) { + if (yangIIdContext.isEmpty() && !NETCONF_BASE_QNAME.equals(data.name().getNodeType())) { throw new RestconfDocumentedException("Instance identifier need to contain at least one path argument", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); } @@ -420,7 +420,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { */ @VisibleForTesting public static void validTopLevelNodeName(final YangInstanceIdentifier path, final NormalizedNodePayload payload) { - final QName dataNodeType = payload.getData().getIdentifier().getNodeType(); + final QName dataNodeType = payload.getData().name().getNodeType(); if (path.isEmpty()) { if (!NETCONF_BASE_QNAME.equals(dataNodeType)) { throw new RestconfDocumentedException("Instance identifier has to contain at least one path argument", @@ -450,8 +450,8 @@ public class RestconfDataServiceImpl implements RestconfDataService { final PathArgument lastPathArgument = iiWithData.getInstanceIdentifier().getLastPathArgument(); final SchemaNode schemaNode = iiWithData.getSchemaNode(); final NormalizedNode data = payload.getData(); - if (schemaNode instanceof ListSchemaNode) { - final List keyDefinitions = ((ListSchemaNode) schemaNode).getKeyDefinition(); + if (schemaNode instanceof ListSchemaNode listSchema) { + final var keyDefinitions = listSchema.getKeyDefinition(); if (lastPathArgument instanceof NodeIdentifierWithPredicates && data instanceof MapEntryNode) { final Map uriKeyValues = ((NodeIdentifierWithPredicates) lastPathArgument).asMap(); isEqualUriAndPayloadKeyValues(uriKeyValues, (MapEntryNode) data, keyDefinitions); @@ -467,7 +467,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { mutableCopyUriKeyValues.remove(keyDefinition), ErrorType.PROTOCOL, ErrorTag.DATA_MISSING, "Missing key %s in URI.", keyDefinition); - final Object dataKeyValue = payload.getIdentifier().getValue(keyDefinition); + final Object dataKeyValue = payload.name().getValue(keyDefinition); if (!uriKeyValue.equals(dataKeyValue)) { final String errMsg = "The value '" + uriKeyValue + "' for key '" + keyDefinition.getLocalName() diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java index c65b834e95..00174f7255 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/SubscribeToStreamUtil.java @@ -206,8 +206,7 @@ abstract class SubscribeToStreamUtil { // FIXME: callers are utter duplicates, refactor them private static void writeDataToDS(final DOMDataTreeWriteOperations tx, final MapEntryNode mapToStreams) { // FIXME: use put() here - tx.merge(LogicalDatastoreType.OPERATIONAL, Rfc8040.restconfStateStreamPath(mapToStreams.getIdentifier()), - mapToStreams); + tx.merge(LogicalDatastoreType.OPERATIONAL, Rfc8040.restconfStateStreamPath(mapToStreams.name()), mapToStreams); } private static void submitData(final DOMDataTreeWriteTransaction readWriteTransaction) { diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java index 7800c5e929..8bb7b240c0 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/BatchedExistenceCheck.java @@ -32,7 +32,7 @@ final class BatchedExistenceCheck { private volatile int outstanding; private BatchedExistenceCheck(final int total) { - this.outstanding = total; + outstanding = total; } static BatchedExistenceCheck start(final DOMDataTreeReadOperations tx, @@ -40,7 +40,7 @@ final class BatchedExistenceCheck { final Collection children) { final BatchedExistenceCheck ret = new BatchedExistenceCheck(children.size()); for (NormalizedNode child : children) { - final YangInstanceIdentifier path = parentPath.node(child.getIdentifier()); + final YangInstanceIdentifier path = parentPath.node(child.name()); tx.exists(datastore, path).addCallback(new FutureCallback() { @Override public void onSuccess(final Boolean result) { diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java index 2a5e892c55..9ccc63d749 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfTransaction.java @@ -26,6 +26,7 @@ import org.opendaylight.restconf.nb.rfc8040.rests.utils.TransactionUtil; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -70,15 +71,15 @@ final class MdsalRestconfTransaction extends RestconfTransaction { final EffectiveModelContext schemaContext) { if (data instanceof MapNode || data instanceof LeafSetNode) { final NormalizedNode emptySubTree = ImmutableNodes.fromInstanceId(schemaContext, path); - merge(YangInstanceIdentifier.create(emptySubTree.getIdentifier()), emptySubTree); + merge(YangInstanceIdentifier.of(emptySubTree.name()), emptySubTree); TransactionUtil.ensureParentsByMerge(path, schemaContext, this); - final Collection children = ((NormalizedNodeContainer) data).body(); + final Collection children = ((DistinctNodeContainer) data).body(); final BatchedExistenceCheck check = BatchedExistenceCheck.start(verifyNotNull(rwTx), CONFIGURATION, path, children); for (final NormalizedNode child : children) { - final YangInstanceIdentifier childPath = path.node(child.getIdentifier()); + final YangInstanceIdentifier childPath = path.node(child.name()); verifyNotNull(rwTx).put(CONFIGURATION, childPath, child); } // ... finally collect existence checks and abort the transaction if any of them failed. @@ -96,11 +97,11 @@ final class MdsalRestconfTransaction extends RestconfTransaction { final EffectiveModelContext schemaContext) { if (data instanceof MapNode || data instanceof LeafSetNode) { final NormalizedNode emptySubtree = ImmutableNodes.fromInstanceId(schemaContext, path); - merge(YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree); + merge(YangInstanceIdentifier.of(emptySubtree.name()), emptySubtree); TransactionUtil.ensureParentsByMerge(path, schemaContext, this); for (final NormalizedNode child : ((NormalizedNodeContainer) data).body()) { - final YangInstanceIdentifier childPath = path.node(child.getIdentifier()); + final YangInstanceIdentifier childPath = path.node(child.name()); verifyNotNull(rwTx).put(CONFIGURATION, childPath, child); } } else { diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java index 308f22ce8f..e0103ac7ae 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/NetconfRestconfTransaction.java @@ -89,10 +89,10 @@ final class NetconfRestconfTransaction extends RestconfTransaction { final EffectiveModelContext schemaContext) { if (data instanceof MapNode || data instanceof LeafSetNode) { final NormalizedNode emptySubTree = ImmutableNodes.fromInstanceId(schemaContext, path); - merge(YangInstanceIdentifier.create(emptySubTree.getIdentifier()), emptySubTree); + merge(YangInstanceIdentifier.of(emptySubTree.name()), emptySubTree); for (final NormalizedNode child : ((NormalizedNodeContainer) data).body()) { - final YangInstanceIdentifier childPath = path.node(child.getIdentifier()); + final YangInstanceIdentifier childPath = path.node(child.name()); enqueueOperation(() -> netconfService.create(CONFIGURATION, childPath, child, Optional.empty())); } } else { @@ -105,10 +105,10 @@ final class NetconfRestconfTransaction extends RestconfTransaction { final EffectiveModelContext schemaContext) { if (data instanceof MapNode || data instanceof LeafSetNode) { final NormalizedNode emptySubTree = ImmutableNodes.fromInstanceId(schemaContext, path); - merge(YangInstanceIdentifier.create(emptySubTree.getIdentifier()), emptySubTree); + merge(YangInstanceIdentifier.of(emptySubTree.name()), emptySubTree); for (final NormalizedNode child : ((NormalizedNodeContainer) data).body()) { - final YangInstanceIdentifier childPath = path.node(child.getIdentifier()); + final YangInstanceIdentifier childPath = path.node(child.name()); enqueueOperation(() -> netconfService.replace(CONFIGURATION, childPath, child, Optional.empty())); } } else { diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java index 35cf4bdd0d..a115719e6e 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java @@ -9,7 +9,6 @@ package org.opendaylight.restconf.nb.rfc8040.rests.utils; import com.google.common.util.concurrent.FluentFuture; import java.net.URI; -import java.util.Collection; import java.util.Optional; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -30,7 +29,6 @@ import org.opendaylight.restconf.nb.rfc8040.utils.parser.ParserIdentifier; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; @@ -153,7 +151,7 @@ public final class PostDataTransactionUtil { ParserIdentifier.toInstanceIdentifier(point.value(), schemaContext, Optional.empty()); int lastItemPosition = 0; for (final NormalizedNode nodeChild : readList.body()) { - if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { + if (nodeChild.name().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { break; } lastItemPosition++; @@ -163,12 +161,12 @@ public final class PostDataTransactionUtil { } int lastInsertedPosition = 0; final NormalizedNode emptySubtree = ImmutableNodes.fromInstanceId(schemaContext, parent); - transaction.merge(YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree); + transaction.merge(YangInstanceIdentifier.of(emptySubtree.name()), emptySubtree); for (final NormalizedNode nodeChild : readList.body()) { if (lastInsertedPosition == lastItemPosition) { transaction.replace(path, data, schemaContext); } - final YangInstanceIdentifier childPath = parent.node(nodeChild.getIdentifier()); + final YangInstanceIdentifier childPath = parent.node(nodeChild.name()); transaction.replace(childPath, nodeChild, schemaContext); lastInsertedPosition++; } @@ -200,10 +198,10 @@ public final class PostDataTransactionUtil { } YangInstanceIdentifier path = initialPath; - if (data instanceof MapNode) { - final Collection children = ((MapNode) data).body(); + if (data instanceof MapNode mapData) { + final var children = mapData.body(); if (!children.isEmpty()) { - path = path.node(children.iterator().next().getIdentifier()); + path = path.node(children.iterator().next().name()); } } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java index 546098b748..08b37922c0 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java @@ -149,7 +149,7 @@ public final class PutDataTransactionUtil { ParserIdentifier.toInstanceIdentifier(point.value(), schemaContext, Optional.empty()); int lastItemPosition = 0; for (final NormalizedNode nodeChild : readList.body()) { - if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { + if (nodeChild.name().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { break; } lastItemPosition++; @@ -159,12 +159,12 @@ public final class PutDataTransactionUtil { } int lastInsertedPosition = 0; final NormalizedNode emptySubtree = ImmutableNodes.fromInstanceId(schemaContext, path.getParent()); - transaction.merge(YangInstanceIdentifier.create(emptySubtree.getIdentifier()), emptySubtree); + transaction.merge(YangInstanceIdentifier.of(emptySubtree.name()), emptySubtree); for (final NormalizedNode nodeChild : readList.body()) { if (lastInsertedPosition == lastItemPosition) { transaction.replace(path, data, schemaContext); } - final YangInstanceIdentifier childPath = path.getParent().node(nodeChild.getIdentifier()); + final YangInstanceIdentifier childPath = path.coerceParent().node(nodeChild.name()); transaction.replace(childPath, nodeChild, schemaContext); lastInsertedPosition++; } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java index d332412d23..69eba92e07 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtil.java @@ -137,7 +137,7 @@ public final class ReadDataTransactionUtil { final var ctxNode = DataSchemaContextTree.from(ctx).findChild(path).orElseThrow(); if (readData instanceof ContainerNode container) { - final var builder = Builders.containerBuilder().withNodeIdentifier(container.getIdentifier()); + final var builder = Builders.containerBuilder().withNodeIdentifier(container.name()); buildCont(builder, container.body(), ctxNode, trim); return builder.build(); } else if (readData instanceof MapEntryNode mapEntry) { @@ -145,7 +145,7 @@ public final class ReadDataTransactionUtil { throw new IllegalStateException("Input " + mapEntry + " does not match " + ctxNode); } - final var builder = Builders.mapEntryBuilder().withNodeIdentifier(mapEntry.getIdentifier()); + final var builder = Builders.mapEntryBuilder().withNodeIdentifier(mapEntry.name()); buildMapEntryBuilder(builder, mapEntry.body(), ctxNode, trim, listSchema.getKeyDefinition()); return builder.build(); } else { @@ -175,7 +175,7 @@ public final class ReadDataTransactionUtil { private static void appendContainer(final DataContainerNodeBuilder builder, final ContainerNode container, final DataSchemaContext ctxNode, final boolean trim) { - final var childBuilder = Builders.containerBuilder().withNodeIdentifier(container.getIdentifier()); + final var childBuilder = Builders.containerBuilder().withNodeIdentifier(container.name()); buildCont(childBuilder, container.body(), ctxNode, trim); builder.withChild(childBuilder.build()); } @@ -242,7 +242,7 @@ public final class ReadDataTransactionUtil { case SYSTEM -> Builders.mapBuilder(); case USER -> Builders.orderedMapBuilder(); }; - buildList(childBuilder.withNodeIdentifier(map.getIdentifier()), map.body(), childCtx, trim, + buildList(childBuilder.withNodeIdentifier(map.name()), map.body(), childCtx, trim, listSchema.getKeyDefinition()); builder.withChild(childBuilder.build()); } @@ -252,7 +252,7 @@ public final class ReadDataTransactionUtil { final List<@NonNull QName> keys) { for (var entry : entries) { final var childCtx = getChildContext(ctxNode, entry); - final var mapEntryBuilder = Builders.mapEntryBuilder().withNodeIdentifier(entry.getIdentifier()); + final var mapEntryBuilder = Builders.mapEntryBuilder().withNodeIdentifier(entry.name()); buildMapEntryBuilder(mapEntryBuilder, entry.body(), childCtx, trim, keys); builder.withChild(mapEntryBuilder.build()); } @@ -414,8 +414,8 @@ public final class ReadDataTransactionUtil { */ private static void validateNodeMerge(final @NonNull NormalizedNode stateDataNode, final @NonNull NormalizedNode configDataNode) { - final QNameModule moduleOfStateData = stateDataNode.getIdentifier().getNodeType().getModule(); - final QNameModule moduleOfConfigData = configDataNode.getIdentifier().getNodeType().getModule(); + final QNameModule moduleOfStateData = stateDataNode.name().getNodeType().getModule(); + final QNameModule moduleOfConfigData = configDataNode.name().getNodeType().getModule(); if (!moduleOfStateData.equals(moduleOfConfigData)) { throw new RestconfDocumentedException("Unable to merge data from different modules."); } @@ -432,14 +432,14 @@ public final class ReadDataTransactionUtil { final @NonNull NormalizedNode stateDataNode) { final DataContainerNodeBuilder mapEntryBuilder = ImmutableNodes .mapEntryBuilder(); - mapEntryBuilder.withNodeIdentifier((NodeIdentifierWithPredicates) configDataNode.getIdentifier()); + mapEntryBuilder.withNodeIdentifier((NodeIdentifierWithPredicates) configDataNode.name()); // MAP CONFIG DATA mapRpcDataNode(configDataNode, mapEntryBuilder); // MAP STATE DATA mapRpcDataNode(stateDataNode, mapEntryBuilder); - return ImmutableNodes.mapNodeBuilder(configDataNode.getIdentifier().getNodeType()) + return ImmutableNodes.mapNodeBuilder(configDataNode.name().getNodeType()) .addChild(mapEntryBuilder.build()) .build(); } @@ -467,7 +467,7 @@ public final class ReadDataTransactionUtil { final @NonNull NormalizedNode stateDataNode) { if (configDataNode instanceof UserMapNode) { final CollectionNodeBuilder builder = Builders - .orderedMapBuilder().withNodeIdentifier(((MapNode) configDataNode).getIdentifier()); + .orderedMapBuilder().withNodeIdentifier(((MapNode) configDataNode).name()); mapValueToBuilder( ((UserMapNode) configDataNode).body(), ((UserMapNode) stateDataNode).body(), builder); @@ -475,7 +475,7 @@ public final class ReadDataTransactionUtil { return builder.build(); } else if (configDataNode instanceof MapNode) { final CollectionNodeBuilder builder = ImmutableNodes - .mapNodeBuilder().withNodeIdentifier(((MapNode) configDataNode).getIdentifier()); + .mapNodeBuilder().withNodeIdentifier(((MapNode) configDataNode).name()); mapValueToBuilder( ((MapNode) configDataNode).body(), ((MapNode) stateDataNode).body(), builder); @@ -483,7 +483,7 @@ public final class ReadDataTransactionUtil { return builder.build(); } else if (configDataNode instanceof MapEntryNode) { final DataContainerNodeBuilder builder = ImmutableNodes - .mapEntryBuilder().withNodeIdentifier(((MapEntryNode) configDataNode).getIdentifier()); + .mapEntryBuilder().withNodeIdentifier(((MapEntryNode) configDataNode).name()); mapValueToBuilder( ((MapEntryNode) configDataNode).body(), ((MapEntryNode) stateDataNode).body(), builder); @@ -491,7 +491,7 @@ public final class ReadDataTransactionUtil { return builder.build(); } else if (configDataNode instanceof ContainerNode) { final DataContainerNodeBuilder builder = Builders - .containerBuilder().withNodeIdentifier(((ContainerNode) configDataNode).getIdentifier()); + .containerBuilder().withNodeIdentifier(((ContainerNode) configDataNode).name()); mapValueToBuilder( ((ContainerNode) configDataNode).body(), ((ContainerNode) stateDataNode).body(), builder); @@ -499,43 +499,43 @@ public final class ReadDataTransactionUtil { return builder.build(); } else if (configDataNode instanceof ChoiceNode) { final DataContainerNodeBuilder builder = Builders - .choiceBuilder().withNodeIdentifier(((ChoiceNode) configDataNode).getIdentifier()); + .choiceBuilder().withNodeIdentifier(((ChoiceNode) configDataNode).name()); mapValueToBuilder( ((ChoiceNode) configDataNode).body(), ((ChoiceNode) stateDataNode).body(), builder); return builder.build(); } else if (configDataNode instanceof LeafNode) { - return ImmutableNodes.leafNode(configDataNode.getIdentifier().getNodeType(), configDataNode.body()); + return ImmutableNodes.leafNode(configDataNode.name().getNodeType(), configDataNode.body()); } else if (configDataNode instanceof UserLeafSetNode) { final ListNodeBuilder> builder = Builders - .orderedLeafSetBuilder().withNodeIdentifier(((UserLeafSetNode) configDataNode).getIdentifier()); + .orderedLeafSetBuilder().withNodeIdentifier(((UserLeafSetNode) configDataNode).name()); mapValueToBuilder(((UserLeafSetNode) configDataNode).body(), ((UserLeafSetNode) stateDataNode).body(), builder); return builder.build(); } else if (configDataNode instanceof LeafSetNode) { final ListNodeBuilder> builder = Builders - .leafSetBuilder().withNodeIdentifier(((LeafSetNode) configDataNode).getIdentifier()); + .leafSetBuilder().withNodeIdentifier(((LeafSetNode) configDataNode).name()); mapValueToBuilder(((LeafSetNode) configDataNode).body(), ((LeafSetNode) stateDataNode).body(), builder); return builder.build(); } else if (configDataNode instanceof LeafSetEntryNode) { return Builders.leafSetEntryBuilder() - .withNodeIdentifier(((LeafSetEntryNode) configDataNode).getIdentifier()) + .withNodeIdentifier(((LeafSetEntryNode) configDataNode).name()) .withValue(configDataNode.body()) .build(); } else if (configDataNode instanceof UnkeyedListNode) { final CollectionNodeBuilder builder = Builders - .unkeyedListBuilder().withNodeIdentifier(((UnkeyedListNode) configDataNode).getIdentifier()); + .unkeyedListBuilder().withNodeIdentifier(((UnkeyedListNode) configDataNode).name()); mapValueToBuilder(((UnkeyedListNode) configDataNode).body(), ((UnkeyedListNode) stateDataNode).body(), builder); return builder.build(); } else if (configDataNode instanceof UnkeyedListEntryNode) { final DataContainerNodeBuilder builder = Builders - .unkeyedListEntryBuilder().withNodeIdentifier(((UnkeyedListEntryNode) configDataNode).getIdentifier()); + .unkeyedListEntryBuilder().withNodeIdentifier(((UnkeyedListEntryNode) configDataNode).name()); mapValueToBuilder(((UnkeyedListEntryNode) configDataNode).body(), ((UnkeyedListEntryNode) stateDataNode).body(), builder); @@ -556,9 +556,9 @@ public final class ReadDataTransactionUtil { final @NonNull Collection configData, final @NonNull Collection stateData, final @NonNull NormalizedNodeContainerBuilder builder) { final Map configMap = configData.stream().collect( - Collectors.toMap(NormalizedNode::getIdentifier, Function.identity())); + Collectors.toMap(NormalizedNode::name, Function.identity())); final Map stateMap = stateData.stream().collect( - Collectors.toMap(NormalizedNode::getIdentifier, Function.identity())); + Collectors.toMap(NormalizedNode::name, Function.identity())); // merge config and state data of children with different identifiers mapDataToBuilder(configMap, stateMap, builder); diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java index badd248d5d..0a87cf9e47 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/TransactionUtil.java @@ -8,12 +8,9 @@ package org.opendaylight.restconf.nb.rfc8040.rests.utils; import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; import org.opendaylight.restconf.nb.rfc8040.rests.transactions.RestconfTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -38,15 +35,15 @@ public final class TransactionUtil { public static void ensureParentsByMerge(final YangInstanceIdentifier path, final EffectiveModelContext schemaContext, final RestconfTransaction transaction) { - final List normalizedPathWithoutChildArgs = new ArrayList<>(); + final var normalizedPathWithoutChildArgs = new ArrayList(); YangInstanceIdentifier rootNormalizedPath = null; - final Iterator it = path.getPathArguments().iterator(); + final var it = path.getPathArguments().iterator(); while (it.hasNext()) { - final PathArgument pathArgument = it.next(); + final var pathArgument = it.next(); if (rootNormalizedPath == null) { - rootNormalizedPath = YangInstanceIdentifier.create(pathArgument); + rootNormalizedPath = YangInstanceIdentifier.of(pathArgument); } if (it.hasNext()) { @@ -58,8 +55,7 @@ public final class TransactionUtil { return; } - final NormalizedNode parentStructure = ImmutableNodes.fromInstanceId(schemaContext, - YangInstanceIdentifier.create(normalizedPathWithoutChildArgs)); - transaction.merge(rootNormalizedPath, parentStructure); + transaction.merge(rootNormalizedPath, + ImmutableNodes.fromInstanceId(schemaContext, YangInstanceIdentifier.of(normalizedPathWithoutChildArgs))); } } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java index cf8a082574..24834be811 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierDeserializer.java @@ -75,7 +75,7 @@ public final class YangInstanceIdentifierDeserializer { } Result(final List steps, final SchemaInferenceStack stack, final SchemaNode node) { - path = YangInstanceIdentifier.create(steps); + path = YangInstanceIdentifier.of(steps); this.stack = requireNonNull(stack); this.node = requireNonNull(node); } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java index 11b4859ba7..96c846aef6 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java @@ -134,7 +134,7 @@ public class ParameterAwareNormalizedNodeWriterFieldsTest { @Test public void writeMapNodeAllFieldsTest() throws Exception { final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, null, - List.of(Set.of(keyLeafNodeData.getIdentifier().getNodeType()))); + List.of(Set.of(keyLeafNodeData.name().getNodeType()))); parameterWriter.write(mapNodeData); diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java index b4afc73395..a4a41d2701 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlBodyReaderMountPointTest.java @@ -166,7 +166,7 @@ public class XmlBodyReaderMountPointTest extends AbstractBodyReaderTest { // check return value checkMountPointNormalizedNodePayload(payload); // check if container was found both according to its name and namespace - final var dataNodeType = payload.getData().getIdentifier().getNodeType(); + final var dataNodeType = payload.getData().name().getNodeType(); assertEquals("foo-bar-container", dataNodeType.getLocalName()); assertEquals("foo:module", dataNodeType.getNamespace().toString()); } @@ -185,7 +185,7 @@ public class XmlBodyReaderMountPointTest extends AbstractBodyReaderTest { // check return value checkMountPointNormalizedNodePayload(payload); // check if container was found both according to its name and namespace - final var dataNodeType = payload.getData().getIdentifier().getNodeType(); + final var dataNodeType = payload.getData().name().getNodeType(); assertEquals("foo-bar-container", dataNodeType.getLocalName()); assertEquals("bar:module", dataNodeType.getNamespace().toString()); } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java index 956582d4d7..ab6de83cbd 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReaderTest.java @@ -169,7 +169,7 @@ public class JsonPatchBodyReaderTest extends AbstractBodyReaderTest { final PatchContext returnValue = jsonToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(LEAF_NAME_QNAME, data.getIdentifier().getNodeType()); + assertEquals(LEAF_NAME_QNAME, data.name().getNodeType()); assertEquals(ImmutableNodes.leafNode(LEAF_NAME_QNAME, "my-leaf20"), data); } @@ -221,7 +221,7 @@ public class JsonPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = jsonToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(CONT_AUG_QNAME, data.getIdentifier().getNodeType()); + assertEquals(CONT_AUG_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -263,7 +263,7 @@ public class JsonPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = jsonToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(MAP_CONT_QNAME, data.getIdentifier().getNodeType()); + assertEquals(MAP_CONT_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -301,7 +301,7 @@ public class JsonPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = jsonToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(LEAF_SET_QNAME, data.getIdentifier().getNodeType()); + assertEquals(LEAF_SET_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -343,7 +343,7 @@ public class JsonPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = jsonToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(LIST_QNAME, data.getIdentifier().getNodeType()); + assertEquals(LIST_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -380,7 +380,7 @@ public class JsonPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = jsonToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(CHOICE_CONT_QNAME, data.getIdentifier().getNodeType()); + assertEquals(CHOICE_CONT_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java index d0826a3a38..683370e1fd 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReaderTest.java @@ -164,7 +164,7 @@ public class XmlPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = xmlToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(CONT_AUG_QNAME, data.getIdentifier().getNodeType()); + assertEquals(CONT_AUG_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -202,7 +202,7 @@ public class XmlPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = xmlToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(MAP_CONT_QNAME, data.getIdentifier().getNodeType()); + assertEquals(MAP_CONT_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -236,7 +236,7 @@ public class XmlPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = xmlToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(LEAF_SET_QNAME, data.getIdentifier().getNodeType()); + assertEquals(LEAF_SET_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -274,7 +274,7 @@ public class XmlPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = xmlToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(LIST_QNAME, data.getIdentifier().getNodeType()); + assertEquals(LIST_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -307,7 +307,7 @@ public class XmlPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = xmlToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(CHOICE_CONT_QNAME, data.getIdentifier().getNodeType()); + assertEquals(CHOICE_CONT_QNAME, data.name().getNodeType()); assertEquals(expectedData, data); } @@ -334,7 +334,7 @@ public class XmlPatchBodyReaderTest extends AbstractBodyReaderTest { final var returnValue = xmlToPatchBodyReader.readFrom(null, null, null, mediaType, null, inputStream); checkPatchContext(returnValue); final var data = returnValue.getData().get(0).getNode(); - assertEquals(LEAF_NAME_QNAME, data.getIdentifier().getNodeType()); + assertEquals(LEAF_NAME_QNAME, data.name().getNodeType()); assertEquals(ImmutableNodes.leafNode(LEAF_NAME_QNAME, "my-leaf20"), data); } } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java index d3e3763902..321a3373c2 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/test/XmlBodyReaderTest.java @@ -91,7 +91,7 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest { assertNotNull(payload); final InstanceIdentifierContext iid = payload.getInstanceIdentifierContext(); - assertEquals(YangInstanceIdentifier.create( + assertEquals(YangInstanceIdentifier.of( new NodeIdentifier(TOP_LEVEL_LIST), NodeIdentifierWithPredicates.of(TOP_LEVEL_LIST, QName.create(TOP_LEVEL_LIST, "key-leaf"), "key-value")), iid.getInstanceIdentifier()); @@ -100,7 +100,7 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest { final MapEntryNode data = (MapEntryNode) payload.getData(); assertEquals(2, data.size()); for (final DataContainerChild child : data.body()) { - switch (child.getIdentifier().getNodeType().getLocalName()) { + switch (child.name().getNodeType().getLocalName()) { case "key-leaf": assertEquals("key-value", child.body()); break; @@ -227,7 +227,7 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest { // check return value checkNormalizedNodePayload(payload); // check if container was found both according to its name and namespace - final var payloadNodeType = payload.getData().getIdentifier().getNodeType(); + final var payloadNodeType = payload.getData().name().getNodeType(); assertEquals("foo-bar-container", payloadNodeType.getLocalName()); assertEquals("foo:module", payloadNodeType.getNamespace().toString()); } @@ -247,7 +247,7 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest { // check return value checkNormalizedNodePayload(payload); // check if container was found both according to its name and namespace - final var payloadNodeType = payload.getData().getIdentifier().getNodeType(); + final var payloadNodeType = payload.getData().name().getNodeType(); assertEquals("foo-bar-container", payloadNodeType.getLocalName()); assertEquals("bar:module", payloadNodeType.getNamespace().toString()); } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java index 80d470c369..bf4dca6d39 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java @@ -202,7 +202,7 @@ public class RestconfDataServiceImplTest { @Test public void testReadData() { - doReturn(new MultivaluedHashMap()).when(uriInfo).getQueryParameters(); + doReturn(new MultivaluedHashMap<>()).when(uriInfo).getQueryParameters(); doReturn(immediateFluentFuture(Optional.of(buildBaseCont))).when(read) .read(LogicalDatastoreType.CONFIGURATION, iidBase); doReturn(immediateFluentFuture(Optional.empty())) @@ -215,7 +215,7 @@ public class RestconfDataServiceImplTest { @Test public void testReadRootData() { - doReturn(new MultivaluedHashMap()).when(uriInfo).getQueryParameters(); + doReturn(new MultivaluedHashMap<>()).when(uriInfo).getQueryParameters(); doReturn(immediateFluentFuture(Optional.of(wrapNodeByDataRootContainer(buildBaseContConfig)))) .when(read) .read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.of()); @@ -247,7 +247,7 @@ public class RestconfDataServiceImplTest { */ @Test public void testReadDataMountPoint() { - doReturn(new MultivaluedHashMap()).when(uriInfo).getQueryParameters(); + doReturn(new MultivaluedHashMap<>()).when(uriInfo).getQueryParameters(); doReturn(immediateFluentFuture(Optional.of(buildBaseContConfig))).when(read) .read(LogicalDatastoreType.CONFIGURATION, iidBase); doReturn(immediateFluentFuture(Optional.of(buildBaseContOperational))).when(read) @@ -263,14 +263,14 @@ public class RestconfDataServiceImplTest { final NormalizedNode data = ((NormalizedNodePayload) response.getEntity()).getData(); assertTrue(data instanceof ContainerNode); assertEquals(3, ((ContainerNode) data).size()); - assertTrue(((ContainerNode) data).findChildByArg(buildPlayerCont.getIdentifier()).isPresent()); - assertTrue(((ContainerNode) data).findChildByArg(buildLibraryCont.getIdentifier()).isPresent()); - assertTrue(((ContainerNode) data).findChildByArg(buildPlaylistList.getIdentifier()).isPresent()); + assertNotNull(((ContainerNode) data).childByArg(buildPlayerCont.name())); + assertNotNull(((ContainerNode) data).childByArg(buildLibraryCont.name())); + assertNotNull(((ContainerNode) data).childByArg(buildPlaylistList.name())); } @Test public void testReadDataNoData() { - doReturn(new MultivaluedHashMap()).when(uriInfo).getQueryParameters(); + doReturn(new MultivaluedHashMap<>()).when(uriInfo).getQueryParameters(); doReturn(immediateFluentFuture(Optional.empty())) .when(read).read(LogicalDatastoreType.CONFIGURATION, iidBase); doReturn(immediateFluentFuture(Optional.empty())) @@ -307,11 +307,11 @@ public class RestconfDataServiceImplTest { final NormalizedNode data = ((NormalizedNodePayload) response.getEntity()).getData(); // config data present - assertTrue(((ContainerNode) data).findChildByArg(buildPlayerCont.getIdentifier()).isPresent()); - assertTrue(((ContainerNode) data).findChildByArg(buildLibraryCont.getIdentifier()).isPresent()); + assertNotNull(((ContainerNode) data).childByArg(buildPlayerCont.name())); + assertNotNull(((ContainerNode) data).childByArg(buildLibraryCont.name())); // state data absent - assertFalse(((ContainerNode) data).findChildByArg(buildPlaylistList.getIdentifier()).isPresent()); + assertNull(((ContainerNode) data).childByArg(buildPlaylistList.name())); } /** @@ -335,11 +335,11 @@ public class RestconfDataServiceImplTest { final NormalizedNode data = ((NormalizedNodePayload) response.getEntity()).getData(); // state data present - assertTrue(((ContainerNode) data).findChildByArg(buildPlayerCont.getIdentifier()).isPresent()); - assertTrue(((ContainerNode) data).findChildByArg(buildPlaylistList.getIdentifier()).isPresent()); + assertNotNull(((ContainerNode) data).childByArg(buildPlayerCont.name())); + assertNotNull(((ContainerNode) data).childByArg(buildPlaylistList.name())); // config data absent - assertFalse(((ContainerNode) data).findChildByArg(buildLibraryCont.getIdentifier()).isPresent()); + assertNull(((ContainerNode) data).childByArg(buildLibraryCont.name())); } @Test @@ -376,7 +376,7 @@ public class RestconfDataServiceImplTest { final NodeIdentifierWithPredicates nodeWithKey = NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band"); - doReturn(new MultivaluedHashMap()).when(uriInfo).getQueryParameters(); + doReturn(new MultivaluedHashMap<>()).when(uriInfo).getQueryParameters(); final InstanceIdentifierContext iidContext = InstanceIdentifierContext.ofLocalPath(contextRef, iidBase); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(listQname)) @@ -388,7 +388,7 @@ public class RestconfDataServiceImplTest { .build()); final MapNode data = (MapNode) payload.getData(); final MapEntryNode entryNode = data.body().iterator().next(); - final NodeIdentifierWithPredicates identifier = entryNode.getIdentifier(); + final NodeIdentifierWithPredicates identifier = entryNode.name(); final YangInstanceIdentifier node = payload.getInstanceIdentifierContext().getInstanceIdentifier().node(identifier); doReturn(immediateFalseFluentFuture()) diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java index 7749946fd4..fc06fbef81 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImplTest.java @@ -49,7 +49,6 @@ import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; 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.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @@ -99,8 +98,8 @@ public class RestconfStreamsSubscriptionServiceImplTest { public static void setUpBeforeTest() { final String name = "data-change-event-subscription/toaster:toaster/toasterStatus/datastore=OPERATIONAL/scope=ONE"; - final ListenerAdapter adapter = new ListenerAdapter(YangInstanceIdentifier.create(new NodeIdentifier( - QName.create("http://netconfcentral.org/ns/toaster", "2009-11-20", "toaster"))), + final ListenerAdapter adapter = new ListenerAdapter(YangInstanceIdentifier.of( + QName.create("http://netconfcentral.org/ns/toaster", "2009-11-20", "toaster")), name, NotificationOutputType.JSON); ListenersBroker.getInstance().setDataChangeListeners(Map.of(name, adapter)); } diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java index 06d97b7740..266a677c82 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java @@ -141,7 +141,7 @@ public class PostDataTransactionUtilTest { doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); final NodeIdentifier identifier = - ((ContainerNode) ((Collection) payload.getData().body()).iterator().next()).getIdentifier(); + ((ContainerNode) ((Collection) payload.getData().body()).iterator().next()).name(); final YangInstanceIdentifier node = iid2.node(identifier); doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, node.getParent(), payload.getData()); doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit(); @@ -168,7 +168,7 @@ public class PostDataTransactionUtilTest { final MapNode data = (MapNode) payload.getData(); final MapEntryNode entryNode = data.body().iterator().next(); - final NodeIdentifierWithPredicates identifier = entryNode.getIdentifier(); + final NodeIdentifierWithPredicates identifier = entryNode.name(); final YangInstanceIdentifier node = iidList.node(identifier); doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, node, entryNode); @@ -204,7 +204,7 @@ public class PostDataTransactionUtilTest { doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); final NodeIdentifier identifier = - ((ContainerNode) ((Collection) payload.getData().body()).iterator().next()).getIdentifier(); + ((ContainerNode) ((Collection) payload.getData().body()).iterator().next()).name(); final YangInstanceIdentifier node = iid2.node(identifier); doNothing().when(readWrite).put(LogicalDatastoreType.CONFIGURATION, node.getParent(), payload.getData()); final DOMException domException = new DOMException((short) 414, "Post request failed"); diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java index 8b914932f2..67e5d37210 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java @@ -156,7 +156,7 @@ public class ReadDataTransactionUtilTest { .withChild(ImmutableNodes.leafNode(QName.create(DATA.base, "exampleLeaf"), "i am leaf")) .build(); - final YangInstanceIdentifier path = YangInstanceIdentifier.builder().node(content.getIdentifier()).build(); + final YangInstanceIdentifier path = YangInstanceIdentifier.builder().node(content.name()).build(); doReturn(immediateFluentFuture(Optional.of(content))).when(read) .read(LogicalDatastoreType.CONFIGURATION, path); diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java index 9e1fff2771..1d036df5ca 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/streams/listeners/ListenerAdapterTest.java @@ -51,7 +51,6 @@ import org.opendaylight.yang.gen.v1.urn.sal.restconf.event.subscription.rev14070 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.util.BindingMap; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.skyscreamer.jsonassert.JSONAssert; @@ -102,8 +101,7 @@ public class ListenerAdapterTest extends AbstractConcurrentDataBrokerTest { private static final String XML_NOTIF_WITHOUT_DATA_DELETE = "/listener-adapter-test/notif-without-data-delete.xml"; - private static final YangInstanceIdentifier PATCH_CONT_YIID = - YangInstanceIdentifier.create(new NodeIdentifier(PatchCont.QNAME)); + private static final YangInstanceIdentifier PATCH_CONT_YIID = YangInstanceIdentifier.of(PatchCont.QNAME); private static EffectiveModelContext SCHEMA_CONTEXT; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java index 7ef2e5a249..9477411bd0 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/test/incubate/InMemoryMdsalModule.java @@ -33,14 +33,14 @@ import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; * @author Michael Vorburger.ch */ public class InMemoryMdsalModule extends AbstractModule { - private static final int NOTIFICATION_SERVICE_QUEUE_DEPTH = 128; private final AbstractBaseDataBrokerTest dataBrokerTest; private final DOMNotificationRouter domNotificationRouter; public InMemoryMdsalModule() throws Exception { - dataBrokerTest = new AbstractConcurrentDataBrokerTest(true) { // NOT AbstractDataBrokerTest + dataBrokerTest = new AbstractConcurrentDataBrokerTest(true) { + // NOT AbstractDataBrokerTest }; dataBrokerTest.setup(); diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java index ccee1c3376..c72791758f 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/mapping/RestconfMappingNodeUtilTest.java @@ -30,7 +30,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; 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; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -122,11 +121,10 @@ public class RestconfMappingNodeUtilTest { private static void assertMappedData(final Map map, final MapEntryNode mappedData) { assertNotNull(mappedData); - for (final DataContainerChild child : mappedData.body()) { - if (child instanceof LeafNode) { - final LeafNode leaf = (LeafNode) child; - assertTrue(map.containsKey(leaf.getIdentifier().getNodeType())); - assertEquals(map.get(leaf.getIdentifier().getNodeType()), leaf.body()); + for (var child : mappedData.body()) { + if (child instanceof LeafNode leaf) { + assertTrue(map.containsKey(leaf.name().getNodeType())); + assertEquals(map.get(leaf.name().getNodeType()), leaf.body()); } } } @@ -139,11 +137,11 @@ public class RestconfMappingNodeUtilTest { */ private static void verifyDeviations(final ContainerNode containerNode) { int deviationsFound = 0; - for (final DataContainerChild child : containerNode.body()) { - if (child instanceof MapNode) { - for (final MapEntryNode mapEntryNode : ((MapNode) child).body()) { - for (final DataContainerChild dataContainerChild : mapEntryNode.body()) { - if (dataContainerChild.getIdentifier().getNodeType().equals(Deviation.QNAME)) { + for (var child : containerNode.body()) { + if (child instanceof MapNode mapChild) { + for (var mapEntryNode : mapChild.body()) { + for (var dataContainerChild : mapEntryNode.body()) { + if (dataContainerChild.name().getNodeType().equals(Deviation.QNAME)) { deviationsFound++; } } @@ -162,17 +160,17 @@ public class RestconfMappingNodeUtilTest { private static void verifyLoadedModules(final ContainerNode containerNode) { final Map loadedModules = new HashMap<>(); - for (final DataContainerChild child : containerNode.body()) { + for (var child : containerNode.body()) { if (child instanceof LeafNode) { - assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.getIdentifier().getNodeType()); + assertEquals(IetfYangLibrary.MODULE_SET_ID_LEAF_QNAME, child.name().getNodeType()); } - if (child instanceof MapNode) { - assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.getIdentifier().getNodeType()); - for (final MapEntryNode mapEntryNode : ((MapNode) child).body()) { + if (child instanceof MapNode mapChild) { + assertEquals(IetfYangLibrary.MODULE_QNAME_LIST, child.name().getNodeType()); + for (var mapEntryNode : mapChild.body()) { String name = ""; String revision = ""; - for (final DataContainerChild dataContainerChild : mapEntryNode.body()) { - switch (dataContainerChild.getIdentifier().getNodeType().getLocalName()) { + for (var dataContainerChild : mapEntryNode.body()) { + switch (dataContainerChild.name().getNodeType().getLocalName()) { case "name": name = String.valueOf(dataContainerChild.body()); break; @@ -181,7 +179,7 @@ public class RestconfMappingNodeUtilTest { break; default : LOG.info("Unknown local name '{}' of node.", - dataContainerChild.getIdentifier().getNodeType().getLocalName()); + dataContainerChild.name().getNodeType().getLocalName()); break; } } -- 2.36.6