From 37a244dfa9b485c2832f1882930e0e67238f31fb Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Wed, 12 Sep 2018 11:15:51 -0400 Subject: Fix OSGi wiring issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I84ee15ae657d6a8bb2902a785c119bc96f2674fd Issue-ID: CCSDK-505 Signed-off-by: Alexis de Talhouët --- .../rest/adaptor/service/AbstractConfigRestClientAdapter.java | 6 +++--- .../rest/adaptor/utils/BasicAuthorizationInterceptor.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'blueprints-processor/adaptors/rest-adaptor-provider/src') 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 exchangeResource(HttpHeaders headers, String url, Object request, Class responseType, String method) throws ConfigRestAdaptorException { - ResponseEntity response = exchangeForEntity(headers, url, HttpMethod.resolve(method), request, responseType); - return processResponse(response, url, HttpMethod.resolve(method)); + ResponseEntity 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); } -- cgit 1.2.3-korg