From afc2f00460f3866d8dffcf230ba08f549e835a0b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 11 Apr 2024 16:22:44 +0200 Subject: [PATCH] Integrate RestconfNormalizedNodeWriter RestconfNormalizedNodeWriter is an interface with a single implementation, integrate it there and simplify naming. JIRA: NETCONF-773 Change-Id: I552aad11b4cc2c3db9eb46f5d2d4410e1c30ccb0 Signed-off-by: Robert Varga --- .../JsonNormalizedNodeBodyWriter.java | 3 +- ...java => RestconfNormalizedNodeWriter.java} | 109 ++++++++---------- .../XmlNormalizedNodeBodyWriter.java | 3 +- .../api/RestconfNormalizedNodeWriter.java | 19 --- .../transactions/MdsalRestconfStrategy.java | 4 +- ...estconfNormalizedNodeWriterDepthTest.java} | 26 ++--- ...stconfNormalizedNodeWriterFieldsTest.java} | 12 +- ...nfNormalizedNodeWriterParametersTest.java} | 10 +- 8 files changed, 75 insertions(+), 111 deletions(-) rename restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/{ParameterAwareNormalizedNodeWriter.java => RestconfNormalizedNodeWriter.java} (77%) delete mode 100644 restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java rename restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/{ParameterAwareNormalizedNodeWriterDepthTest.java => RestconfNormalizedNodeWriterDepthTest.java} (90%) rename restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/{ParameterAwareNormalizedNodeWriterFieldsTest.java => RestconfNormalizedNodeWriterFieldsTest.java} (92%) rename restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/{ParameterAwareNormalizedNodeWriterParametersTest.java => RestconfNormalizedNodeWriterParametersTest.java} (91%) 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 a7363fbef4..6bb73b1111 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 @@ -16,7 +16,6 @@ import javax.ws.rs.ext.Provider; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.restconf.api.MediaTypes; import org.opendaylight.restconf.api.query.PrettyPrintParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.api.RestconfNormalizedNodeWriter; import org.opendaylight.restconf.nb.rfc8040.legacy.WriterParameters; import org.opendaylight.restconf.server.spi.FormattableBodySupport; import org.opendaylight.yangtools.yang.common.XMLNamespace; @@ -63,7 +62,7 @@ public final class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBo final @Nullable XMLNamespace initialNamespace) { // TODO: Performance: Cache JSON Codec factory and schema context final var codecs = JSONCodecFactorySupplier.RFC7951.getShared(inference.modelContext()); - return ParameterAwareNormalizedNodeWriter.forStreamWriter( + return RestconfNormalizedNodeWriter.forStreamWriter( JSONNormalizedNodeStreamWriter.createNestedWriter(codecs, inference, initialNamespace, jsonWriter), writerParameters.depth(), writerParameters.fields()); } 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/RestconfNormalizedNodeWriter.java similarity index 77% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriter.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriter.java index ba06afacc8..09086d7598 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/RestconfNormalizedNodeWriter.java @@ -11,6 +11,8 @@ import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import com.google.common.collect.Iterables; +import java.io.Closeable; +import java.io.Flushable; import java.io.IOException; import java.util.List; import java.util.Map.Entry; @@ -19,7 +21,6 @@ import javax.xml.transform.dom.DOMSource; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.restconf.api.query.DepthParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.api.RestconfNormalizedNodeWriter; import org.opendaylight.yangtools.yang.common.Ordering; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -27,7 +28,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.AnydataNode; import org.opendaylight.yangtools.yang.data.api.schema.AnyxmlNode; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; 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.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode; @@ -47,26 +47,24 @@ import org.slf4j.LoggerFactory; * the backing data, this encapsulates a {@link NormalizedNodeStreamWriter} and allows * us to write multiple nodes. */ +// FIXME: this is a copy&paste from yangtools' NormalizedNodeWriter then adapted for filtering @Beta -public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNodeWriter { +public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable { private static final QName ROOT_DATA_QNAME = QName.create("urn:ietf:params:xml:ns:netconf:base:1.0", "data"); - private final NormalizedNodeStreamWriter writer; + final @NonNull NormalizedNodeStreamWriter writer; private final Integer maxDepth; - protected final List> fields; - protected int currentDepth = 0; + private final List> fields; - private ParameterAwareNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, - final List> fields) { + int currentDepth = 0; + + private RestconfNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, + final List> fields) { this.writer = requireNonNull(writer); maxDepth = depth == null ? null : depth.value(); this.fields = fields; } - protected final NormalizedNodeStreamWriter getWriter() { - return writer; - } - /** * Create a new writer backed by a {@link NormalizedNodeStreamWriter}. * @@ -74,7 +72,7 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod * @param maxDepth Maximal depth to write * @return A new instance. */ - public static @NonNull ParameterAwareNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, + public static @NonNull RestconfNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, final @Nullable DepthParam maxDepth) { return forStreamWriter(writer, true, maxDepth, null); } @@ -87,8 +85,8 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod * @param fields Selected child nodes to write * @return A new instance. */ - public static @NonNull ParameterAwareNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, - final @Nullable DepthParam maxDepth, final List> fields) { + public static @NonNull RestconfNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, + final @Nullable DepthParam maxDepth, final @Nullable List> fields) { return forStreamWriter(writer, true, maxDepth, fields); } @@ -107,40 +105,34 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod * @param fields Selected child nodes to write * @return A new instance. */ - public static @NonNull ParameterAwareNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, + public static @NonNull RestconfNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, final boolean orderKeyLeaves, final DepthParam depth, final List> fields) { - return orderKeyLeaves ? new OrderedParameterAwareNormalizedNodeWriter(writer, depth, fields) - : new ParameterAwareNormalizedNodeWriter(writer, depth, fields); + return orderKeyLeaves ? new OrderedRestconfNormalizedNodeWriter(writer, depth, fields) + : new RestconfNormalizedNodeWriter(writer, depth, fields); } /** - * Iterate over the provided {@link NormalizedNode} and emit write - * events to the encapsulated {@link NormalizedNodeStreamWriter}. + * Iterate over the provided {@link NormalizedNode} and emit write events to the encapsulated + * {@link NormalizedNodeStreamWriter}. * * @param node Node * @return {@code ParameterAwareNormalizedNodeWriter} * @throws IOException when thrown from the backing writer. */ - @Override - public final ParameterAwareNormalizedNodeWriter write(final NormalizedNode node) throws IOException { - if (wasProcessedAsCompositeNode(node)) { + public final RestconfNormalizedNodeWriter write(final NormalizedNode node) throws IOException { + if (wasProcessedAsCompositeNode(node) || wasProcessAsSimpleNode(node)) { return this; } - - if (wasProcessAsSimpleNode(node)) { - return this; - } - throw new IllegalStateException("It wasn't possible to serialize node " + node); } @Override - public void flush() throws IOException { + public final void flush() throws IOException { writer.flush(); } @Override - public void close() throws IOException { + public final void close() throws IOException { writer.flush(); writer.close(); } @@ -152,14 +144,12 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod writer.scalarValue(nodeAsLeafList.body()); writer.endNode(); } - return true; } else if (node instanceof LeafNode nodeAsLeaf) { writer.startLeafNode(nodeAsLeaf.name()); writer.scalarValue(nodeAsLeaf.body()); writer.endNode(); - return true; } else if (node instanceof AnyxmlNode anyxmlNode) { - final Class objectModel = anyxmlNode.bodyObjectModel(); + final var objectModel = anyxmlNode.bodyObjectModel(); if (writer.startAnyxmlNode(anyxmlNode.name(), objectModel)) { if (DOMSource.class.isAssignableFrom(objectModel)) { writer.domSourceValue((DOMSource) anyxmlNode.body()); @@ -168,17 +158,16 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod } writer.endNode(); } - return true; } else if (node instanceof AnydataNode anydataNode) { - final Class objectModel = anydataNode.bodyObjectModel(); + final var objectModel = anydataNode.bodyObjectModel(); if (writer.startAnydataNode(anydataNode.name(), objectModel)) { writer.scalarValue(anydataNode.body()); writer.endNode(); } - return true; + } else { + return false; } - - return false; + return true; } /** @@ -216,9 +205,9 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod * @return True * @throws IOException when the writer reports it */ - protected final boolean writeChildren(final Iterable children, - final boolean mixinParent) throws IOException { - for (final NormalizedNode child : children) { + protected final boolean writeChildren(final Iterable children, final boolean mixinParent) + throws IOException { + for (var child : children) { if (selectedByParameters(child, mixinParent)) { write(child); } @@ -227,7 +216,7 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod return true; } - protected boolean writeMapEntryChildren(final MapEntryNode mapEntryNode) throws IOException { + private boolean writeMapEntryChildren(final MapEntryNode mapEntryNode) throws IOException { if (selectedByParameters(mapEntryNode, false)) { writeChildren(mapEntryNode.body(), false); } else if (fields == null && maxDepth != null && currentDepth == maxDepth) { @@ -245,7 +234,7 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod writer.endNode(); } - protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException { + boolean writeMapEntryNode(final MapEntryNode node) throws IOException { writer.startMapEntryNode(node.name(), node.size()); currentDepth++; writeMapEntryChildren(node); @@ -305,24 +294,23 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod return processedAsCompositeNode; } - private static final class OrderedParameterAwareNormalizedNodeWriter extends ParameterAwareNormalizedNodeWriter { - private static final Logger LOG = LoggerFactory.getLogger(OrderedParameterAwareNormalizedNodeWriter.class); + private static final class OrderedRestconfNormalizedNodeWriter extends RestconfNormalizedNodeWriter { + private static final Logger LOG = LoggerFactory.getLogger(OrderedRestconfNormalizedNodeWriter.class); - OrderedParameterAwareNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, - final List> fields) { + OrderedRestconfNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, + final List> fields) { super(writer, depth, fields); } @Override - protected boolean writeMapEntryNode(final MapEntryNode node) throws IOException { - final NormalizedNodeStreamWriter writer = getWriter(); + boolean writeMapEntryNode(final MapEntryNode node) throws IOException { writer.startMapEntryNode(node.name(), node.size()); - final Set qnames = node.name().keySet(); + final var qnames = node.name().keySet(); // Write out all the key children currentDepth++; - for (final QName qname : qnames) { - final DataContainerChild child = node.childByArg(new NodeIdentifier(qname)); + for (var qname : qnames) { + final var child = node.childByArg(new NodeIdentifier(qname)); if (child != null) { if (selectedByParameters(child, false)) { write(child); @@ -331,19 +319,16 @@ public class ParameterAwareNormalizedNodeWriter implements RestconfNormalizedNod LOG.info("No child for key element {} found", qname); } } - currentDepth--; - currentDepth++; // Write all the rest - final boolean result = - writeChildren(Iterables.filter(node.body(), input -> { - if (!qnames.contains(input.name().getNodeType())) { - return true; - } + final boolean result = writeChildren(Iterables.filter(node.body(), input -> { + if (!qnames.contains(input.name().getNodeType())) { + return true; + } - LOG.debug("Skipping key child {}", input); - return false; - }), false); + LOG.debug("Skipping key child {}", input); + return false; + }), false); currentDepth--; return result; } 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 439d01560a..8da763cfcb 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 @@ -17,7 +17,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.opendaylight.restconf.api.MediaTypes; import org.opendaylight.restconf.api.query.PrettyPrintParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.api.RestconfNormalizedNodeWriter; import org.opendaylight.restconf.nb.rfc8040.legacy.WriterParameters; import org.opendaylight.restconf.server.spi.FormattableBodySupport; import org.opendaylight.yangtools.yang.common.QName; @@ -67,7 +66,7 @@ public final class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBod private static RestconfNormalizedNodeWriter createNormalizedNodeWriter(final XMLStreamWriter xmlWriter, final Inference inference, final WriterParameters writerParameters) { - return ParameterAwareNormalizedNodeWriter.forStreamWriter( + return RestconfNormalizedNodeWriter.forStreamWriter( XMLStreamNormalizedNodeStreamWriter.create(xmlWriter, inference), writerParameters.depth(), writerParameters.fields()); } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java deleted file mode 100644 index 4a70195d2a..0000000000 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/api/RestconfNormalizedNodeWriter.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.restconf.nb.rfc8040.jersey.providers.api; - -import java.io.Closeable; -import java.io.Flushable; -import java.io.IOException; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; - -public interface RestconfNormalizedNodeWriter extends Flushable, Closeable { - - RestconfNormalizedNodeWriter write(NormalizedNode node) throws IOException; -} diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java index 9cf61e62fc..06a68f3dd9 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalRestconfStrategy.java @@ -38,7 +38,7 @@ import org.opendaylight.restconf.api.query.FieldsParam.NodeSelector; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.restconf.common.errors.RestconfFuture; import org.opendaylight.restconf.common.errors.SettableRestconfFuture; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.ParameterAwareNormalizedNodeWriter; +import org.opendaylight.restconf.nb.rfc8040.jersey.providers.RestconfNormalizedNodeWriter; import org.opendaylight.restconf.nb.rfc8040.legacy.WriterParameters; import org.opendaylight.restconf.server.api.DataGetParams; import org.opendaylight.restconf.server.api.DataGetResult; @@ -156,7 +156,7 @@ public final class MdsalRestconfStrategy extends RestconfStrategy { /** * Translate a {@link FieldsParam} to a complete list of child nodes organized into levels, suitable for use with - * {@link ParameterAwareNormalizedNodeWriter}. + * {@link RestconfNormalizedNodeWriter}. * *

* Fields parser that stores set of {@link QName}s in each level. Because of this fact, from the output it is only diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterDepthTest.java similarity index 90% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterDepthTest.java index ae15892556..5e0af2a72f 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterDepthTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterDepthTest.java @@ -34,10 +34,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; /** - * Unit test for {@link ParameterAwareNormalizedNodeWriter} used with depth parameter. + * Unit test for {@link RestconfNormalizedNodeWriter} used with depth parameter. */ @RunWith(MockitoJUnitRunner.StrictStubs.class) -public class ParameterAwareNormalizedNodeWriterDepthTest { +public class RestconfNormalizedNodeWriterDepthTest { private final String leafSetEntryNodeValue = "leaf-set-value"; private final String keyLeafNodeValue = "key-value"; private final String anotherLeafNodeValue = "another-value"; @@ -88,7 +88,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeContainerWithoutChildrenDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(containerNodeData); @@ -104,7 +104,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeContainerWithChildrenDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(containerNodeData); @@ -123,7 +123,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeMapNodeWithoutChildrenDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(mapNodeData); @@ -144,7 +144,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Ignore @Test public void writeMapNodeWithChildrenDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(mapNodeData); @@ -170,7 +170,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeLeafSetNodeWithoutChildrenDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(leafSetNodeData); @@ -186,7 +186,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeLeafSetNodeWithChildrenDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(leafSetNodeData); @@ -204,7 +204,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeLeafSetEntryNodeDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(leafSetEntryNodeData); @@ -221,7 +221,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeMapEntryNodeUnorderedOnlyKeysDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.min(), + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.min(), null); parameterWriter.write(mapEntryNodeData); @@ -241,7 +241,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeMapEntryNodeUnorderedDepthTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.max(), + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.max(), null); parameterWriter.write(mapEntryNodeData); @@ -262,7 +262,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { */ @Test public void writeMapEntryNodeOrderedWithoutChildrenTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(mapEntryNodeData); @@ -282,7 +282,7 @@ public class ParameterAwareNormalizedNodeWriterDepthTest { @Ignore @Test public void writeMapEntryNodeOrderedTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(mapEntryNodeData); 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/RestconfNormalizedNodeWriterFieldsTest.java similarity index 92% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterFieldsTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterFieldsTest.java index 47f644b9ec..3edbf21e4f 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/RestconfNormalizedNodeWriterFieldsTest.java @@ -32,10 +32,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; /** - * Unit test for {@link ParameterAwareNormalizedNodeWriter} used with fields parameter. + * Unit test for {@link RestconfNormalizedNodeWriter} used with fields parameter. */ @RunWith(MockitoJUnitRunner.StrictStubs.class) -public class ParameterAwareNormalizedNodeWriterFieldsTest { +public class RestconfNormalizedNodeWriterFieldsTest { private final String leafSetEntryNodeValue = "leaf-set-value"; private final String keyLeafNodeValue = "key-value"; private final NodeIdentifier containerNodeIdentifier = @@ -79,7 +79,7 @@ public class ParameterAwareNormalizedNodeWriterFieldsTest { */ @Test public void writeContainerWithLimitedFieldsTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); parameterWriter.write(containerNodeData); @@ -95,7 +95,7 @@ public class ParameterAwareNormalizedNodeWriterFieldsTest { */ @Test public void writeContainerAllFieldsTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter( + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter( writer, null, List.of(Set.of(leafSetNodeIdentifier.getNodeType()))); parameterWriter.write(containerNodeData); @@ -115,7 +115,7 @@ public class ParameterAwareNormalizedNodeWriterFieldsTest { */ @Test public void writeMapEntryNodeWithLimitedFieldsTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); parameterWriter.write(mapNodeData); @@ -132,7 +132,7 @@ public class ParameterAwareNormalizedNodeWriterFieldsTest { */ @Test public void writeMapNodeAllFieldsTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, null, + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null, 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/ParameterAwareNormalizedNodeWriterParametersTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterParametersTest.java similarity index 91% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterParametersTest.java index a0d11b7ffd..d38bcca4c3 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/ParameterAwareNormalizedNodeWriterParametersTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterParametersTest.java @@ -29,10 +29,10 @@ import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** - * Unit test for {@link ParameterAwareNormalizedNodeWriter} used with all parameters. + * Unit test for {@link RestconfNormalizedNodeWriter} used with all parameters. */ @RunWith(MockitoJUnitRunner.StrictStubs.class) -public class ParameterAwareNormalizedNodeWriterParametersTest { +public class RestconfNormalizedNodeWriterParametersTest { private final String leafSetEntryNodeValue = "leaf-set-value"; private final NodeIdentifier containerNodeIdentifier = NodeIdentifier.create(QName.create("namespace", "container")); @@ -70,7 +70,7 @@ public class ParameterAwareNormalizedNodeWriterParametersTest { */ @Test public void writeContainerParameterPrioritiesTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min(), + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min(), List.of( Set.of(leafSetNodeIdentifier.getNodeType()), Set.of(leafSetEntryNodeIdentifier.getNodeType()))); @@ -92,7 +92,7 @@ public class ParameterAwareNormalizedNodeWriterParametersTest { */ @Test public void writeRootDataTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, null); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null); parameterWriter.write(rootDataContainerData); @@ -106,7 +106,7 @@ public class ParameterAwareNormalizedNodeWriterParametersTest { @Test public void writeEmptyRootContainerTest() throws Exception { - final var parameterWriter = ParameterAwareNormalizedNodeWriter.forStreamWriter(writer, null); + final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null); parameterWriter.write(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)) -- 2.36.6