Fix OSGi wiring issues

Change-Id: I84ee15ae657d6a8bb2902a785c119bc96f2674fd
Issue-ID: CCSDK-505
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

8 files changed, 121 insertions, 198 deletions

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index 4fdf824ba..f328ea954 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -61,18 +61,12 @@
         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-context</artifactId>

-            <version>4.2.9.RELEASE</version>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-beans</artifactId>

-            <version>4.2.9.RELEASE</version>

-            <scope>compile</scope>

+            <version>${spring.version}</version>
         </dependency>

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-jdbc</artifactId>

-            <version>4.2.9.RELEASE</version>

+            <version>${spring.version}</version>
         </dependency>

         <dependency>

             <groupId>com.att.eelf</groupId>

@@ -82,7 +76,7 @@
         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-test</artifactId>

-            <version>4.2.9.RELEASE</version>

+            <version>${spring.version}</version>
             <scope>test</scope>

         </dependency>

         <dependency>

@@ -115,7 +109,8 @@
                 <extensions>true</extensions>

                 <configuration>

                     <instructions>

-                        <Bundle-SymbolicName>org.onap.ccsdk.config.data.adaptor</Bundle-SymbolicName>

+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.onap.ccsdk.config.data.adaptor,

                             org.onap.ccsdk.config.data.adaptor.dao,

                             org.onap.ccsdk.config.data.adaptor.db,

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 74175ca2e..ee5f9f675 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -48,68 +48,23 @@
         </dependency>

         <dependency>

             <groupId>com.fasterxml.jackson.core</groupId>

-            <artifactId>jackson-annotations</artifactId>

-            <version>${jackson.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>com.fasterxml.jackson.core</groupId>

             <artifactId>jackson-core</artifactId>

             <version>${jackson.version}</version>

         </dependency>

         <dependency>

-            <groupId>com.fasterxml.jackson.dataformat</groupId>

-            <artifactId>jackson-dataformat-xml</artifactId>

-            <version>${jackson.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>com.fasterxml.jackson.dataformat</groupId>

-            <artifactId>jackson-dataformat-yaml</artifactId>

-            <version>${jackson.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>com.fasterxml.jackson.module</groupId>

-            <artifactId>jackson-module-jsonSchema</artifactId>

-            <version>${jackson.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.yaml</groupId>

-            <artifactId>snakeyaml</artifactId>

-            <version>1.17</version>

-        </dependency>

-        <dependency>

-            <groupId>org.json</groupId>

-            <artifactId>json</artifactId>

-            <version>${org.json.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>com.jayway.jsonpath</groupId>

-            <artifactId>json-path</artifactId>

-            <version>2.3.0</version>

-        </dependency>

-        <dependency>

-            <groupId>commons-collections</groupId>

-            <artifactId>commons-collections</artifactId>

-            <version>3.2.2</version>

-        </dependency>

-        <dependency>

-            <groupId>commons-io</groupId>

-            <artifactId>commons-io</artifactId>

-            <version>2.5</version>

-        </dependency>

-        <dependency>

             <groupId>org.apache.httpcomponents</groupId>

-            <artifactId>httpclient-osgi</artifactId>

-            <version>4.5.6</version>

+            <artifactId>httpcore</artifactId>
+            <version>${apache.httpcomponents.core.version}</version>
         </dependency>

         <dependency>

             <groupId>org.apache.httpcomponents</groupId>

-            <artifactId>httpcore-osgi</artifactId>

-            <version>4.4.10</version>

+            <artifactId>httpclient</artifactId>
+            <version>${apache.httpcomponents.client.version}</version>
         </dependency>

         <dependency>

             <groupId>org.springframework</groupId>

             <artifactId>spring-web</artifactId>

-            <version>4.2.9.RELEASE</version>

+            <version>${spring.version}</version>
         </dependency>

         <dependency>

             <groupId>com.att.eelf</groupId>

@@ -117,41 +72,11 @@
             <version>${eelf.version}</version>

         </dependency>

         <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-test</artifactId>

-            <version>4.2.9.RELEASE</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

             <groupId>junit</groupId>

             <artifactId>junit</artifactId>

             <version>${junit.version}</version>

             <scope>test</scope>

         </dependency>

-        <dependency>

-            <groupId>org.powermock</groupId>

-            <artifactId>powermock-api-mockito</artifactId>

-            <version>1.6.6</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.powermock</groupId>

-            <artifactId>powermock-module-junit4</artifactId>

-            <version>1.6.6</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.powermock</groupId>

-            <artifactId>powermock-core</artifactId>

-            <version>1.6.6</version>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.powermock</groupId>

-            <artifactId>powermock-api-support</artifactId>

-            <version>1.6.6</version>

-            <scope>test</scope>

-        </dependency>

     </dependencies>

 

     <build>

@@ -170,7 +95,8 @@
                 <extensions>true</extensions>

                 <configuration>

                     <instructions>

-                        <Bundle-SymbolicName>org.onap.ccsdk.config.rest.adaptor</Bundle-SymbolicName>

+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.onap.ccsdk.config.rest.adaptor,

                             org.onap.ccsdk.config.rest.adaptor.data,

                             org.onap.ccsdk.config.rest.adaptor.service,

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
index 97302620e..7829ee6a8 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/service/AbstractConfigRestClientAdapter.java
@@ -147,8 +147,8 @@ abstract class AbstractConfigRestClientAdapter implements ConfigRestClientServic
 

     public <T> T exchangeResource(HttpHeaders headers, String url, Object request, Class<T> responseType, String method)

             throws ConfigRestAdaptorException {

-        ResponseEntity<T> response = exchangeForEntity(headers, url, HttpMethod.resolve(method), request, responseType);

-        return processResponse(response, url, HttpMethod.resolve(method));

+        ResponseEntity<T> response = exchangeForEntity(headers, url, HttpMethod.valueOf(method), request, responseType);
+        return processResponse(response, url, HttpMethod.valueOf(method));
     }

 

     public RestResponse getResource(HttpHeaders headers, String url) throws ConfigRestAdaptorException {

@@ -162,7 +162,7 @@ abstract class AbstractConfigRestClientAdapter implements ConfigRestClientServic
 

     public RestResponse exchangeResource(HttpHeaders headers, String url, Object request, String method)

             throws ConfigRestAdaptorException {

-        return exchangeForEntity(headers, url, HttpMethod.resolve(method), request);

+        return exchangeForEntity(headers, url, HttpMethod.valueOf(method), request);
     }

 

     private RestResponse exchangeForEntity(HttpHeaders headers, String url, HttpMethod httpMethod, Object request)

diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
index 2318fd6ca..b28c2c1a1 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/java/org/onap/ccsdk/config/rest/adaptor/utils/BasicAuthorizationInterceptor.java
@@ -1,13 +1,13 @@
 /*

  * Copyright © 2017-2018 AT&T Intellectual Property.

  * Modifications Copyright © 2018 IBM.

- * 

+ *
  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *
  * http://www.apache.org/licenses/LICENSE-2.0

- * 

+ *
  * Unless required by applicable law or agreed to in writing, software

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -19,12 +19,12 @@ package org.onap.ccsdk.config.rest.adaptor.utils;
 

 import java.io.IOException;

 import java.nio.charset.Charset;

+import java.util.Base64;
 import org.springframework.http.HttpRequest;

 import org.springframework.http.client.ClientHttpRequestExecution;

 import org.springframework.http.client.ClientHttpRequestInterceptor;

 import org.springframework.http.client.ClientHttpResponse;

 import org.springframework.util.Assert;

-import org.springframework.util.Base64Utils;

 

 public class BasicAuthorizationInterceptor implements ClientHttpRequestInterceptor {

     private static final Charset UTF_8 = Charset.forName("UTF-8");

@@ -49,7 +49,7 @@ public class BasicAuthorizationInterceptor implements ClientHttpRequestIntercept
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)

             throws IOException {

 

-        String token = Base64Utils.encodeToString((this.username + ":" + this.pass).getBytes(UTF_8));

+        String token = Base64.getEncoder().encodeToString((this.username + ":" + this.pass).getBytes(UTF_8));
         request.getHeaders().add("Authorization", "Basic " + token);

         return execution.execute(request, body);

     }

diff --git a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
index 125012e7c..4f396b714 100644
--- a/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
+++ b/blueprints-processor/features/ccsdk-blueprints-processor/pom.xml
@@ -32,17 +32,6 @@
 
     <name>Blueprints Processor :: Features :: ${project.artifactId}</name>
 
-    <properties>
-        <common.collections.version>3.2.2</common.collections.version>
-        <common.io.version>2.5</common.io.version>
-        <snakeyaml.version>1.12</snakeyaml.version>
-        <velocity.version>1.7</velocity.version>
-        <jsonpath.version>2.3.0</jsonpath.version>
-        <json-smart.version>2.3</json-smart.version>
-        <accessors-smart.version>1.2</accessors-smart.version>
-        <jsch.version>0.1.54</jsch.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -84,90 +73,25 @@
             <version>${project.version}</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.jcraft</groupId>-->
-            <!--<artifactId>jsch</artifactId>-->
-            <!--<version>${jsch.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.jayway.jsonpath</groupId>-->
-            <!--<artifactId>json-path</artifactId>-->
-            <!--<version>${jsonpath.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.json</groupId>-->
-            <!--<artifactId>json</artifactId>-->
-            <!--<version>${org.json.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.yaml</groupId>-->
-            <!--<artifactId>snakeyaml</artifactId>-->
-            <!--<version>${snakeyaml.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.velocity</groupId>-->
-            <!--<artifactId>velocity</artifactId>-->
-            <!--<version>${velocity.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>commons-io</groupId>-->
-            <!--<artifactId>commons-io</artifactId>-->
-            <!--<version>${common.io.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>net.minidev</groupId>-->
-            <!--<artifactId>json-smart</artifactId>-->
-            <!--<version>2.3</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>net.minidev</groupId>-->
-            <!--<artifactId>accessors-smart</artifactId>-->
-            <!--<version>1.2</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.commons</groupId>-->
-            <!--<artifactId>commons-lang3</artifactId>-->
-            <!--<version>${commons.lang3.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>commons-collections</groupId>-->
-            <!--<artifactId>commons-collections</artifactId>-->
-            <!--<version>${common.collections.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
-            <!--<artifactId>jackson-databind</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
-            <!--<artifactId>jackson-annotations</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
-            <!--<artifactId>jackson-core</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
-            <!--<artifactId>jackson-dataformat-xml</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.module</groupId>-->
-            <!--<artifactId>jackson-module-jaxb-annotations</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.dataformat</groupId>-->
-            <!--<artifactId>jackson-dataformat-yaml</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>com.fasterxml.jackson.module</groupId>-->
-            <!--<artifactId>jackson-module-jsonSchema</artifactId>-->
-            <!--<version>${jackson.version}</version>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index e1070672c..4f6b2936e 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -42,6 +42,26 @@
             <version>${project.version}</version>

         </dependency>

         <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jsonSchema</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>

             <artifactId>junit</artifactId>

             <version>${junit.version}</version>

@@ -83,7 +103,8 @@
                 <extensions>true</extensions>

                 <configuration>

                     <instructions>

-                        <Bundle-SymbolicName>org.onap.ccsdk.config.assignment</Bundle-SymbolicName>

+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.onap.ccsdk.config.assignment,

                             org.onap.ccsdk.config.assignment.data,

                             org.onap.ccsdk.config.assignment.service,

diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index 106a43f37..006e378a2 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -42,6 +42,31 @@
             <version>${project.version}</version>

         </dependency>

         <dependency>

+            <groupId>org.onap.ccsdk.features</groupId>

+            <artifactId>blueprints-data-adaptor-provider</artifactId>

+            <version>${project.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>

+            <artifactId>jackson-core</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>

+            <artifactId>jackson-databind</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>

+            <artifactId>jackson-annotations</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.module</groupId>

+            <artifactId>jackson-module-jsonSchema</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

             <groupId>commons-io</groupId>

             <artifactId>commons-io</artifactId>

             <version>2.5</version>

@@ -80,7 +105,8 @@
                 <extensions>true</extensions>

                 <configuration>

                     <instructions>

-                        <Bundle-SymbolicName>org.onap.ccsdk.config.generator</Bundle-SymbolicName>

+                        <Bundle-Name>${project.artifactId}</Bundle-Name>

+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>

                         <Export-Package>

                             org.onap.ccsdk.config.generator,

                             org.onap.ccsdk.config.generator.data,

diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 35264730d..e548c2e2e 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -37,6 +37,31 @@
 

     <dependencies>

         <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>

+            <artifactId>jackson-core</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>

+            <artifactId>jackson-databind</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.core</groupId>

+            <artifactId>jackson-annotations</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.fasterxml.jackson.module</groupId>

+            <artifactId>jackson-module-jsonSchema</artifactId>

+            <version>${jackson.version}</version>

+        </dependency>

+        <dependency>

+            <groupId>com.jayway.jsonpath</groupId>

+            <artifactId>json-path</artifactId>

+            <version>2.3.0</version>

+        </dependency>

+        <dependency>

             <groupId>org.onap.ccsdk.features</groupId>

             <artifactId>blueprints-rest-adaptor-provider</artifactId>

             <version>${project.version}</version>

@@ -70,6 +95,11 @@
             <version>${junit.version}</version>

             <scope>test</scope>

         </dependency>

+        <dependency>

+            <groupId>commons-collections</groupId>

+            <artifactId>commons-collections</artifactId>

+            <version>3.2.2</version>

+        </dependency>

     </dependencies>

 

     <build>

@@ -88,7 +118,8 @@
                 <extensions>true</extensions>

                 <configuration>

                     <instructions>

-                        <Bundle-SymbolicName>org.onap.ccsdk.config.model</Bundle-SymbolicName>

+                        <Bundle-Name>${project.artifactId}</Bundle-Name>

+                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>

                         <Export-Package>org.onap.ccsdk.config.model,

                             org.onap.ccsdk.config.model.data,

                             org.onap.ccsdk.config.model.data.api,