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>

3 files changed, 79 insertions, 90 deletions

diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
index 9782fc9969..db64f7f7fc 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/ConfigurationUtils.java
@@ -670,7 +670,7 @@ public class ConfigurationUtils {
         Configuration dbConfig = ConfigurationRepository.lookup()
                 .getConfigurationFor(Constants.DEFAULT_TENANT, Constants.DB_NAMESPACE);
         BasicConfigurationBuilder<AgglomerateConfiguration> builder =
-                new BasicConfigurationBuilder<>(AgglomerateConfiguration.class);
+                new BasicConfigurationBuilder<AgglomerateConfiguration>(AgglomerateConfiguration.class);
         builder.configure(
                 new Parameters().database()
                         .setDataSource(ConfigurationDataSource.lookup())
diff --git a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java
index a63b455a16..830cdfef5a 100644
--- a/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java
+++ b/common/onap-common-configuration-management/onap-configuration-management-core/src/main/java/org/onap/config/NonConfigResource.java
@@ -1,104 +1,95 @@
 package org.onap.config;
 
-import io.vavr.Function1;
-import io.vavr.collection.HashSet;
-import io.vavr.collection.Set;
-import io.vavr.control.Option;
-
 import java.io.File;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
-import static io.vavr.API.Option;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * The type Non config resource.
  */
 public class NonConfigResource {
 
-    private Function1<String, String> propertyGetter;
-    private Set<URL> urls;
-    private Set<Path> files;
-
-    private NonConfigResource(Function1<String, String> propertyGetter) {
-        this.propertyGetter = propertyGetter;
-        this.files = HashSet.empty();
-        this.urls = HashSet.empty();
-    }
+  private static Set<URL> urls = new HashSet<>();
+  private static Set<File> files = new HashSet<>();
 
-    public static NonConfigResource create(Function1<String, String> propertyGetter) {
-        return new NonConfigResource(propertyGetter);
-    }
+  /**
+   * Add.
+   *
+   * @param url the url
+   */
+  public static void add(URL url) {
+    urls.add(url);
+  }
 
-    /**
-     * Add.
-     *
-     * @param url the url
-     */
-    public void add(URL url) {
-        urls = urls.add(url);
-    }
+  /**
+   * Add.
+   *
+   * @param file the file
+   */
+  public static void add(File file) {
+    files.add(file);
+  }
 
-    /**
-     * Add.
-     *
-     * @param file the file
-     */
-    public void add(File file) {
-        files = files.add(file.toPath());
-    }
-
-    /**
-     * Locate path.
-     *
-     * @param resource the resource
-     * @return the path
-     */
-    public Path locate(String resource) {
-        Path toReturn = null;
-        try {
-            if (resource != null) {
-                toReturn = tryToLocateResource(resource).getOrNull();
-            }
-        } catch (Exception exception) {
-            exception.printStackTrace();
+  /**
+   * Locate path.
+   *
+   * @param resource the resource
+   * @return the path
+   */
+  public static Path locate(String resource) {
+    try {
+      if (resource != null) {
+        File file = new File(resource);
+        if (file.exists()) {
+          return Paths.get(resource);
         }
-        return toReturn;
-    }
-
-    private Option<Path> tryToLocateResource(String resource) throws URISyntaxException {
-        return new File(resource).exists() ? Option(Paths.get(resource)) : getPathForResourceAmongFiles(resource)
-                .orElse(getPathForResourceBasedOnProperty(resource, "node.config.location"))
-                .orElse(getPathForResourceBasedOnProperty(resource, "config.location"))
-                .orElse(getPathForResourceAmongUrls(resource));
-    }
-
-    private Option<Path> getPathForResourceBasedOnProperty(String resource, String configPropertyKey) {
-        return Option(propertyGetter.apply(configPropertyKey))
-                .flatMap(el -> locate(new File(el), resource));
-    }
-
-    private Option<Path> getPathForResourceAmongFiles(String resource) {
-        return files.map(Path::toAbsolutePath)
-                .filter(path -> path.toFile().exists() && path.endsWith(resource))
-                .headOption();
-    }
-
-    private Option<Path> getPathForResourceAmongUrls(String resource) throws URISyntaxException {
-        return urls.filter(url -> url.getFile().endsWith(resource))
-                .headOption()
-                .flatMap(url -> Option(Paths.get(url.getPath())));
+        for (File availableFile : files) {
+          if (availableFile.getAbsolutePath().endsWith(resource) && availableFile.exists()) {
+            return Paths.get(availableFile.getAbsolutePath());
+          }
+        }
+        if (System.getProperty("node.config.location") != null) {
+          Path path = locate(new File(System.getProperty("node.config.location")), resource);
+          if (path != null) {
+            return path;
+          }
+        }
+        if (System.getProperty("config.location") != null) {
+          Path path = locate(new File(System.getProperty("config.location")), resource);
+          if (path != null) {
+            return path;
+          }
+        }
+        for (URL url : urls) {
+          if (url.getFile().endsWith(resource)) {
+            return Paths.get(url.toURI());
+          }
+        }
+      }
+    } catch (Exception exception) {
+      exception.printStackTrace();
     }
+    return null;
+  }
 
-    private Option<Path> locate(File root, String resource) {
-        return root.exists() ? Option.ofOptional(ConfigurationUtils.getAllFiles(root, true, false)
-                .stream()
-                .filter(file -> !ConfigurationUtils.isConfig(file))
-                .peek(this::add)
-                .filter(file -> file.getAbsolutePath().endsWith(resource))
-                .map(file -> Paths.get(file.getAbsolutePath()))
-                .findAny()) : Option.none();
+  private static Path locate(File root, String resource) {
+    if (root.exists()) {
+      Collection<File> filesystemResources = ConfigurationUtils.getAllFiles(root, true, false);
+      Predicate<File> f1 = ConfigurationUtils::isConfig;
+      for (File file : filesystemResources) {
+        if (!f1.test(file)) {
+          add(file);
+          if (file.getAbsolutePath().endsWith(resource)) {
+            return Paths.get(file.getAbsolutePath());
+          }
+        }
+      }
     }
+    return null;
+  }
 }
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());
         }