Code Review / sdc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Rename packages from openecomp to onap.
[sdc.git] / common / onap-common-configuration-management / onap-configuration-management-core / src / main / java / org / onap / config / impl / ConfigurationImpl.java
diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
similarity index 89%
rename from common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationImpl.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
index 26e8f8e..43b1b96 100644 (file)
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/impl/ConfigurationImpl.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
@@ -1,24 +1,15 @@
-package org.openecomp.config.impl;
+package org.onap.config.impl;
 
-import static org.openecomp.config.ConfigurationUtils.getConfigurationRepositoryKey;
-import static org.openecomp.config.ConfigurationUtils.getProperty;
-import static org.openecomp.config.ConfigurationUtils.isExternalLookup;
-import static org.openecomp.config.ConfigurationUtils.isWrapperClass;
-import static org.openecomp.config.ConfigurationUtils.isZeroLengthArray;
-
-import static org.openecomp.config.Constants.DB_NAMESPACE;
-import static org.openecomp.config.Constants.DEFAULT_NAMESPACE;
-import static org.openecomp.config.Constants.DEFAULT_TENANT;
-import static org.openecomp.config.Constants.KEY_ELEMENTS_DELEMETER;
+import static org.onap.config.ConfigurationUtils.getConfigurationRepositoryKey;
 
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.DatabaseConfiguration;
-import org.openecomp.config.ConfigurationUtils;
-import org.openecomp.config.Constants;
-import org.openecomp.config.NonConfigResource;
-import org.openecomp.config.api.Config;
-import org.openecomp.config.api.ConfigurationChangeListener;
-import org.openecomp.config.api.Hint;
+import org.onap.config.ConfigurationUtils;
+import org.onap.config.Constants;
+import org.onap.config.NonConfigResource;
+import org.onap.config.api.Config;
+import org.onap.config.api.ConfigurationChangeListener;
+import org.onap.config.api.Hint;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -38,7 +29,7 @@ import java.util.function.Predicate;
 /**
  * The type Configuration.
  */
-public class ConfigurationImpl implements org.openecomp.config.api.Configuration {
+public class ConfigurationImpl implements org.onap.config.api.Configuration {
 
   private static ThreadLocal<String> tenant = new ThreadLocal<String>() {
     protected String initialValue() {
@@ -67,7 +58,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
     Predicate<URL> predicate = ConfigurationUtils::isConfig;
     for (URL url : classpathResources) {
       if (predicate.test(url)) {
-        String moduleName = getConfigurationRepositoryKey(url);
+        String moduleName = ConfigurationUtils.getConfigurationRepositoryKey(url);
         AggregateConfiguration moduleConfig = moduleConfigStore.get(moduleName);
         if (moduleConfig == null) {
           moduleConfig = new AggregateConfiguration();
@@ -85,7 +76,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
       Predicate<File> filePredicate = ConfigurationUtils::isConfig;
       for (File file : filesystemResources) {
         if (filePredicate.test(file)) {
-          String moduleName = getConfigurationRepositoryKey(file);
+          String moduleName = ConfigurationUtils.getConfigurationRepositoryKey(file);
           AggregateConfiguration moduleConfig = moduleConfigStore.get(moduleName);
           if (moduleConfig == null) {
             moduleConfig = new AggregateConfiguration();
@@ -108,7 +99,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
           String moduleName = ConfigurationUtils.getNamespace(file);
           for (File tenanatFileRoot : tenantsRoot) {
             if (file.getAbsolutePath().startsWith(tenanatFileRoot.getAbsolutePath())) {
-              moduleName = getConfigurationRepositoryKey(
+              moduleName = ConfigurationUtils.getConfigurationRepositoryKey(
                   (tenanatFileRoot.getName().toUpperCase() + Constants.TENANT_NAMESPACE_SAPERATOR
                       + moduleName).split(Constants.TENANT_NAMESPACE_SAPERATOR));
             }
@@ -132,7 +123,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
       for (File file : filesystemResources) {
         if (filePredicate.test(file)) {
           ConfigurationRepository.lookup().populateOverrideConfigurtaion(
-              getConfigurationRepositoryKey(ConfigurationUtils.getNamespace(file)
+              ConfigurationUtils.getConfigurationRepositoryKey(ConfigurationUtils.getNamespace(file)
                   .split(Constants.TENANT_NAMESPACE_SAPERATOR)), file);
         }
       }
@@ -233,21 +224,21 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
         clazz.isPrimitive() ? getWrapperClass(clazz) : clazz,
         hints == null || hints.length == 0 ? new Hint[]{Hint.EXTERNAL_LOOKUP, Hint.NODE_SPECIFIC}
             : hints);
-    if ((returnValue == null || isZeroLengthArray(clazz, returnValue))
+    if ((returnValue == null || ConfigurationUtils.isZeroLengthArray(clazz, returnValue))
         && !Constants.DEFAULT_TENANT.equals(tenant)) {
       returnValue = (T) getInternal(Constants.DEFAULT_TENANT, namespace, key,
           clazz.isPrimitive() ? getWrapperClass(clazz) : clazz,
           hints == null || hints.length == 0 ? new Hint[]{Hint.EXTERNAL_LOOKUP, Hint.NODE_SPECIFIC}
               : hints);
     }
-    if ((returnValue == null || isZeroLengthArray(clazz, returnValue))
+    if ((returnValue == null || ConfigurationUtils.isZeroLengthArray(clazz, returnValue))
         && !Constants.DEFAULT_NAMESPACE.equals(namespace)) {
       returnValue = (T) getInternal(tenant, Constants.DEFAULT_NAMESPACE, key,
           clazz.isPrimitive() ? getWrapperClass(clazz) : clazz,
           hints == null || hints.length == 0 ? new Hint[]{Hint.EXTERNAL_LOOKUP, Hint.NODE_SPECIFIC}
               : hints);
     }
-    if ((returnValue == null ||isZeroLengthArray(clazz, returnValue))
+    if ((returnValue == null || ConfigurationUtils.isZeroLengthArray(clazz, returnValue))
         && !Constants.DEFAULT_NAMESPACE.equals(namespace)
         && !Constants.DEFAULT_TENANT.equals(tenant)) {
       returnValue = (T) getInternal(Constants.DEFAULT_TENANT, Constants.DEFAULT_NAMESPACE, key,
@@ -305,9 +296,10 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
       clazz = getWrapperClass(clazz);
     }
     try {
-      if (isWrapperClass(clazz) || clazz.isPrimitive()) {
+      if (ConfigurationUtils.isWrapperClass(clazz) || clazz.isPrimitive()) {
         Object obj =
-            getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace),
+            ConfigurationUtils
+                .getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace),
                 key, processingHints);
         if (obj != null) {
           if (ConfigurationUtils.isCollection(obj.toString())) {
@@ -321,9 +313,10 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
           return null;
         }
       } else if (clazz.isArray()
-          && (clazz.getComponentType().isPrimitive() || isWrapperClass(clazz.getComponentType()))) {
+          && (clazz.getComponentType().isPrimitive() || ConfigurationUtils.isWrapperClass(clazz.getComponentType()))) {
         Object obj =
-            getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace),
+            ConfigurationUtils
+                .getProperty(ConfigurationRepository.lookup().getConfigurationFor(tenant, namespace),
                 key, processingHints);
         if (obj != null) {
           Class componentClass = clazz.getComponentType();
@@ -365,8 +358,8 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
 
   private <T> T read(String tenant, String namespace, Class<T> clazz, String keyPrefix,
                      Hint... hints) throws Exception {
-    org.openecomp.config.api.Config confAnnot =
-        clazz.getAnnotation(org.openecomp.config.api.Config.class);
+    Config confAnnot =
+        clazz.getAnnotation(Config.class);
     if (confAnnot != null && confAnnot.key().length()>0 && !keyPrefix.endsWith(".")) {
       keyPrefix += (confAnnot.key() + ".");
     }
@@ -375,13 +368,13 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
     T objToReturn = constructor.newInstance();
     for (Field field : clazz.getDeclaredFields()) {
       field.setAccessible(true);
-      org.openecomp.config.api.Config fieldConfAnnot =
-          field.getAnnotation(org.openecomp.config.api.Config.class);
+      Config fieldConfAnnot =
+          field.getAnnotation(Config.class);
       if (fieldConfAnnot != null) {
-        if (field.getType().isPrimitive() || isWrapperClass(field.getType())
+        if (field.getType().isPrimitive() || ConfigurationUtils.isWrapperClass(field.getType())
             || (field.getType().isArray() && (field.getType().getComponentType().isPrimitive()
-            || isWrapperClass(field.getType().getComponentType())))
-            || field.getType().getAnnotation(org.openecomp.config.api.Config.class) != null) {
+            || ConfigurationUtils.isWrapperClass(field.getType().getComponentType())))
+            || field.getType().getAnnotation(Config.class) != null) {
           field.set(objToReturn,
               get(tenant, namespace, keyPrefix + fieldConfAnnot.key(), field.getType(), hints));
         } else if (Collection.class.isAssignableFrom(field.getType())) {
@@ -457,7 +450,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
       obj = obj.toString().trim();
     }
     if (String.class.equals(clazz)) {
-      if (obj.toString().startsWith("@") && isExternalLookup(processingHint)) {
+      if (obj.toString().startsWith("@") && ConfigurationUtils.isExternalLookup(processingHint)) {
         String contents = ConfigurationUtils
             .getFileContents(NonConfigResource.locate(obj.toString().substring(1).trim()));
         if (contents == null) {
@@ -595,7 +588,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
       tenantId = tenantId.toUpperCase();
     }
     if (namespace==null || namespace.trim().length()==0){
-      namespace = DEFAULT_NAMESPACE;
+      namespace = Constants.DEFAULT_NAMESPACE;
     }else{
       namespace = namespace.toUpperCase();
     }
@@ -603,7 +596,8 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
     Iterator<String> keys ;
     try {
       if (ConfigurationRepository.lookup().isDBAccessible()){
-        keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor(DEFAULT_TENANT, DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+KEY_ELEMENTS_DELEMETER+namespace}).iterator();
+        keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor(
+            Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+ Constants.KEY_ELEMENTS_DELEMETER+namespace}).iterator();
       }else{
         keys = ConfigurationRepository.lookup().getConfigurationFor(tenantId, namespace).getKeys(key);
       }
@@ -631,7 +625,7 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
       tenantId = tenantId.toUpperCase();
     }
     if (namespace==null || namespace.trim().length()==0){
-      namespace = DEFAULT_NAMESPACE;
+      namespace = Constants.DEFAULT_NAMESPACE;
     }else{
       namespace = namespace.toUpperCase();
     }
@@ -639,7 +633,8 @@ public class ConfigurationImpl implements org.openecomp.config.api.Configuration
     Iterator<String> keys ;
     try {
       if (ConfigurationRepository.lookup().isDBAccessible()){
-        keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor(DEFAULT_TENANT, DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+KEY_ELEMENTS_DELEMETER+namespace}).iterator();
+        keys = ConfigurationUtils.executeSelectSql(ConfigurationRepository.lookup().getConfigurationFor(
+            Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE).getString("fetchkeysql"), new String[]{tenantId+ Constants.KEY_ELEMENTS_DELEMETER+namespace}).iterator();
       }else{
         if (key==null || key.trim().length()==0){
           keys = ConfigurationRepository.lookup().getConfigurationFor(tenantId, namespace).getKeys();
SDC Parent Project Catalog FE and BE