netconf response preparing for 2sector

2nd sector netconf response taabluar index issue fixed

Issue-Id: OAM-137
Change-Id: I0ea5d04fd2a31710e29e89c66478703940039e59
Signed-off-by: cschowdam <chandrasekhar.chowdam@commscope.com>

diff --git a/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/NetconfToTr069MapperUtil.java b/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/NetconfToTr069MapperUtil.java
index 4f5f9cf..81245d0 100644 (file)
--- a/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/NetconfToTr069MapperUtil.java
+++ b/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/NetconfToTr069MapperUtil.java
@@ -301,7 +301,7 @@ public class NetconfToTr069MapperUtil {
   private String getNetconfResponseXML(List<ParameterDTO> parameters, String swVersion,\r
       String hwVersion, boolean isCustomparameter) {\r
     if (null == parameters || parameters.isEmpty()) {\r
-\r
+      // LOG.debug("There are no parameters found in the response.");\r
       return null;\r
     }\r
     Collections.sort(parameters, new SortByParamterName());\r
@@ -309,8 +309,6 @@ public class NetconfToTr069MapperUtil {
     String result = null;\r
     try {\r
       DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();\r
-      docFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");\r
-      docFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");\r
       DocumentBuilder docBuilder = docFactory.newDocumentBuilder();\r
       Document doc = docBuilder.newDocument();\r
 \r
@@ -325,7 +323,6 @@ public class NetconfToTr069MapperUtil {
         }\r
         String paramValue = paramDto.getParamValue();\r
         if (paramValue == null || paramValue.trim().isEmpty()) {\r
-          logger.debug("Values is empty so skipping this parameter.");\r
           continue;\r
         }\r
         StringTokenizer tokenizer = new StringTokenizer(paramName, ".");\r
@@ -343,17 +340,14 @@ public class NetconfToTr069MapperUtil {
             if (null == dataNode) {\r
               dataNode = parentNode;\r
             }\r
-\r
+            continue;\r
           } else if (nodeName.matches(INDEX_REGEX)) { // construct\r
                                                       // tabular and\r
                                                       // index nodes\r
 \r
             // get parent tabular node from parent MAP\r
-            StringBuilder bld = new StringBuilder(parentNodeKey);\r
-            bld.append(".");\r
-            bld.append(nodeName);\r
-            parentNodeKey = bld.toString();\r
-            Element node = parentNodeMap.computeIfPresent(parentNodeKey, (k, v) -> v);\r
+            parentNodeKey = parentNodeKey + "." + nodeName;\r
+            Element node = parentNodeMap.get(parentNodeKey);\r
 \r
             // create a tabular parent node if doesn't exit in MAP\r
             if (null == node) {\r
@@ -389,10 +383,7 @@ public class NetconfToTr069MapperUtil {
                                                             // attribute\r
                                                             // is\r
                                                             // found\r
-            StringBuilder bld = new StringBuilder(parentNodeName);\r
-            bld.append(".");\r
-            bld.append(nodeName);\r
-            parentNodeKey = bld.toString();\r
+            parentNodeKey = parentNodeKey + "." + nodeName;\r
             parentNodeName = nodeName;\r
           } else {\r
             // construct intermediate nodes\r
@@ -414,10 +405,7 @@ public class NetconfToTr069MapperUtil {
                 parentNode.appendChild(node);\r
 \r
             }\r
-            StringBuilder bld = new StringBuilder(parentNodeKey);\r
-            bld.append(".");\r
-            bld.append(nodeName);\r
-            parentNodeKey = bld.toString();\r
+            parentNodeKey = parentNodeKey + "." + nodeName;\r
             parentNodeName = nodeName;\r
             parentNode = node;\r
           }\r
@@ -425,15 +413,15 @@ public class NetconfToTr069MapperUtil {
         // construct leaf node\r
         Element leafNode = doc.createElement(parentNodeName);\r
         leafNode.setTextContent(paramValue);\r
-        if (null != parentNode)\r
+        if (parentNode != null)\r
           parentNode.appendChild(leafNode);\r
       }\r
 \r
       if (null != dataNode) {\r
-        result = NetconfToTr069MapperUtil.convertDocumentToString(dataNode);\r
+        result = convertDocumentToString(dataNode);\r
       }\r
     } catch (ParserConfigurationException pce) {\r
-      logger.error("Exception : {}", pce.getMessage());\r
+      logger.error("Response xml formatting is failed : {} ", pce.toString());\r
     }\r
 \r
     return result;\r