modernizing propertyProvider by replacing Vector to ArrayList

Issue-ID: CCSDK-3213
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ifcc3f618512f1f5a347b8045e54ba82d0e21d6dd

diff --git a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java
index edc2e85..d63136e 100755 (executable)
--- a/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java
+++ b/adaptors/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceProvider.java
@@ -28,9 +28,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.onap.ccsdk.sli.core.utils.JREFileResolver;
 import org.onap.ccsdk.sli.core.utils.KarafRootFileResolver;
@@ -80,7 +81,7 @@ public class AAIServiceProvider implements UtilsProvider {
     /**
      * A prioritized list of strategies for resolving dblib properties files.
      */
-    private Vector<PropertiesFileResolver> dblibPropertiesFileResolvers = new Vector<>();
+    private List<PropertiesFileResolver> dblibPropertiesFileResolvers = new ArrayList<>();
 
     /**
      * The configuration properties for the db connection.

diff --git a/adaptors/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourcePropertiesProviderImpl.java b/adaptors/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourcePropertiesProviderImpl.java
index eee5f09..120d153 100755 (executable)
--- a/adaptors/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourcePropertiesProviderImpl.java
+++ b/adaptors/mdsal-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/MdsalResourcePropertiesProviderImpl.java
@@ -24,9 +24,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.onap.ccsdk.sli.core.utils.JREFileResolver;
@@ -65,7 +66,7 @@ public class MdsalResourcePropertiesProviderImpl implements MdsalResourcePropert
     /**
      * A prioritized list of strategies for resolving sql-resource properties files.
      */
-    private Vector<PropertiesFileResolver> mdsalResourcePropertiesFileResolvers = new Vector<>();
+    private List<PropertiesFileResolver> mdsalResourcePropertiesFileResolvers = new ArrayList<>();
 
     /**
      * The configuration properties for the db connection.

diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdaptorPropertiesProviderImpl.java b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdaptorPropertiesProviderImpl.java
index c5e4044..bbbe6f5 100644 (file)
--- a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdaptorPropertiesProviderImpl.java
+++ b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SaltstackAdaptorPropertiesProviderImpl.java
@@ -24,6 +24,8 @@
 
 package org.onap.ccsdk.sli.adaptors.saltstack.impl;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.onap.ccsdk.sli.adaptors.saltstack.SaltstackAdaptorPropertiesProvider;
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.onap.ccsdk.sli.core.utils.JREFileResolver;
@@ -40,7 +42,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Vector;
 
 /**
  * Responsible for determining the properties file to use and instantiating the
@@ -69,7 +70,7 @@ public class SaltstackAdaptorPropertiesProviderImpl implements SaltstackAdaptorP
     /**
      * A prioritized list of strategies for resolving sql-resource properties files.
      */
-    private Vector<PropertiesFileResolver> saltstackAdaptorPropertiesFileResolvers = new Vector<>();
+    private List<PropertiesFileResolver> saltstackAdaptorPropertiesFileResolvers = new ArrayList<>();
 
     /**
      * The configuration properties for the db connection.

diff --git a/adaptors/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourcePropertiesProviderImpl.java b/adaptors/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourcePropertiesProviderImpl.java
index f55390c..a1f6101 100755 (executable)
--- a/adaptors/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourcePropertiesProviderImpl.java
+++ b/adaptors/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourcePropertiesProviderImpl.java
@@ -24,9 +24,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.onap.ccsdk.sli.core.utils.JREFileResolver;
@@ -65,7 +66,7 @@ public class SqlResourcePropertiesProviderImpl implements SqlResourcePropertiesP
     /**
      * A prioritized list of strategies for resolving sql-resource properties files.
      */
-    private Vector<PropertiesFileResolver> sqlResourcePropertiesFileResolvers = new Vector<>();
+    private List<PropertiesFileResolver> sqlResourcePropertiesFileResolvers = new ArrayList<>();
 
     /**
      * The configuration properties for the db connection.

diff --git a/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
index ff9d585..164db75 100755 (executable)
--- a/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
+++ b/core/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBLIBResourceProvider.java
@@ -23,9 +23,10 @@ package org.onap.ccsdk.sli.core.dblib;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Vector;
 import org.onap.ccsdk.sli.core.utils.JREFileResolver;
 import org.onap.ccsdk.sli.core.utils.KarafRootFileResolver;
 import org.onap.ccsdk.sli.core.utils.PropertiesFileResolver;
@@ -65,7 +66,7 @@ public class DBLIBResourceProvider {
     /**
      * A prioritized list of strategies for resolving dblib properties files.
      */
-    private Vector<PropertiesFileResolver> dblibPropertiesFileResolvers = new Vector<>();
+    private List<PropertiesFileResolver> dblibPropertiesFileResolvers = new ArrayList<>();
 
     /**
      * The configuration properties for the db connection.

diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java
index 40d3056..d415bb1 100644 (file)
--- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java
+++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicPropertiesProviderImpl.java
@@ -25,9 +25,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.Vector;
 
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicPropertiesProvider;
@@ -67,7 +68,7 @@ public class SvcLogicPropertiesProviderImpl implements SvcLogicPropertiesProvide
        /**
         * A prioritized list of strategies for resolving dblib properties files.
         */
-       private Vector<PropertiesFileResolver> sliPropertiesFileResolvers = new Vector<>();
+       private List<PropertiesFileResolver> sliPropertiesFileResolvers = new ArrayList<>();
 
        /**
         * The configuration properties for the db connection.  Use EnvProperties class, which

diff --git a/plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java b/plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java
index 29c5c97..053debe 100644 (file)
--- a/plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java
+++ b/plugins/template-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/template/TemplateNodeTest.java
@@ -2,10 +2,11 @@ package org.onap.ccsdk.sli.plugins.template;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.junit.Test;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -64,7 +65,7 @@ public class TemplateNodeTest {
     public void withProperties() throws Exception {
         System.setProperty(TemplateNode.PROPERTIES_DIR_KEY, "src/test/resources");
         TemplateNode t = new TemplateNode();
-        Vector<String> loader = (Vector<String>) t.ve.getProperty(RuntimeConstants.RESOURCE_LOADER);
+        List<String> loader = (List<String>) t.ve.getProperty(RuntimeConstants.RESOURCE_LOADER);
         assertTrue(loader.contains("class"));
         assertEquals("/home/my/example", t.ve.getProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH));
         assertEquals("true", t.ve.getProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE));
@@ -75,11 +76,11 @@ public class TemplateNodeTest {
     public void withNoProperties() throws Exception {
         System.setProperty(TemplateNode.PROPERTIES_DIR_KEY, "i/do/not/exist");
         TemplateNode t = new TemplateNode();
-        Vector<String> loader = (Vector<String>) t.ve.getProperty(RuntimeConstants.RESOURCE_LOADER);
+        List<String> loader = (List<String>) t.ve.getProperty(RuntimeConstants.RESOURCE_LOADER);
         assertTrue(loader.contains("file"));
         assertEquals("/opt/onap/sdnc/restapi/templates", t.ve.getProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH));
         assertEquals("false", t.ve.getProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE));
-        assertEquals(null, t.ve.getProperty("custom.property"));
+        assertNull(t.ve.getProperty("custom.property"));
     }
 
 }
\ No newline at end of file