From: Robert Varga Date: Thu, 11 Apr 2024 21:32:48 +0000 (+0200) Subject: Eliminate restconf.nb.rfc8040.jersey X-Git-Tag: v7.0.5~41 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F111360%2F3;p=netconf.git Eliminate restconf.nb.rfc8040.jersey There are only a couple of classes left in this hierachy. This patch moves them around: - RestconfDocumentedExceptionMapper moves to restconf.nb.rfc8040.legacy - RestconfNormalizedNodeWriter moves to restconf.server.spi JIRA: NETCONF-773 Change-Id: I9b9311c3a4f22922f8c435b12f7071b1ea6b6b6b Signed-off-by: Robert Varga --- diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/JaxRsNorthbound.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/JaxRsNorthbound.java index 965204df03..c7f3d219f6 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/JaxRsNorthbound.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/JaxRsNorthbound.java @@ -23,7 +23,7 @@ import org.opendaylight.restconf.nb.jaxrs.JaxRsRestconf; import org.opendaylight.restconf.nb.jaxrs.JaxRsWebHostMetadata; import org.opendaylight.restconf.nb.jaxrs.JsonJaxRsFormattableBodyWriter; import org.opendaylight.restconf.nb.jaxrs.XmlJaxRsFormattableBodyWriter; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.errors.RestconfDocumentedExceptionMapper; +import org.opendaylight.restconf.nb.rfc8040.legacy.RestconfDocumentedExceptionMapper; import org.opendaylight.restconf.nb.rfc8040.streams.RestconfStreamServletFactory; import org.opendaylight.restconf.server.api.RestconfServer; import org.opendaylight.restconf.server.spi.DatabindProvider; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/RestconfDocumentedExceptionMapper.java similarity index 99% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/RestconfDocumentedExceptionMapper.java index e0545e3ced..cb338d33bd 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/RestconfDocumentedExceptionMapper.java @@ -5,7 +5,7 @@ * 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.errors; +package org.opendaylight.restconf.nb.rfc8040.legacy; import static java.util.Objects.requireNonNull; import static org.opendaylight.yang.svc.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev170126.YangModuleInfoImpl.qnameOf; diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalNormalizedNodeWriterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalNormalizedNodeWriterFactory.java index f2b63ca323..7d31d400d1 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalNormalizedNodeWriterFactory.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/transactions/MdsalNormalizedNodeWriterFactory.java @@ -15,7 +15,7 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.restconf.api.query.DepthParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.RestconfNormalizedNodeWriter; +import org.opendaylight.restconf.server.spi.NormalizedNodeWriter; import org.opendaylight.restconf.server.spi.NormalizedNodeWriterFactory; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; @@ -34,8 +34,8 @@ final class MdsalNormalizedNodeWriterFactory extends NormalizedNodeWriterFactory } @Override - protected RestconfNormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { - return RestconfNormalizedNodeWriter.forStreamWriter(streamWriter, depth, fields); + protected NormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { + return NormalizedNodeWriter.forStreamWriter(streamWriter, depth, fields); } @Override 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 01c3433172..925330e997 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,13 +38,13 @@ 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.RestconfNormalizedNodeWriter; import org.opendaylight.restconf.server.api.DataGetParams; import org.opendaylight.restconf.server.api.DataGetResult; import org.opendaylight.restconf.server.api.DatabindContext; import org.opendaylight.restconf.server.api.DatabindPath.Data; import org.opendaylight.restconf.server.api.ServerRequest; import org.opendaylight.restconf.server.spi.HttpGetResource; +import org.opendaylight.restconf.server.spi.NormalizedNodeWriter; import org.opendaylight.restconf.server.spi.NormalizedNodeWriterFactory; import org.opendaylight.restconf.server.spi.RpcImplementation; import org.opendaylight.restconf.server.spi.YangLibraryVersionResource; @@ -157,7 +157,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 RestconfNormalizedNodeWriter}. + * {@link NormalizedNodeWriter}. * *

* 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/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java index 0cc6e1bc6f..9bb16e19e8 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/DefaultNormalizedNodeWriterFactory.java @@ -9,7 +9,6 @@ package org.opendaylight.restconf.server.spi; import com.google.common.base.MoreObjects.ToStringHelper; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.RestconfNormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; /** @@ -24,8 +23,8 @@ final class DefaultNormalizedNodeWriterFactory extends NormalizedNodeWriterFacto } @Override - protected RestconfNormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { - return RestconfNormalizedNodeWriter.forStreamWriter(streamWriter, null); + protected NormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { + return NormalizedNodeWriter.forStreamWriter(streamWriter, null); } @Override diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java index b5cf1eff52..a39bab4b5f 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/MaxDepthNormalizedNodeWriterFactory.java @@ -12,11 +12,10 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects.ToStringHelper; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.restconf.api.query.DepthParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.RestconfNormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; /** - * A {@link NormalizedNodeWriterFactory} returning a {@link RestconfNormalizedNodeWriter} which emits the data only to + * A {@link NormalizedNodeWriterFactory} returning a {@link NormalizedNodeWriter} which emits the data only to * a certain * depth. */ @@ -29,8 +28,8 @@ final class MaxDepthNormalizedNodeWriterFactory extends NormalizedNodeWriterFact } @Override - protected RestconfNormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { - return RestconfNormalizedNodeWriter.forStreamWriter(streamWriter, depth); + protected NormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { + return NormalizedNodeWriter.forStreamWriter(streamWriter, depth); } @Override diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java index f11030bc29..64a96d19fc 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedFormattableBody.java @@ -19,7 +19,6 @@ import javax.xml.stream.XMLStreamWriter; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.restconf.api.FormattableBody; import org.opendaylight.restconf.api.query.PrettyPrintParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.RestconfNormalizedNodeWriter; import org.opendaylight.restconf.server.api.DatabindContext; import org.opendaylight.restconf.server.api.DatabindFormattableBody; import org.opendaylight.restconf.server.api.DatabindPath.Data; @@ -108,7 +107,7 @@ public abstract sealed class NormalizedFormattableBody protected abstract void formatToXML(XmlCodecFactory codecs, N data, XMLStreamWriter writer) throws IOException, XMLStreamException; - protected final RestconfNormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { + protected final NormalizedNodeWriter newWriter(final NormalizedNodeStreamWriter streamWriter) { return writerFactory.newWriter(streamWriter); } diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriter.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java similarity index 94% rename from restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriter.java rename to restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java index 09086d7598..8bd93729ee 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriter.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriter.java @@ -5,7 +5,7 @@ * 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; +package org.opendaylight.restconf.server.spi; import static java.util.Objects.requireNonNull; @@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory; */ // FIXME: this is a copy&paste from yangtools' NormalizedNodeWriter then adapted for filtering @Beta -public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable { +public sealed class NormalizedNodeWriter implements Flushable, Closeable { private static final QName ROOT_DATA_QNAME = QName.create("urn:ietf:params:xml:ns:netconf:base:1.0", "data"); final @NonNull NormalizedNodeStreamWriter writer; @@ -58,7 +58,7 @@ public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable int currentDepth = 0; - private RestconfNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, + private NormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, final List> fields) { this.writer = requireNonNull(writer); maxDepth = depth == null ? null : depth.value(); @@ -72,7 +72,7 @@ public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable * @param maxDepth Maximal depth to write * @return A new instance. */ - public static @NonNull RestconfNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, + public static @NonNull NormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, final @Nullable DepthParam maxDepth) { return forStreamWriter(writer, true, maxDepth, null); } @@ -85,7 +85,7 @@ public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable * @param fields Selected child nodes to write * @return A new instance. */ - public static @NonNull RestconfNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, + public static @NonNull NormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, final @Nullable DepthParam maxDepth, final @Nullable List> fields) { return forStreamWriter(writer, true, maxDepth, fields); } @@ -105,10 +105,10 @@ public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable * @param fields Selected child nodes to write * @return A new instance. */ - public static @NonNull RestconfNormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, + public static @NonNull NormalizedNodeWriter forStreamWriter(final NormalizedNodeStreamWriter writer, final boolean orderKeyLeaves, final DepthParam depth, final List> fields) { return orderKeyLeaves ? new OrderedRestconfNormalizedNodeWriter(writer, depth, fields) - : new RestconfNormalizedNodeWriter(writer, depth, fields); + : new NormalizedNodeWriter(writer, depth, fields); } /** @@ -119,7 +119,7 @@ public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable * @return {@code ParameterAwareNormalizedNodeWriter} * @throws IOException when thrown from the backing writer. */ - public final RestconfNormalizedNodeWriter write(final NormalizedNode node) throws IOException { + public final NormalizedNodeWriter write(final NormalizedNode node) throws IOException { if (wasProcessedAsCompositeNode(node) || wasProcessAsSimpleNode(node)) { return this; } @@ -294,7 +294,7 @@ public sealed class RestconfNormalizedNodeWriter implements Flushable, Closeable return processedAsCompositeNode; } - private static final class OrderedRestconfNormalizedNodeWriter extends RestconfNormalizedNodeWriter { + private static final class OrderedRestconfNormalizedNodeWriter extends NormalizedNodeWriter { private static final Logger LOG = LoggerFactory.getLogger(OrderedRestconfNormalizedNodeWriter.class); OrderedRestconfNormalizedNodeWriter(final NormalizedNodeStreamWriter writer, final DepthParam depth, diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java index 8a8975eba6..b323c636c6 100644 --- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java +++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/spi/NormalizedNodeWriterFactory.java @@ -12,11 +12,10 @@ import com.google.common.base.MoreObjects.ToStringHelper; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.restconf.api.query.DepthParam; -import org.opendaylight.restconf.nb.rfc8040.jersey.providers.RestconfNormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; /** - * Interface for instantiating a {@link RestconfNormalizedNodeWriter} to handle the data writeout to a + * Interface for instantiating a {@link NormalizedNodeWriter} to handle the data writeout to a * {@link NormalizedNodeStreamWriter}. */ @NonNullByDefault @@ -35,12 +34,12 @@ public abstract class NormalizedNodeWriterFactory { } /** - * Create a new {@link RestconfNormalizedNodeWriter} for specified {@link NormalizedNodeStreamWriter}. + * Create a new {@link NormalizedNodeWriter} for specified {@link NormalizedNodeStreamWriter}. * * @param streamWriter target {@link NormalizedNodeStreamWriter} - * @return A {@link RestconfNormalizedNodeWriter} + * @return A {@link NormalizedNodeWriter} */ - protected abstract RestconfNormalizedNodeWriter newWriter(NormalizedNodeStreamWriter streamWriter); + protected abstract NormalizedNodeWriter newWriter(NormalizedNodeStreamWriter streamWriter); protected abstract ToStringHelper addToStringAttributes(ToStringHelper helper); diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/legacy/RestconfDocumentedExceptionMapperTest.java similarity index 99% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/legacy/RestconfDocumentedExceptionMapperTest.java index 097d630716..f534a9cb2b 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapperTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/legacy/RestconfDocumentedExceptionMapperTest.java @@ -5,7 +5,7 @@ * 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.errors; +package org.opendaylight.restconf.nb.rfc8040.legacy; import static org.junit.Assert.assertEquals; import static org.junit.Assume.assumeTrue; diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterDepthTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterDepthTest.java similarity index 90% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterDepthTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterDepthTest.java index 5e0af2a72f..9ef7f346a0 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterDepthTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterDepthTest.java @@ -5,7 +5,7 @@ * 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; +package org.opendaylight.restconf.server.spi; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; @@ -34,7 +34,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; /** - * Unit test for {@link RestconfNormalizedNodeWriter} used with depth parameter. + * Unit test for {@link NormalizedNodeWriter} used with depth parameter. */ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class RestconfNormalizedNodeWriterDepthTest { @@ -88,7 +88,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeContainerWithoutChildrenDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(containerNodeData); @@ -104,7 +104,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeContainerWithChildrenDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(containerNodeData); @@ -123,7 +123,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeMapNodeWithoutChildrenDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(mapNodeData); @@ -144,7 +144,7 @@ public class RestconfNormalizedNodeWriterDepthTest { @Ignore @Test public void writeMapNodeWithChildrenDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(mapNodeData); @@ -170,7 +170,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeLeafSetNodeWithoutChildrenDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(leafSetNodeData); @@ -186,7 +186,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeLeafSetNodeWithChildrenDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(leafSetNodeData); @@ -204,7 +204,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeLeafSetEntryNodeDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(leafSetEntryNodeData); @@ -221,7 +221,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeMapEntryNodeUnorderedOnlyKeysDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.min(), + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.min(), null); parameterWriter.write(mapEntryNodeData); @@ -241,7 +241,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeMapEntryNodeUnorderedDepthTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.max(), + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, false, DepthParam.max(), null); parameterWriter.write(mapEntryNodeData); @@ -262,7 +262,7 @@ public class RestconfNormalizedNodeWriterDepthTest { */ @Test public void writeMapEntryNodeOrderedWithoutChildrenTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min()); parameterWriter.write(mapEntryNodeData); @@ -282,7 +282,7 @@ public class RestconfNormalizedNodeWriterDepthTest { @Ignore @Test public void writeMapEntryNodeOrderedTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.max()); parameterWriter.write(mapEntryNodeData); diff --git a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterFieldsTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterFieldsTest.java similarity index 92% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterFieldsTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterFieldsTest.java index 3edbf21e4f..0f6b3779d7 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterFieldsTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterFieldsTest.java @@ -5,7 +5,7 @@ * 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; +package org.opendaylight.restconf.server.spi; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStre import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; /** - * Unit test for {@link RestconfNormalizedNodeWriter} used with fields parameter. + * Unit test for {@link NormalizedNodeWriter} used with fields parameter. */ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class RestconfNormalizedNodeWriterFieldsTest { @@ -79,7 +79,7 @@ public class RestconfNormalizedNodeWriterFieldsTest { */ @Test public void writeContainerWithLimitedFieldsTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); parameterWriter.write(containerNodeData); @@ -95,7 +95,7 @@ public class RestconfNormalizedNodeWriterFieldsTest { */ @Test public void writeContainerAllFieldsTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter( + final var parameterWriter = NormalizedNodeWriter.forStreamWriter( writer, null, List.of(Set.of(leafSetNodeIdentifier.getNodeType()))); parameterWriter.write(containerNodeData); @@ -115,7 +115,7 @@ public class RestconfNormalizedNodeWriterFieldsTest { */ @Test public void writeMapEntryNodeWithLimitedFieldsTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null, List.of(Set.of())); parameterWriter.write(mapNodeData); @@ -132,7 +132,7 @@ public class RestconfNormalizedNodeWriterFieldsTest { */ @Test public void writeMapNodeAllFieldsTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null, + final var parameterWriter = NormalizedNodeWriter.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/RestconfNormalizedNodeWriterParametersTest.java b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterParametersTest.java similarity index 92% rename from restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterParametersTest.java rename to restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterParametersTest.java index d38bcca4c3..44484640ac 100644 --- a/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/RestconfNormalizedNodeWriterParametersTest.java +++ b/restconf/restconf-nb/src/test/java/org/opendaylight/restconf/server/spi/RestconfNormalizedNodeWriterParametersTest.java @@ -5,7 +5,7 @@ * 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; +package org.opendaylight.restconf.server.spi; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.times; @@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** - * Unit test for {@link RestconfNormalizedNodeWriter} used with all parameters. + * Unit test for {@link NormalizedNodeWriter} used with all parameters. */ @RunWith(MockitoJUnitRunner.StrictStubs.class) public class RestconfNormalizedNodeWriterParametersTest { @@ -70,7 +70,7 @@ public class RestconfNormalizedNodeWriterParametersTest { */ @Test public void writeContainerParameterPrioritiesTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, DepthParam.min(), + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, DepthParam.min(), List.of( Set.of(leafSetNodeIdentifier.getNodeType()), Set.of(leafSetEntryNodeIdentifier.getNodeType()))); @@ -92,7 +92,7 @@ public class RestconfNormalizedNodeWriterParametersTest { */ @Test public void writeRootDataTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null); parameterWriter.write(rootDataContainerData); @@ -106,7 +106,7 @@ public class RestconfNormalizedNodeWriterParametersTest { @Test public void writeEmptyRootContainerTest() throws Exception { - final var parameterWriter = RestconfNormalizedNodeWriter.forStreamWriter(writer, null); + final var parameterWriter = NormalizedNodeWriter.forStreamWriter(writer, null); parameterWriter.write(ImmutableNodes.newContainerBuilder() .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME))