X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mapper%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fmapper%2Futil%2FMOMetaDataUtil.java;h=a038468fb4cbc0e9e688e573b29ef279bbcdfcdf;hb=refs%2Fchanges%2F34%2F4334%2F1;hp=e2711c71cec5537ef95bb2e271764c5254cf8318;hpb=a58ada8fd244e69cf2ebe48a251fcdd4d48acec4;p=oam%2Ftr069-adapter.git

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