code refactor

Author: ravening

engine/schema/src/main/java/com/cloud/dc/ClusterDetailsDaoImpl.java

@@ -35,6 +35,11 @@ public class ClusterDetailsDaoImpl extends GenericDaoBase<ClusterDetailsVO, Long
     protected final SearchBuilder<ClusterDetailsVO> ClusterSearch;
     protected final SearchBuilder<ClusterDetailsVO> DetailSearch;
 
+    private final String CPU_OVERPROVISIONING_FACTOR = "cpu.overprovisioning.factor";
+    private final String MEMORY_OVERPROVISIONING_FACTOR = "mem.overprovisioning.factor";
+    private final String CPU_OVERCOMMIT_RATIO = "cpuOvercommitRatio";
+    private final String MEMORY_OVERCOMMIT_RATIO = "memoryOvercommitRatio";
+
     protected ClusterDetailsDaoImpl() {
         ClusterSearch = createSearchBuilder();
         ClusterSearch.and("clusterId", ClusterSearch.entity().getClusterId(), SearchCriteria.Op.EQ);
@@ -50,12 +55,7 @@ protected ClusterDetailsDaoImpl() {
     public ClusterDetailsVO findDetail(long clusterId, String name) {
         SearchCriteria<ClusterDetailsVO> sc = DetailSearch.create();
         // This is temporary fix to support list/update configuration api for cpu and memory overprovisioning ratios
-        if (name.equalsIgnoreCase("cpu.overprovisioning.factor")) {
-            name = "cpuOvercommitRatio";
-        }
-        if (name.equalsIgnoreCase("mem.overprovisioning.factor")) {
-            name = "memoryOvercommitRatio";
-        }
+        name = getCpuMemoryOvercommitRatio(name);
         sc.setParameters("clusterId", clusterId);
         sc.setParameters("name", name);
 
@@ -104,12 +104,7 @@ public void persist(long clusterId, Map<String, String> details) {
 
         for (Map.Entry<String, String> detail : details.entrySet()) {
             String name = detail.getKey();
-            if (name.equalsIgnoreCase("cpu.overprovisioning.factor")) {
-                name = "cpuOvercommitRatio";
-            }
-            if (name.equalsIgnoreCase("mem.overprovisioning.factor")) {
-                name = "memoryOvercommitRatio";
-            }
+            name = getCpuMemoryOvercommitRatio(name);
             String value = detail.getValue();
             if ("password".equals(detail.getKey())) {
                 value = DBEncryptionUtil.encrypt(value);
@@ -122,12 +117,7 @@ public void persist(long clusterId, Map<String, String> details) {
 
     @Override
     public void persist(long clusterId, String name, String value) {
-        if (name.equalsIgnoreCase("cpu.overprovisioning.factor")) {
-            name = "cpuOvercommitRatio";
-        }
-        if (name.equalsIgnoreCase("mem.overprovisioning.factor")) {
-            name = "memoryOvercommitRatio";
-        }
+        name = getCpuMemoryOvercommitRatio(name);
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         txn.start();
         SearchCriteria<ClusterDetailsVO> sc = DetailSearch.create();
@@ -160,4 +150,15 @@ public String getVmwareDcName(Long clusterId) {
             dcName = tokens[3];
         return dcName;
     }
+
+    private String getCpuMemoryOvercommitRatio(String name) {
+        if (name.equalsIgnoreCase(CPU_OVERPROVISIONING_FACTOR)) {
+            name = CPU_OVERCOMMIT_RATIO;
+        }
+        if (name.equalsIgnoreCase(MEMORY_OVERPROVISIONING_FACTOR)) {
+            name = MEMORY_OVERCOMMIT_RATIO;
+        }
+
+        return name;
+    }
 }