Merge "added test case to SliStringUtilsTest"

diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml
index 5d05f84..7cf8004 100644 (file)
--- a/dblib/features/ccsdk-dblib/pom.xml
+++ b/dblib/features/ccsdk-dblib/pom.xml
@@ -6,13 +6,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-dblib</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/features/features-dblib/pom.xml b/dblib/features/features-dblib/pom.xml
index ce31373..4a5b50f 100644 (file)
--- a/dblib/features/features-dblib/pom.xml
+++ b/dblib/features/features-dblib/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-dblib</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml
index a24c558..7346477 100755 (executable)
--- a/dblib/features/pom.xml
+++ b/dblib/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>dblib-feature-aggregator</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml
index 6544f20..39730f9 100755 (executable)
--- a/dblib/installer/pom.xml
+++ b/dblib/installer/pom.xml
@@ -6,13 +6,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>dblib-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/dblib/pom.xml b/dblib/pom.xml
index f34ee20..21c8053 100755 (executable)
--- a/dblib/pom.xml
+++ b/dblib/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>dblib</artifactId>
-   <version>0.3.0-SNAPSHOT</version>
+   <version>0.3.1-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: dblib</name>

diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index 66b1fcd..4e785a1 100755 (executable)
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>dblib-provider</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name>

diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml
index ef5da12..f67c7c0 100644 (file)
--- a/features/ccsdk-sli-core-all/pom.xml
+++ b/features/ccsdk-sli-core-all/pom.xml
@@ -7,16 +7,18 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-sli-core-all</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>
+
+       
        <dependencyManagement>
                <dependencies>
                        <dependency>
@@ -33,6 +35,21 @@
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
 

diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml
index 843e27d..7e6243f 100644 (file)
--- a/features/features-sli-core/pom.xml
+++ b/features/features-sli-core/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-sli-core</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index eb6344b..6a341d9 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -6,13 +6,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>slicore-features-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: features :: ${project.artifactId}</name>

diff --git a/features/pom.xml b/features/pom.xml
index f7ff3fd..0cb15b3 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>slicore-feature-aggregator</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: features</name>

diff --git a/filters/features/ccsdk-filters/pom.xml b/filters/features/ccsdk-filters/pom.xml
index a995790..b38b348 100644 (file)
--- a/filters/features/ccsdk-filters/pom.xml
+++ b/filters/features/ccsdk-filters/pom.xml
@@ -6,17 +6,37 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-filters</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
-
+       <dependencyManagement>
+               <dependencies>
+               
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
 
        <dependencies>
 

diff --git a/filters/features/features-filters/pom.xml b/filters/features/features-filters/pom.xml
index 810d40a..d82911f 100644 (file)
--- a/filters/features/features-filters/pom.xml
+++ b/filters/features/features-filters/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-filters</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>

diff --git a/filters/features/pom.xml b/filters/features/pom.xml
index 73192fa..c853393 100755 (executable)
--- a/filters/features/pom.xml
+++ b/filters/features/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 

diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml
index 76e055d..c34fc25 100755 (executable)
--- a/filters/installer/pom.xml
+++ b/filters/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>filters-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
@@ -23,6 +23,28 @@
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
+       <dependencyManagement>
+               <dependencies>
+               
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
+
        <dependencies>
 
                <dependency>

diff --git a/filters/pom.xml b/filters/pom.xml
index 319c4a7..2d6f161 100644 (file)
--- a/filters/pom.xml
+++ b/filters/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>filters</artifactId>
-   <version>0.3.0-SNAPSHOT</version>
+   <version>0.3.1-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: filters</name>

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index c7d356b..b6ae797 100755 (executable)
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>filters-provider</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name>
@@ -23,6 +23,28 @@
        <sonar.coverage.exclusions>**/RequestResponseDbLoggingFilter.java</sonar.coverage.exclusions>
     </properties>
 
+       <dependencyManagement>
+               <dependencies>
+               
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
+       
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

diff --git a/pom.xml b/pom.xml
index 3e2319b..78136b2 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-sli-core</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core</name>

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index 5007bed..d16ce03 100755 (executable)
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli-common</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/features/features-sli/pom.xml b/sli/features/features-sli/pom.xml
index 7193b2b..729e24e 100644 (file)
--- a/sli/features/features-sli/pom.xml
+++ b/sli/features/features-sli/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-sli</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/features/odl-sli/pom.xml b/sli/features/odl-sli/pom.xml
index f108726..0e0265e 100644 (file)
--- a/sli/features/odl-sli/pom.xml
+++ b/sli/features/odl-sli/pom.xml
@@ -7,13 +7,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>single-feature-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>ccsdk-sli</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/features/pom.xml b/sli/features/pom.xml
index 9a75ad7..734c342 100644 (file)
--- a/sli/features/pom.xml
+++ b/sli/features/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <relativePath/>
   </parent>
 
   <groupId>org.onap.ccsdk.sli.core</groupId>
   <artifactId>sli-feature-aggregator</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml
index 4a3eeff..0a70cf9 100755 (executable)
--- a/sli/installer/pom.xml
+++ b/sli/installer/pom.xml
@@ -6,13 +6,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -23,7 +23,17 @@
                <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
-
+       
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
        <dependencies>
 
                <dependency>

diff --git a/sli/model/pom.xml b/sli/model/pom.xml
index d074e25..bfb4c24 100755 (executable)
--- a/sli/model/pom.xml
+++ b/sli/model/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli-model</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>

diff --git a/sli/pom.xml b/sli/pom.xml
index d608e34..c03e1da 100755 (executable)
--- a/sli/pom.xml
+++ b/sli/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sli</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-core :: sli</name>

diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml
index aed3483..0e343c8 100755 (executable)
--- a/sli/provider/pom.xml
+++ b/sli/provider/pom.xml
@@ -7,13 +7,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-provider</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -24,8 +24,17 @@
        </properties>
 
 
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
        <dependencies>
-
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>
                        <artifactId>sli-model</artifactId>

diff --git a/sli/recording/pom.xml b/sli/recording/pom.xml
index 038381d..7c1682e 100755 (executable)
--- a/sli/recording/pom.xml
+++ b/sli/recording/pom.xml
@@ -7,13 +7,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sli-recording</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sli :: ${project.artifactId}</name>
@@ -23,7 +23,16 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
 
-
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
        <dependencies>
                <dependency>
                        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
index 78f5f1e..3e15fa4 100644 (file)
--- a/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
+++ b/sliPluginUtils/features/ccsdk-sliPluginUtils/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-sliPluginUtils</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
@@ -32,6 +32,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

diff --git a/sliPluginUtils/features/features-sliPluginUtils/pom.xml b/sliPluginUtils/features/features-sliPluginUtils/pom.xml
index 23e54fe..60d563f 100644 (file)
--- a/sliPluginUtils/features/features-sliPluginUtils/pom.xml
+++ b/sliPluginUtils/features/features-sliPluginUtils/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>features-sliPluginUtils</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/features/pom.xml b/sliPluginUtils/features/pom.xml
index 5b4b70f..2194f8e 100755 (executable)
--- a/sliPluginUtils/features/pom.xml
+++ b/sliPluginUtils/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils-features</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>

diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml
index 5a22e49..e30e9d2 100755 (executable)
--- a/sliPluginUtils/installer/pom.xml
+++ b/sliPluginUtils/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
@@ -23,6 +23,27 @@
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
+       <dependencyManagement>
+               <dependencies>
+               
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
        <dependencies>
 
                <dependency>

diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml
index 8ecdf39..da64617 100755 (executable)
--- a/sliPluginUtils/pom.xml
+++ b/sliPluginUtils/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils</name>

diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 411c145..4b7fe95 100755 (executable)
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliPluginUtils-provider</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId}</name>
@@ -20,7 +20,15 @@
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
-
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
        <dependencies>
                <dependency>
                        <groupId>junit</groupId>

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/CheckParametersTest.java b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/CheckParametersTest.java
index 266603d..a7cc1bd 100644 (file)
--- a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/CheckParametersTest.java
+++ b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/CheckParametersTest.java
@@ -35,119 +35,152 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.gson.JsonObject;
+
 public class CheckParametersTest {
 
-       @Test
-       public void nullRequiredParameters() throws Exception {
-               Map<String, String> parametersMap = new HashMap<String, String>();
-               String[] requiredParams = null;
-               Logger Log = LoggerFactory.getLogger(SliPluginUtils.class);
-               SliPluginUtils.checkParameters(parametersMap, requiredParams, Log);
-       }
-
-       @Test(expected = SvcLogicException.class)
-       public void emptyParametersMap() throws Exception {
-               Map<String, String> parametersMap = new HashMap<String, String>();
-               String[] requiredParams = new String[] { "param1", "param2", "param3" };
-               Logger Log = LoggerFactory.getLogger(SliPluginUtils.class);
-               SliPluginUtils.checkParameters(parametersMap, requiredParams, Log);
-       }
-
-       @Test(expected = SvcLogicException.class)
-       public void paramNotFound() throws Exception {
-               Map<String, String> parametersMap = new HashMap<String, String>();
-               parametersMap.put("tst", "me");
-               String[] requiredParams = new String[] { "param1", "parm2", "param3" };
-               Logger Log = LoggerFactory.getLogger(SliPluginUtils.class);
-               SliPluginUtils.checkParameters(parametersMap, requiredParams, Log);
-       }
-
-       @Test
-       public void testSunnyRequiredParameters() throws Exception {
-               SvcLogicContext ctx = new SvcLogicContext();
-               ctx.setAttribute("param1", "hello");
-               ctx.setAttribute("param2", "world");
-               ctx.setAttribute("param3", "!");
-
-               Map<String, String> parameters = new HashMap<String, String>();
-               parameters.put("param1", "dog");
-               parameters.put("param2", "cat");
-               parameters.put("param3", "fish");
-
-               SliPluginUtils.requiredParameters(parameters, ctx);
-       }
-
-       @Test
-       public void testSunnyRequiredParametersWithPrefix() throws Exception {
-               String prefixValue = "my.unique.path.";
-               SvcLogicContext ctx = new SvcLogicContext();
-               ctx.setAttribute(prefixValue + "param1", "hello");
-               ctx.setAttribute(prefixValue + "param2", "world");
-               ctx.setAttribute(prefixValue + "param3", "!");
-
-               Map<String, String> parameters = new HashMap<String, String>();
-               parameters.put("prefix", prefixValue);
-               parameters.put("param1", "dog");
-               parameters.put("param2", "cat");
-               parameters.put("param3", "fish");
-
-               SliPluginUtils.requiredParameters(parameters, ctx);
-       }
-
-       @Test(expected = SvcLogicException.class)
-       public void testRainyMissingRequiredParameters() throws Exception {
-               SvcLogicContext ctx = new SvcLogicContext();
-               ctx.setAttribute("param1", "hello");
-               ctx.setAttribute("param3", "!");
-
-               Map<String, String> parameters = new HashMap<String, String>();
-               parameters.put("param1", null);
-               parameters.put("param2", null);
-               parameters.put("param3", null);
-
-               SliPluginUtils.requiredParameters(parameters, ctx);
-       }
-
-       @Test(expected = SvcLogicException.class)
-       public void testEmptyRequiredParameters() throws Exception {
-               SvcLogicContext ctx = new SvcLogicContext();
-               ctx.setAttribute("param1", "hello");
-               ctx.setAttribute("param3", "!");
-
-               Map<String, String> parameters = new HashMap<String, String>();
-
-               SliPluginUtils.requiredParameters(parameters, ctx);
-       }
-
-       @Test(expected = SvcLogicException.class)
-       public void testJsonStringToCtx() throws Exception {
-               SvcLogicContext ctx = new SvcLogicContext();
-               Map<String, String> parameters = new HashMap<String, String>();
-               parameters.put("outputPath", "testPath");
-               parameters.put("isEscaped", "true");
-               parameters.put("source", "//{/name1/:value1/}//");
-               SliPluginUtils.jsonStringToCtx(parameters, ctx);
-       }
-
-       @Test
-       public void testGetAttributeValue() throws Exception {
-               SvcLogicContext ctx = new SvcLogicContext();
-               Map<String, String> parameters = new HashMap<String, String>();
-               parameters.put("outputPath", "testPath");
-               parameters.put("source", "testSource");
-               SliPluginUtils.getAttributeValue(parameters, ctx);
-               assertNull(ctx.getAttribute(parameters.get("outputPath")));
-       }
-
-       @Test
-       public void testCtxListContains() throws Exception {
-               SvcLogicContext ctx = new SvcLogicContext();
-               Map<String, String> parameters = new HashMap<String, String>();
-               parameters.put("list", "10_length");
-               parameters.put("keyName", "testName");
-               parameters.put("keyValue", "testValue");
-               ctx.setAttribute("10_length", "10");
-               assertEquals("false", SliPluginUtils.ctxListContains(parameters, ctx));
-
-       }
+    @Test
+    public void nullRequiredParameters() throws Exception {
+        Map<String, String> parametersMap = new HashMap<String, String>();
+        String[] requiredParams = null;
+        Logger Log = LoggerFactory.getLogger(SliPluginUtils.class);
+        SliPluginUtils.checkParameters(parametersMap, requiredParams, Log);
+    }
+
+    @Test(expected = SvcLogicException.class)
+    public void emptyParametersMap() throws Exception {
+        Map<String, String> parametersMap = new HashMap<String, String>();
+        String[] requiredParams = new String[] { "param1", "param2", "param3" };
+        Logger Log = LoggerFactory.getLogger(SliPluginUtils.class);
+        SliPluginUtils.checkParameters(parametersMap, requiredParams, Log);
+    }
+
+    @Test(expected = SvcLogicException.class)
+    public void paramNotFound() throws Exception {
+        Map<String, String> parametersMap = new HashMap<String, String>();
+        parametersMap.put("tst", "me");
+        String[] requiredParams = new String[] { "param1", "parm2", "param3" };
+        Logger Log = LoggerFactory.getLogger(SliPluginUtils.class);
+        SliPluginUtils.checkParameters(parametersMap, requiredParams, Log);
+    }
+
+    @Test
+    public void testSunnyRequiredParameters() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("param1", "hello");
+        ctx.setAttribute("param2", "world");
+        ctx.setAttribute("param3", "!");
+
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("param1", "dog");
+        parameters.put("param2", "cat");
+        parameters.put("param3", "fish");
+
+        SliPluginUtils.requiredParameters(parameters, ctx);
+    }
+
+    @Test
+    public void testSunnyRequiredParametersWithPrefix() throws Exception {
+        String prefixValue = "my.unique.path.";
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute(prefixValue + "param1", "hello");
+        ctx.setAttribute(prefixValue + "param2", "world");
+        ctx.setAttribute(prefixValue + "param3", "!");
+
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("prefix", prefixValue);
+        parameters.put("param1", "dog");
+        parameters.put("param2", "cat");
+        parameters.put("param3", "fish");
+
+        SliPluginUtils.requiredParameters(parameters, ctx);
+    }
+
+    @Test(expected = SvcLogicException.class)
+    public void testRainyMissingRequiredParameters() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("param1", "hello");
+        ctx.setAttribute("param3", "!");
+
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("param1", null);
+        parameters.put("param2", null);
+        parameters.put("param3", null);
+
+        SliPluginUtils.requiredParameters(parameters, ctx);
+    }
+
+    @Test(expected = SvcLogicException.class)
+    public void testEmptyRequiredParameters() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
+        ctx.setAttribute("param1", "hello");
+        ctx.setAttribute("param3", "!");
+
+        Map<String, String> parameters = new HashMap<String, String>();
+
+        SliPluginUtils.requiredParameters(parameters, ctx);
+    }
+
+    @Test(expected = SvcLogicException.class)
+    public void testJsonStringToCtx() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("outputPath", "testPath");
+        parameters.put("isEscaped", "true");
+        parameters.put("source", "//{/name1/:value1/}//");
+        SliPluginUtils.jsonStringToCtx(parameters, ctx);
+    }
+
+    @Test
+    public void testGetAttributeValue() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("outputPath", "testPath");
+        parameters.put("source", "testSource");
+        SliPluginUtils.getAttributeValue(parameters, ctx);
+        assertNull(ctx.getAttribute(parameters.get("outputPath")));
+    }
+
+    @Test
+    public void testCtxListContains() throws Exception {
+        SvcLogicContext ctx = new SvcLogicContext();
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("list", "10_length");
+        parameters.put("keyName", "testName");
+        parameters.put("keyValue", "testValue");
+        ctx.setAttribute("10_length", "10");
+        assertEquals("false", SliPluginUtils.ctxListContains(parameters, ctx));
+
+    }
+    
+    @Test(expected= SvcLogicException.class)
+    public void testPrintContextForNullParameters() throws SvcLogicException
+    {
+        SvcLogicContext ctx = new SvcLogicContext();
+        Map<String, String> parameters = new HashMap<String, String>();
+        SliPluginUtils.printContext(parameters, ctx);
+    }
+    
+    @Test
+    public void testPrintContext() throws SvcLogicException
+    {
+        SvcLogicContext ctx = new SvcLogicContext();
+        Map<String, String> parameters = new HashMap<String, String>();
+        parameters.put("filename","testFileName");
+        SliPluginUtils.printContext(parameters, ctx);
+    }
+    
+    @Test
+    public void testWriteJsonObject() throws SvcLogicException
+    {
+        JsonObject obj=new JsonObject();
+        obj.addProperty("name","testName");
+        obj.addProperty("age",27);
+        obj.addProperty("salary",600000);
+        SvcLogicContext ctx = new SvcLogicContext();
+        SliPluginUtils.writeJsonObject(obj, ctx,"root");
+        assertEquals("testName", ctx.getAttribute("root.name"));
+        assertEquals("27", ctx.getAttribute("root.age"));
+        assertEquals("600000", ctx.getAttribute("root.salary"));
+    }
 }

diff --git a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
index f9d70f2..bfd19bc 100644 (file)
--- a/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
+++ b/sliPluginUtils/provider/src/test/java/org/onap/ccsdk/sli/core/slipluginutils/SliPluginUtils_ctxSortList.java
@@ -3,7 +3,9 @@
  * ONAP : CCSDK
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                                             reserved.
+ *                         reserved.
+ * ================================================================================
+ * Modifications Copyright (C) 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +19,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- */
+ */ 
 
 package org.onap.ccsdk.sli.core.slipluginutils;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 import java.util.Random;
-
+ 
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -35,62 +38,104 @@ import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("unused")
 public class SliPluginUtils_ctxSortList {
-       private static final Logger LOG = LoggerFactory.getLogger(SliPluginUtils_ctxSortList.class);
-       SliPluginUtils utils = new SliPluginUtils();
-       SvcLogicContext ctx;
-       HashMap<String,String> parameters;
-       Random rand = new Random();
-
-       @Before
-       public void setUp() throws Exception {
-               this.ctx = new SvcLogicContext();
-               this.parameters = new HashMap<String,String>();
-       }
-
-       @Test
-       public final void list_of_containers() throws SvcLogicException {
-               this.parameters.put("list", "input.list");
-               this.parameters.put("sort-fields", "sort-key");
-               this.parameters.put("delimiter",",");
-
-               ctx.setAttribute("input.list_length", "10");
-               for( int i = 0; i < 10; i++ ) {
-                       this.ctx.setAttribute("input.list[" + i + "].sort-key", Integer.toString( rand.nextInt(10) ));
-                       this.ctx.setAttribute("input.list[" + i + "].value", Integer.toString( rand.nextInt(10) ));
-               }
-
-               LOG.trace("BEFORE SORT:");
-               SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
-
-               utils.ctxSortList(this.parameters, this.ctx);
-
-               LOG.trace("AFTER SORT:");
-               SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
-
-               for( int i = 0; i < 9; i++ ) {
-                       assertTrue(this.ctx.getAttribute("input.list[" + i + "].sort-key").compareTo(this.ctx.getAttribute("input.list[" + (i+1) + "].sort-key")) < 1 );
-               }
-       }
-
-       @Test public final void list_of_elements() throws SvcLogicException {
-               this.parameters.put("list", "input.list");
-               this.parameters.put("delimiter",",");
-
-               this.ctx.setAttribute("input.list_length", "10");
-               for( int i = 0; i < 10; i++ ) {
-                       this.ctx.setAttribute("input.list[" + i + ']', Integer.toString( rand.nextInt(10) ));
-               }
-
-               LOG.trace("BEFORE SORT:");
-               SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
-
-               utils.ctxSortList(this.parameters, this.ctx);
-
-               LOG.trace("AFTER SORT:");
-               SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
-
-               for( int i = 0; i < 9; i++ ) {
-                       assertTrue(this.ctx.getAttribute("input.list[" + i + ']').compareTo(this.ctx.getAttribute("input.list[" + (i+1) + ']')) < 1 );
-               }
-       }
+    private static final Logger LOG = LoggerFactory.getLogger(SliPluginUtils_ctxSortList.class);
+    SliPluginUtils utils = new SliPluginUtils();
+    SvcLogicContext ctx;
+    HashMap<String,String> parameters;
+    Random rand = new Random();
+
+    @Before
+    public void setUp() throws Exception {
+        this.ctx = new SvcLogicContext();
+        this.parameters = new HashMap<String,String>();
+    }
+
+    @Test
+    public final void list_of_containers() throws SvcLogicException {
+        this.parameters.put("list", "input.list");
+        this.parameters.put("sort-fields", "sort-key");
+        this.parameters.put("delimiter",",");
+
+        ctx.setAttribute("input.list_length", "10");
+        for( int i = 0; i < 10; i++ ) {
+            this.ctx.setAttribute("input.list[" + i + "].sort-key", Integer.toString( rand.nextInt(10) ));
+            this.ctx.setAttribute("input.list[" + i + "].value", Integer.toString( rand.nextInt(10) ));
+        }
+
+        LOG.trace("BEFORE SORT:");
+        SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
+
+        utils.ctxSortList(this.parameters, this.ctx);
+
+        LOG.trace("AFTER SORT:");
+        SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
+
+        for( int i = 0; i < 9; i++ ) {
+            assertTrue(this.ctx.getAttribute("input.list[" + i + "].sort-key").compareTo(this.ctx.getAttribute("input.list[" + (i+1) + "].sort-key")) < 1 );
+        }
+    }
+
+    @Test 
+    public final void list_of_elements() throws SvcLogicException {
+        this.parameters.put("list", "input.list");
+        this.parameters.put("delimiter",",");
+
+        this.ctx.setAttribute("input.list_length", "10");
+        for( int i = 0; i < 10; i++ ) {
+            this.ctx.setAttribute("input.list[" + i + ']', Integer.toString( rand.nextInt(10) ));
+        }
+
+        LOG.trace("BEFORE SORT:");
+        SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
+
+        utils.ctxSortList(this.parameters, this.ctx);
+
+        LOG.trace("AFTER SORT:");
+        SliPluginUtils.logContextMemory(ctx, LOG, SliPluginUtils.LogLevel.TRACE);
+
+        for( int i = 0; i < 9; i++ ) {
+            assertTrue(this.ctx.getAttribute("input.list[" + i + ']').compareTo(this.ctx.getAttribute("input.list[" + (i+1) + ']')) < 1 );
+        }
+    }
+    
+    @Test
+    public void testGenerateUUID() throws SvcLogicException
+    {
+        SliPluginUtils utils= new SliPluginUtils();
+        this.parameters.put("ctx-destination", "testDestination");
+        utils.generateUUID(this.parameters, ctx);
+    }
+    
+    @Test
+    public void testSubstring() throws SvcLogicException 
+    {
+        SliPluginUtils utils= new SliPluginUtils();
+        this.parameters.put("string", "testString");
+        this.parameters.put("begin-index", "1");
+        this.parameters.put("result", "testResult");
+        this.parameters.put("end-index", "5");
+        utils.substring(this.parameters, ctx);
+        assertEquals("estS",ctx.getAttribute("testResult"));
+    }
+    
+    @Test
+    public void testSubstringForNullEndIndex() throws SvcLogicException 
+    {
+        SliPluginUtils utils= new SliPluginUtils();
+        this.parameters.put("string", "testString");
+        this.parameters.put("begin-index", "1");
+        this.parameters.put("result", "testResult");
+        utils.substring(this.parameters, ctx);
+        assertEquals("estString",ctx.getAttribute("testResult"));
+    }
+    
+    @Test
+    public void testCtxBulkCopy()
+    {
+        ctx.setAttribute("Mykey1", "MyValue1");
+        ctx.setAttribute("Mykey2", "MyValue2");
+        SliPluginUtils.ctxBulkCopy(ctx, "Mykey", "test.");
+        assertEquals("MyValue1",ctx.getAttribute("test.1"));
+        assertEquals("MyValue2",ctx.getAttribute("test.2"));
+    }
 }

diff --git a/sliapi/features/ccsdk-sliapi/pom.xml b/sliapi/features/ccsdk-sliapi/pom.xml
index f4f6394..99d5973 100644 (file)
--- a/sliapi/features/ccsdk-sliapi/pom.xml
+++ b/sliapi/features/ccsdk-sliapi/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-sliapi</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
@@ -32,6 +32,22 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+            
                </dependencies>
        </dependencyManagement>
        

diff --git a/sliapi/features/features-sliapi/pom.xml b/sliapi/features/features-sliapi/pom.xml
index 8b0ffec..f907d54 100644 (file)
--- a/sliapi/features/features-sliapi/pom.xml
+++ b/sliapi/features/features-sliapi/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>feature-repo-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>features-sliapi</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index dd0c3bd..0f57723 100755 (executable)
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi-feature-aggregator</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index de5c6a6..5a60f1b 100755 (executable)
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
@@ -22,7 +22,27 @@
         <features.repositories>mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
-
+       <dependencyManagement>
+               <dependencies>
+               
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-common</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>sli-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
        <dependencies>
 
                <dependency>

diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index 594a6db..5a0c5e2 100755 (executable)
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi-model</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>bundle</packaging>
 
        <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>

diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index d59e72a..60dc94a 100755 (executable)
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -5,13 +5,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath/>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>sliapi</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: sliapi</name>

diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index bcd5853..280b213 100755 (executable)
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -6,17 +6,26 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>sliapi-provider</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
-
+    
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.ccsdk.sli.core</groupId>
+                               <artifactId>dblib-provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
 
     <dependencies>
         <dependency>
@@ -45,10 +54,12 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml
index 952e4ab..e530cdc 100644 (file)
--- a/utils/features/ccsdk-slicore-utils/pom.xml
+++ b/utils/features/ccsdk-slicore-utils/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-slicore-utils</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml
index 8f8748a..713ba4d 100644 (file)
--- a/utils/features/features-util/pom.xml
+++ b/utils/features/features-util/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-util</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index bac928a..dca1b80 100755 (executable)
--- a/utils/features/pom.xml
+++ b/utils/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index 3899272..473c4a5 100755 (executable)
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -7,13 +7,13 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
        <artifactId>utils-installer</artifactId>
-       <version>0.3.0-SNAPSHOT</version>
+       <version>0.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/utils/pom.xml b/utils/pom.xml
index 85206f8..cbdcdad 100755 (executable)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>utils</artifactId>
-   <version>0.3.0-SNAPSHOT</version>
+   <version>0.3.1-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: utils</name>

diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index 2698b39..678ce1b 100644 (file)
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-provider</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>

diff --git a/version.properties b/version.properties
index 4c1c6c6..407a30c 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
 
 release_name=0
 sprint_number=3
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}