Hide AbstractGet

This is an implementation detail, do not expose it outside the package.

Change-Id: Ia910a8cfe0f995cef38ccff382257275b61ab626
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java
index c323069e12b3dee5ca98e74264240a40cdb534af..c3bc2765c9c3900b30ac82dc3d53d83226c892cb 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java
@@ -38,7 +38,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 // FIXME: seal when we have JDK17+
-public abstract class AbstractGet extends AbstractSingletonNetconfOperation {
+abstract class AbstractGet extends AbstractSingletonNetconfOperation {
     private static final XMLOutputFactory XML_OUTPUT_FACTORY;
     private static final String FILTER = "filter";
 
@@ -47,21 +47,18 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation {
         XML_OUTPUT_FACTORY.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true);
     }
 
-    // FIXME: hide this field
-    protected final CurrentSchemaContext schemaContext;
+    private final CurrentSchemaContext schemaContext;
     private final FilterContentValidator validator;
 
-    // FIXME: package-private
-    protected AbstractGet(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext) {
+    AbstractGet(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext) {
         super(netconfSessionIdForReporting);
         this.schemaContext = schemaContext;
         validator = new FilterContentValidator(schemaContext);
     }
 
-    // FIXME: hide this method
     // FIXME: throw a DocumentedException
-    protected Node transformNormalizedNode(final Document document, final NormalizedNode data,
-                                           final YangInstanceIdentifier dataRoot) {
+    private Node transformNormalizedNode(final Document document, final NormalizedNode data,
+                                         final YangInstanceIdentifier dataRoot) {
         final DOMResult result = new DOMResult(document.createElement(XmlNetconfConstants.DATA_KEY));
         final XMLStreamWriter xmlWriter = getXmlStreamWriter(result);
         final EffectiveModelContext currentContext = schemaContext.getCurrentContext();
@@ -111,8 +108,8 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation {
         }
     }
 
-    protected Element serializeNodeWithParentStructure(final Document document, final YangInstanceIdentifier dataRoot,
-                                                       final NormalizedNode node) {
+    final Element serializeNodeWithParentStructure(final Document document, final YangInstanceIdentifier dataRoot,
+                                                   final NormalizedNode node) {
         return (Element) transformNormalizedNode(document, node, dataRoot);
     }
 
@@ -125,7 +122,7 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation {
      *      container in the response. If filter is not present we want to read the entire datastore - return ROOT.
      * @throws DocumentedException if not possible to get identifier from filter
      */
-    protected Optional<YangInstanceIdentifier> getDataRootFromFilter(final XmlElement operationElement)
+    final Optional<YangInstanceIdentifier> getDataRootFromFilter(final XmlElement operationElement)
             throws DocumentedException {
         final Optional<XmlElement> filterElement = operationElement.getOnlyChildElementOptionally(FILTER);
         if (filterElement.isPresent()) {
@@ -139,7 +136,7 @@ public abstract class AbstractGet extends AbstractSingletonNetconfOperation {
     }
 
     @VisibleForTesting
-    protected YangInstanceIdentifier getInstanceIdentifierFromFilter(final XmlElement filterElement)
+    protected final YangInstanceIdentifier getInstanceIdentifierFromFilter(final XmlElement filterElement)
             throws DocumentedException {
 
         if (filterElement.getChildElements().size() != 1) {

diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java
index b01c561b5b3c7fcf117db51fc22bd1371b8c61e3..656bb0580e3321066b022fbc9c323924b522822d 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java
+++ b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/get/Netconf538Test.java
@@ -25,7 +25,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -40,10 +39,8 @@ public class Netconf538Test {
     private TransactionProvider transactionProvider;
 
     @Test
-    public void transformNormalizedNodeTest_mapNodeTest() throws Exception {
-
-        final SchemaContext context = YangParserTestUtils.parseYangResources(Netconf538Test.class,
-                "/yang/simple-list.yang");
+    public void testRootMap() throws Exception {
+        final var context = YangParserTestUtils.parseYangResources(Netconf538Test.class, "/yang/simple-list.yang");
         final CurrentSchemaContext currentContext = mock(CurrentSchemaContext.class);
         doReturn(context).when(currentContext).getCurrentContext();
 
@@ -62,7 +59,7 @@ public class Netconf538Test {
                 .build())
             .build();
 
-        final Node node = getConfig.transformNormalizedNode(document, data, YangInstanceIdentifier.of(BASE));
+        final Node node = getConfig.serializeNodeWithParentStructure(document, YangInstanceIdentifier.of(BASE), data);
 
         assertNotNull(node);
         Node nodeUser = node.getFirstChild();