refactor

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java

@@ -84,6 +84,29 @@ public GuestOSHypervisorDaoImpl() {
         hypervisorTypeAndVersionSearch.done();
     }
 
+    private GuestOSHypervisorVO getMappingForHypervisorVersionOrParentVersionIfNeeded(GuestOSHypervisorVO mapping,
+       String hypervisorType, String hypervisorVersion, Long guestOsId, String guestOsName) {
+        if (mapping != null || !Hypervisor.HypervisorType.VMware.toString().equals(hypervisorType)) {
+            return mapping;
+        }
+        String guestOs = guestOsId != null ? String.format("guest OS ID: %d", guestOsId) : String.format("guest OS ID: %s", guestOsName);
+        String parentVersion = CloudStackVersion.getVMwareParentVersion(hypervisorVersion);
+        if (parentVersion == null) {
+            if (s_logger.isDebugEnabled()) {
+                s_logger.info(String.format("Mapping for %s for hypervisor: %s with version: %s can not be found. Parent version is also null",
+                        guestOs, hypervisorType, hypervisorVersion));
+            }
+            return null;
+        }
+        if (s_logger.isDebugEnabled()) {
+            s_logger.debug(String.format("Mapping for %s for hypervisor: %s with version: %s can not be found. " +
+                    "Trying to find one for the parent version: %s", guestOs, hypervisorType, hypervisorVersion, parentVersion));
+        }
+        return guestOsId != null ?
+                findByOsIdAndHypervisorInternal(guestOsId, hypervisorType, parentVersion):
+                findByOsNameAndHypervisorInternal(guestOsName, hypervisorType, parentVersion);
+    }
+
     @Override
     public List<GuestOSHypervisorVO> listByGuestOsId(long guestOsId) {
         SearchCriteria<GuestOSHypervisorVO> sc = guestOsSearch.create();
@@ -106,16 +129,7 @@ private GuestOSHypervisorVO findByOsIdAndHypervisorInternal(long guestOsId, Stri
     @Override
     public GuestOSHypervisorVO findByOsIdAndHypervisor(long guestOsId, String hypervisorType, String hypervisorVersion) {
         GuestOSHypervisorVO mapping = findByOsIdAndHypervisorInternal(guestOsId, hypervisorType, hypervisorVersion);
-        if (mapping != null || !Hypervisor.HypervisorType.VMware.toString().equals(hypervisorType)) {
-            return mapping;
-        }
-        String parentVersion = CloudStackVersion.getVMwareParentVersion(hypervisorVersion);
-        if (parentVersion == null) {
-            return null;
-        }
-        s_logger.info(String.format("Mapping for guest OS ID: %d for hypervisor: %s with version: %s can not be found. " +
-                "Trying to find one for the parent version: %s", guestOsId, hypervisorType, hypervisorVersion, parentVersion));
-        return findByOsIdAndHypervisorInternal(guestOsId, hypervisorType, parentVersion);
+        return getMappingForHypervisorVersionOrParentVersionIfNeeded(mapping, hypervisorType, hypervisorVersion, guestOsId, null);
     }
 
     @Override
@@ -158,16 +172,7 @@ private GuestOSHypervisorVO findByOsNameAndHypervisorInternal(String guestOsName
     @Override
     public GuestOSHypervisorVO findByOsNameAndHypervisor(String guestOsName, String hypervisorType, String hypervisorVersion) {
         GuestOSHypervisorVO mapping = findByOsNameAndHypervisorInternal(guestOsName, hypervisorType, hypervisorVersion);
-        if (mapping != null || !Hypervisor.HypervisorType.VMware.toString().equals(hypervisorType)) {
-            return mapping;
-        }
-        String parentVersion = CloudStackVersion.getVMwareParentVersion(hypervisorVersion);
-        if (parentVersion == null) {
-            return null;
-        }
-        s_logger.info(String.format("Mapping for guest OS: %s for hypervisor: %s with version: %s can not be found. " +
-                "Trying to find one for the parent version: %s", guestOsName, hypervisorType, hypervisorVersion, parentVersion));
-        return findByOsNameAndHypervisorInternal(guestOsName, hypervisorType, parentVersion);
+        return getMappingForHypervisorVersionOrParentVersionIfNeeded(mapping, hypervisorType, hypervisorVersion, null, guestOsName);
     }
 
     @Override