diff options
author | Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-09-12 11:15:51 -0400 |
---|---|---|
committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-09-12 15:54:38 -0400 |
commit | 37a244dfa9b485c2832f1882930e0e67238f31fb (patch) | |
tree | b975bd78c48e78b3a76075b0bd47937b46c3f9d4 /blueprints-processor/adaptors | |
parent | b1dd3beda4b5aa750d7fc2e1bde3ab044b6bb056 (diff) |
Fix OSGi wiring issues
Change-Id: I84ee15ae657d6a8bb2902a785c119bc96f2674fd
Issue-ID: CCSDK-505
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'blueprints-processor/adaptors')
4 files changed, 20 insertions, 99 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);
}
|