Revert "code improvements"

This reverts commit 2dffcda.

Author: sureshanaparti

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

@@ -186,4 +186,9 @@ private String getCpuMemoryOvercommitRatio(String name) {
 
         return name;
     }
+
+    @Override
+    public boolean doesConfigKeyAndValueExist(String key, String value) {
+        return doesKeyValuePairExist(key, value);
+    }
 }

engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDetailsDaoImpl.java

@@ -67,4 +67,9 @@ public void persist(long zoneId, String name, String value) {
         persist(vo);
         txn.commit();
     }
+
+    @Override
+    public boolean doesConfigKeyAndValueExist(String key, String value) {
+        return doesKeyValuePairExist(key, value);
+    }
 }

engine/schema/src/main/java/com/cloud/domain/dao/DomainDetailsDaoImpl.java

@@ -132,4 +132,9 @@ public String getConfigValue(long id, String key) {
         }
         return vo == null ? null : getActualValue(vo);
     }
+
+    @Override
+    public boolean doesConfigKeyAndValueExist(String key, String value) {
+        return doesKeyValuePairExist(key, value);
+    }
 }

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

@@ -57,4 +57,9 @@ public void addDetail(long resourceId, String key, String value, boolean display
         }
         super.addDetail(new StoragePoolDetailVO(resourceId, key, value, display));
     }
+
+    @Override
+    public boolean doesConfigKeyAndValueExist(String key, String value) {
+        return doesKeyValuePairExist(key, value);
+    }
 }

engine/schema/src/main/java/com/cloud/user/AccountDetailsDaoImpl.java

@@ -156,4 +156,9 @@ public String getConfigValue(long id, String key) {
         }
         return value;
     }
+
+    @Override
+    public boolean doesConfigKeyAndValueExist(String key, String value) {
+        return doesKeyValuePairExist(key, value);
+    }
 }

engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDao.java

@@ -103,4 +103,6 @@ public interface ResourceDetailsDao<R extends ResourceDetail> extends GenericDao
     long batchExpungeForResources(List<Long> ids, Long batchSize);
 
     String getActualValue(ResourceDetail resourceDetail);
+
+    boolean doesKeyValuePairExist(String key, String value);
 }

engine/schema/src/main/java/org/apache/cloudstack/resourcedetail/ResourceDetailsDaoBase.java

@@ -247,6 +247,7 @@ public String getActualValue(ResourceDetail resourceDetail) {
         return resourceDetail.getValue();
     }
 
+    @Override
     public boolean doesKeyValuePairExist(String key, String value) {
         List<R> details = findDetails(key, value, null);
         return CollectionUtils.isNotEmpty(details);

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDetailsDaoImpl.java

@@ -119,4 +119,9 @@ public String getConfigValue(long id, ConfigKey<?> key) {
     public void addDetail(long resourceId, String key, String value, boolean display) {
         super.addDetail(new ImageStoreDetailVO(resourceId, key, value, display));
     }
+
+    @Override
+    public boolean doesConfigKeyAndValueExist(String key, String value) {
+        return doesKeyValuePairExist(key, value);
+    }
 }

framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java

@@ -303,7 +303,7 @@ protected T valueOf(String value) {
 
     public boolean hasValueInScope(String value) {
         if (value != null && s_depot != null) {
-            return s_depot.doesConfigKeyAndValueExistInScope(_name, value, _scope);
+            return s_depot.doesConfigKeyAndValueExistsInScope(_name, value, _scope);
         }
         return false;
     }

framework/config/src/main/java/org/apache/cloudstack/framework/config/ScopedConfigStorage.java

@@ -32,9 +32,5 @@ default String getConfigValue(long id, ConfigKey<?> key) {
         return getConfigValue(id, key.key());
     }
 
-    boolean doesKeyValuePairExist(String key, String value);
-
-    default boolean doesConfigKeyAndValueExist(String key, String value) {
-        return doesKeyValuePairExist(key, value);
-    }
+    boolean doesConfigKeyAndValueExist(String key, String value);
 }