VES Heartbeat and Software Management Feature

[oam/tr069-adapter.git] / mapper / src / main / java / org / commscope / tr069adapter / mapper / util / MOMetaDataUtil.java

diff --git a/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/MOMetaDataUtil.java b/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/MOMetaDataUtil.java
index e2711c7..a038468 100644 (file)
--- a/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/MOMetaDataUtil.java
+++ b/mapper/src/main/java/org/commscope/tr069adapter/mapper/util/MOMetaDataUtil.java
@@ -49,7 +49,6 @@ public class MOMetaDataUtil {
   private Map<String, MOMetaData> metaDataMap;\r
   private Map<String, String> metaDataReverseMap;\r
   public static final String ORAN_SW_MGMT_URI = "urn:o-ran:software-management:1.0";\r
-  private static HashMap<String, String> nameSpaces = new HashMap<>();\r
 \r
   @PostConstruct\r
   public void loadMetaData() {\r
@@ -79,47 +78,58 @@ public class MOMetaDataUtil {
           continue;\r
         }\r
         if (line != null && line.split(",").length >= 3) {\r
-          String[] split = line.split(",");\r
-          boolean isReadOnly = false;\r
-          boolean isTabluar = false;\r
-          boolean isTabObject = false;\r
-          String dataType = "";\r
-\r
-          if (split[2].contains("-")) {\r
-            String[] dataAttr = split[2].split("-");\r
-            if ("Tabular".equalsIgnoreCase(dataAttr[0]))\r
-              isTabluar = true;\r
-            if ("ReadOnly".equalsIgnoreCase(dataAttr[1]))\r
-              isReadOnly = true;\r
-          } else if ("TabularObject".equalsIgnoreCase(split[2])) {\r
-            isTabObject = true;\r
-          }\r
-          if (split.length > 3) {\r
-            dataType = split[3];\r
-          }\r
-          if (isTabObject) {\r
-            String logMessage = split[1].substring(0, split[1].length() - 5);\r
-            LOG.info("Adding Parent Objects {}", logMessage);\r
-            String substring = split[0].substring(0, split[0].length() - 4);\r
-            MOMetaData metaTabData =\r
-                new MOMetaData(substring, dataType, isReadOnly, isTabluar, isTabObject);\r
-            if ((split.length > 4 && split[4] != null) && split[4].trim().length() > 0) {\r
-              metaTabData.setURI(split[4]);\r
-            }\r
-            metaDataMap.put(logMessage, metaTabData);\r
-          }\r
-          MOMetaData metaData =\r
-              new MOMetaData(split[0], dataType, isReadOnly, isTabluar, isTabObject);\r
-          if ((split.length > 4 && split[4] != null) && split[4].trim().length() > 0) {\r
-            metaData.setURI(split[4]);\r
-          }\r
-          metaDataMap.put(split[1], metaData);\r
-          metaDataReverseMap.put(split[0], split[1]);\r
+\r
+          parseMetaDataLine(line, metaDataMap, metaDataReverseMap);\r
+\r
         }\r
       }\r
     }\r
   }\r
 \r
+  private static void parseMetaDataLine(String line, Map<String, MOMetaData> metaDataMap,\r
+      Map<String, String> metaDataReverseMap) {\r
+    String[] split = line.split(",");\r
+    boolean isReadOnly = false;\r
+    boolean isTabluar = false;\r
+    boolean isTabObject = false;\r
+    if (split[2].contains("-")) {\r
+      String[] dataAttr = split[2].split("-");\r
+      if ("Tabular".equalsIgnoreCase(dataAttr[0]))\r
+        isTabluar = true;\r
+      if ("ReadOnly".equalsIgnoreCase(dataAttr[1]))\r
+        isReadOnly = true;\r
+    } else if ("TabularObject".equalsIgnoreCase(split[2])) {\r
+      isTabObject = true;\r
+    }\r
+    prepareMOMetaData(isReadOnly, isTabluar, split, isTabObject, metaDataMap, metaDataReverseMap);\r
+  }\r
+\r
+  private static void prepareMOMetaData(boolean isReadOnly, boolean isTabluar, String[] split,\r
+      boolean isTabObject, Map<String, MOMetaData> metaDataMap,\r
+      Map<String, String> metaDataReverseMap) {\r
+    String dataType = "";\r
+    if (split.length > 3) {\r
+      dataType = split[3];\r
+    }\r
+    if (isTabObject) {\r
+      String logMessage = split[1].substring(0, split[1].length() - 5);\r
+      LOG.info("Adding Parent Objects {}", logMessage);\r
+      String substring = split[0].substring(0, split[0].length() - 4);\r
+      MOMetaData metaTabData =\r
+          new MOMetaData(substring, dataType, isReadOnly, isTabluar, isTabObject);\r
+      if ((split.length > 4 && split[4] != null) && split[4].trim().length() > 0) {\r
+        metaTabData.setURI(split[4]);\r
+      }\r
+      metaDataMap.put(logMessage, metaTabData);\r
+    }\r
+    MOMetaData metaData = new MOMetaData(split[0], dataType, isReadOnly, isTabluar, isTabObject);\r
+    if ((split.length > 4 && split[4] != null) && split[4].trim().length() > 0) {\r
+      metaData.setURI(split[4]);\r
+    }\r
+    metaDataMap.put(split[1], metaData);\r
+    metaDataReverseMap.put(split[0], split[1]);\r
+  }\r
+\r
   public MOMetaData getMetaDataByNetConfName(String moName) {\r
     String moNameInGnrForm = moName.replaceAll(INDEX_REGEX, STRING_I);\r
     return metaDataMap.get(moNameInGnrForm);\r
@@ -147,10 +157,6 @@ public class MOMetaDataUtil {
     return metaDataMap.keySet();\r
   }\r
 \r
-  public String getNameSpace(String nodeName) {\r
-    return nameSpaces.get(nodeName);\r
-  }\r
-\r
   public List<ParameterDTO> getSupportedChildParameters(List<ParameterDTO> parameters) {\r
     List<ParameterDTO> result = new ArrayList<>();\r
     Set<MOMetaData> allMatchedChilds = new HashSet<>();\r