diff options
author | Jakub Dudycz <jakub.dudycz@nokia.com> | 2019-05-23 15:48:40 +0200 |
---|---|---|
committer | Jakub Dudycz <jakub.dudycz@nokia.com> | 2019-05-23 15:48:40 +0200 |
commit | 2668ca2fd0029fe0946f8148882f93c3bfaab466 (patch) | |
tree | e13490b2dc0a435f8784b611ad78d9417b511a0d /rest-services/http-client/src/main | |
parent | e6b79a67b2ad6e60e17a4f0e88a162e31a599870 (diff) |
Remove CloudHttpClient class
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1528
Change-Id: I340d566913daaefb998482e4b097d5cc8b5eae14
Diffstat (limited to 'rest-services/http-client/src/main')
2 files changed, 1 insertions, 143 deletions
diff --git a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClient.java b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClient.java deleted file mode 100644 index 77f3811e..00000000 --- a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClient.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * ============LICENSE_START==================================== - * DCAEGEN2-SERVICES-SDK - * ========================================================= - * Copyright (C) 2019 Nokia. All rights reserved. - * ========================================================= - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END===================================== - */ - -package org.onap.dcaegen2.services.sdk.rest.services.adapters.http; - -import com.google.gson.Gson; -import io.netty.handler.ssl.SslContext; -import io.vavr.collection.HashMap; -import java.util.Collections; -import java.util.Map; -import org.onap.dcaegen2.services.sdk.rest.services.model.ClientModel; -import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder; -import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import reactor.core.publisher.Mono; - -/** - * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 11/15/18 - * @deprecated use {@link RxHttpClient} instead - */ -@Deprecated -public class CloudHttpClient { - - private static final Logger LOGGER = LoggerFactory.getLogger(CloudHttpClient.class); - private final Gson gson = new Gson(); - private final RxHttpClient httpClient; - - CloudHttpClient(RxHttpClient httpClient) { - this.httpClient = httpClient; - } - - public CloudHttpClient() { - this(RxHttpClientFactory.create()); - } - - public CloudHttpClient(SslContext sslContext) { - this(RxHttpClientFactory.create(sslContext)); - } - - public <T> Mono<T> get(String url, Class<T> bodyClass) { - return get(url, RequestDiagnosticContext.create(), bodyClass); - } - - public <T> Mono<T> get(String url, RequestDiagnosticContext context, Class<T> bodyClass) { - return get(url, context, Collections.emptyMap(), bodyClass); - } - - public Mono<HttpResponse> get( - String url, - RequestDiagnosticContext context, - Map<String, String> customHeaders) { - return httpClient.call( - ImmutableHttpRequest.builder() - .method(HttpMethod.GET) - .url(url) - .customHeaders(HashMap.ofAll(customHeaders)) - .diagnosticContext(context) - .build()); - } - - public <T> Mono<T> get( - String url, - RequestDiagnosticContext context, - Map<String, String> customHeaders, - Class<T> bodyClass) { - return get(url, context, customHeaders) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString) - .map(body -> gson.fromJson(body, bodyClass)); - } - - - public Mono<HttpResponse> post( - String url, - RequestDiagnosticContext context, - Map<String, String> customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel) { - return callForRawResponse(url, context, customHeaders, jsonBodyBuilder, clientModel, HttpMethod.POST); - } - - public Mono<HttpResponse> patch( - String url, - RequestDiagnosticContext context, - Map<String, String> customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel) { - return callForRawResponse(url, context, customHeaders, jsonBodyBuilder, clientModel, HttpMethod.PATCH); - } - - public Mono<HttpResponse> put( - String url, - RequestDiagnosticContext context, - Map<String, String> customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel) { - return callForRawResponse(url, context, customHeaders, jsonBodyBuilder, clientModel, HttpMethod.PUT); - } - - private Mono<HttpResponse> callForRawResponse( - String url, - RequestDiagnosticContext context, - Map<String, String> customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel, - HttpMethod method) { - - String jsonBody = jsonBodyBuilder.createJsonBody(clientModel); - LOGGER.debug("CloudHttpClient JSon body:: {}", jsonBody); - LOGGER.debug("CloudHttpClient url: {}", url); - LOGGER.debug("CloudHttpClient customHeaders: {}", customHeaders); - - return httpClient.call( - ImmutableHttpRequest.builder() - .url(url) - .customHeaders(HashMap.ofAll(customHeaders)) - .diagnosticContext(context) - .body(RequestBody.fromString(jsonBody)) - .method(method) - .build()); - } -} - diff --git a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientFactory.java b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientFactory.java index cfa98f22..1453adb9 100644 --- a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientFactory.java +++ b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientFactory.java @@ -52,8 +52,7 @@ public final class RxHttpClientFactory { return create(context); } - // TODO: make it private after removing CloudHttpClient - static RxHttpClient create(@NotNull SslContext sslContext) { + private static RxHttpClient create(@NotNull SslContext sslContext) { return new RxHttpClient(HttpClient.create().secure(sslContextSpec -> sslContextSpec.sslContext(sslContext))); } } |