Revert commit

Fixes of sonar violations sdc and refactor

This reverts commit baf7f0a965d0ffebd5308d44758bfa9ba96c0c76.
except the catalog files.

the onbording files will be resubmited.

Change-Id: I84c00cec41665211e0bd16ff9cc0c87073d6b897
Issue-ID: SDC-1484
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
index 56390ea54a..00725b1165 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/impl/ConfigurationImpl.java
@@ -1,6 +1,5 @@
 package org.onap.config.impl;
 
-
 import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.configuration2.DatabaseConfiguration;
 import org.onap.config.ConfigurationUtils;
@@ -40,7 +39,6 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration {
     ;
   };
   private static boolean instantiated = false;
-  private static NonConfigResource nonConfigResource = NonConfigResource.create(propertyName -> System.getProperties().getProperty(propertyName));
   /**
    * The Change notifier.
    */
@@ -68,7 +66,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration {
         }
         moduleConfig.addConfig(url);
       } else {
-        nonConfigResource.add(url);
+        NonConfigResource.add(url);
       }
     }
     String configLocation = System.getProperty("config.location");
@@ -86,7 +84,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration {
           }
           moduleConfig.addConfig(file);
         } else {
-          nonConfigResource.add(file);
+          NonConfigResource.add(file);
         }
       }
     }
@@ -455,7 +453,7 @@ public class ConfigurationImpl implements org.onap.config.api.Configuration {
     if (String.class.equals(clazz)) {
       if (obj.toString().startsWith("@") && ConfigurationUtils.isExternalLookup(processingHint)) {
         String contents = ConfigurationUtils
-            .getFileContents(nonConfigResource.locate(obj.toString().substring(1).trim()));
+            .getFileContents(NonConfigResource.locate(obj.toString().substring(1).trim()));
         if (contents == null) {
           contents = ConfigurationUtils.getFileContents(obj.toString().substring(1).trim());
         }