X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fcommon%2Fdeviceversion%2FDeviceVersionManagerImpl.java;h=2fdcbffa3c3213c49995d40af8b290f234c03eb1;hb=bfb65ab24d6ce7db221c5f52689a8efd8873fb1a;hp=0c712c56389ce7092d639dc354ebc3fae0e71231;hpb=76744e810f35c84ecbd1d9998e361052466e9483;p=oam%2Ftr069-adapter.git

diff --git a/common/src/main/java/org/commscope/tr069adapter/common/deviceversion/DeviceVersionManagerImpl.java b/common/src/main/java/org/commscope/tr069adapter/common/deviceversion/DeviceVersionManagerImpl.java
index 0c712c5..2fdcbff 100644
--- a/common/src/main/java/org/commscope/tr069adapter/common/deviceversion/DeviceVersionManagerImpl.java
+++ b/common/src/main/java/org/commscope/tr069adapter/common/deviceversion/DeviceVersionManagerImpl.java
@@ -132,13 +132,8 @@ public class DeviceVersionManagerImpl implements DeviceVersionManager {
           if (deviceVersion.getSwVersion().equalsIgnoreCase(profileVersion.getSwVersion())
               || deviceVersion.getSwVersion().matches(profileVersion.getSwVersion())) {
             if (profileVersion.isHwRegex()) {
-              if (deviceVersion.getHwVersion() != null) {
-
-                if ("*".equalsIgnoreCase(profileVersion.getHwVersion())
-                    || deviceVersion.getHwVersion().equalsIgnoreCase(profileVersion.getHwVersion())
-                    || deviceVersion.getHwVersion().matches(profileVersion.getHwVersion())) {
+              if (deviceVersion.getHwVersion() != null && hwVersionCheck(deviceVersion, profileVersion)) {
                   return entry.getValue();
-                }
               }
             } else {
               // Check Strict match of Hardware
@@ -148,17 +143,11 @@ public class DeviceVersionManagerImpl implements DeviceVersionManager {
               }
             }
           }
-        } else if (profileVersion.isHwRegex()) {
-          if (deviceVersion.getHwVersion() != null) {
-            if ("*".equalsIgnoreCase(profileVersion.getHwVersion())
-                || deviceVersion.getHwVersion().equalsIgnoreCase(profileVersion.getHwVersion())
-                || deviceVersion.getHwVersion().matches(profileVersion.getHwVersion())) {
+        } else if (profileVersion.isHwRegex() && (deviceVersion.getHwVersion() != null && hwVersionCheck(deviceVersion, profileVersion)) ) {
               // Add all software version which matching
               if (profileVersion.getSwVersion()
                   .compareToIgnoreCase(deviceVersion.getSwVersion()) <= 0) {
                 mSoftwareList.add(profileVersion);
-              }
-            }
           }
         }
       } else {
@@ -181,4 +170,10 @@ public class DeviceVersionManagerImpl implements DeviceVersionManager {
 
     return null;
   }
+
+  private boolean hwVersionCheck(DeviceVersion deviceVersion, DeviceVersion profileVersion) {
+    return "*".equalsIgnoreCase(profileVersion.getHwVersion()) || deviceVersion.getHwVersion()
+        .equalsIgnoreCase(profileVersion.getHwVersion()) || deviceVersion.getHwVersion()
+        .matches(profileVersion.getHwVersion());
+  }
 }