Rename packages from openecomp to onap.

[sdc.git] / common / onap-common-configuration-management / onap-configuration-management-core / src / main / java / org / onap / config / ConfigurationUtils.java

diff --git a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
similarity index 97%
rename from common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
rename to common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
index e8dc16e..7f22461 100644 (file)
--- a/common/openecomp-common-configuration-management/openecomp-configuration-management-core/src/main/java/org/openecomp/config/ConfigurationUtils.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
@@ -1,4 +1,4 @@
-package org.openecomp.config;
+package org.onap.config;
 
 import com.google.common.collect.ImmutableMap;
 import com.virtlink.commons.configuration2.jackson.JsonConfiguration;
@@ -16,13 +16,14 @@ import org.apache.commons.configuration2.builder.fluent.Parameters;
 import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.io.IOUtils;
-import org.openecomp.config.api.ConfigurationManager;
-import org.openecomp.config.impl.AgglomerateConfiguration;
-import org.openecomp.config.impl.ConfigurationDataSource;
-import org.openecomp.config.impl.ConfigurationRepository;
-import org.openecomp.config.impl.YamlConfiguration;
-import org.openecomp.config.type.ConfigurationMode;
-import org.openecomp.config.type.ConfigurationType;
+import org.onap.config.api.Config;
+import org.onap.config.api.ConfigurationManager;
+import org.onap.config.impl.ConfigurationRepository;
+import org.onap.config.impl.YamlConfiguration;
+import org.onap.config.impl.AgglomerateConfiguration;
+import org.onap.config.impl.ConfigurationDataSource;
+import org.onap.config.type.ConfigurationMode;
+import org.onap.config.type.ConfigurationType;
 
 import javax.sql.DataSource;
 import java.io.File;
@@ -64,9 +65,9 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.google.common.collect.ImmutableMap.builder;
-import static org.openecomp.config.api.Hint.EXTERNAL_LOOKUP;
-import static org.openecomp.config.api.Hint.LATEST_LOOKUP;
-import static org.openecomp.config.api.Hint.NODE_SPECIFIC;
+import static org.onap.config.api.Hint.EXTERNAL_LOOKUP;
+import static org.onap.config.api.Hint.LATEST_LOOKUP;
+import static org.onap.config.api.Hint.NODE_SPECIFIC;
 
 /**
  * The type Configuration utils.
@@ -644,19 +645,19 @@ public class ConfigurationUtils {
      */
     public static <T> T read(Configuration config, Class<T> clazz, String keyPrefix)
             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) {
             keyPrefix += (confAnnot.key() + ".");
         }
         T objToReturn = clazz.newInstance();
         for (Field field : clazz.getDeclaredFields()) {
-            org.openecomp.config.api.Config fieldConfAnnot =
-                    field.getAnnotation(org.openecomp.config.api.Config.class);
+            Config fieldConfAnnot =
+                    field.getAnnotation(Config.class);
             if (fieldConfAnnot != null) {
                 field.setAccessible(true);
                 field.set(objToReturn, config.getProperty(keyPrefix + fieldConfAnnot.key()));
-            } else if (field.getType().getAnnotation(org.openecomp.config.api.Config.class) != null) {
+            } else if (field.getType().getAnnotation(Config.class) != null) {
                 field.set(objToReturn, read(config, field.getType(), keyPrefix));
             }
         }