Sync ccsdk/sli guilin branch

Sync ccsdk/sli guilin branch to make contents identical with
ccsdk/sli/[core|adaptors|northbound|plugins] repositories

Issue-ID: CCSDK-3009
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I0f167680d04e65069fd2c0ba0a01681a9b334f0b

3 files changed, 27 insertions, 35 deletions

diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml
index 8d3a785f4..a5ec191a1 100644
--- a/core/utils/provider/pom.xml
+++ b/core/utils/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.0.2</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-provider</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.0.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
diff --git a/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java
index c4a4fca47..9ae094f1a 100755
--- a/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java
+++ b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/JREFileResolver.java
@@ -23,16 +23,11 @@ package org.onap.ccsdk.sli.core.utils;
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
-import java.nio.file.CopyOption;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.Optional;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Resolves project properties files relative to the directory identified by the JRE property
@@ -44,7 +39,6 @@ public class JREFileResolver implements PropertiesFileResolver {
      * Key for JRE argument representing the configuration directory
      */
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JREFileResolver.class);
     private final String successMessage;
     private final Class<?> clazz;
 
@@ -61,9 +55,18 @@ public class JREFileResolver implements PropertiesFileResolver {
     @Override
     public Optional<File> resolveFile(final String filename) {
 
+        final Bundle bundle;
+
         try {
+            bundle = FrameworkUtil.getBundle(this.clazz);
+        } catch (NoClassDefFoundError e) {
+            return Optional.empty();
+        }
+
+        final File dataFile;
+
 
-            final Bundle bundle = FrameworkUtil.getBundle(this.clazz);
+        try {
             if (bundle == null) {
                 return Optional.empty();
             }
@@ -74,7 +77,7 @@ public class JREFileResolver implements PropertiesFileResolver {
             }
 
 
-            final File dataFile = bundle.getDataFile(filename);
+            dataFile = bundle.getDataFile(filename);
             if(dataFile.exists()) {
                 dataFile.delete();
             }
@@ -86,17 +89,8 @@ public class JREFileResolver implements PropertiesFileResolver {
             }
 
             return Optional.of(dataFile);
-        } catch (final NoClassDefFoundError e) {
-            LOGGER.info("Getting /{} embedded with {}", filename, clazz.getCanonicalName());
-            try (InputStream input = clazz.getResourceAsStream("/"+filename)) {
-                File propFile = File.createTempFile("tmp", ".properties", null);
-                LOGGER.info("Copying /{} to {}", filename, propFile.getAbsolutePath());
-                Files.copy(input, propFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                return Optional.of(propFile);
-            } catch (Exception e1) {
-                LOGGER.info("Caught exception getting {} embedded in jar", filename, e1);
-                return Optional.empty();
-            }
+        } catch (NoClassDefFoundError e) {
+            return Optional.empty();
         }
         catch(final Exception e) {
             return Optional.empty();
diff --git a/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java
index 356009f3f..9496d90e2 100755
--- a/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java
+++ b/core/utils/provider/src/main/java/org/onap/ccsdk/sli/core/utils/common/BundleContextFileResolver.java
@@ -56,22 +56,20 @@ public class BundleContextFileResolver implements PropertiesFileResolver {
      */
     @Override
     public Optional<File> resolveFile(final String filename) {
-        try {
-            if (FrameworkUtil.getBundle(clazz) == null) {
+        if(FrameworkUtil.getBundle(clazz) == null) {
+            return Optional.empty();
+        } else {
+            try {
+                final String pathProperty = FrameworkUtil.getBundle(this.clazz).getBundleContext().getProperty(SDNC_CONFIG_DIR_PROP_KEY);
+                if(Strings.isNullOrEmpty(pathProperty)) {
+                    return Optional.empty();
+                }
+                final Path dblibPath = Paths.get(pathProperty);
+                return Optional.of(dblibPath.resolve(filename).toFile());
+            } catch(final Exception e) {
+                LoggerFactory.getLogger(this.getClass()).error("", e);
                 return Optional.empty();
-            } else {
-                     final String pathProperty = FrameworkUtil.getBundle(this.clazz).getBundleContext()
-                            .getProperty(SDNC_CONFIG_DIR_PROP_KEY);
-                    if (Strings.isNullOrEmpty(pathProperty)) {
-                        return Optional.empty();
-                    }
-                    final Path dblibPath = Paths.get(pathProperty);
-                    return Optional.of(dblibPath.resolve(filename).toFile());
-
             }
-        } catch (Exception|NoClassDefFoundError e) {
-            LoggerFactory.getLogger(this.getClass()).error("", e);
-            return Optional.empty();
         }
     }