Remove CloudHttpClient class

Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1528
Change-Id: I340d566913daaefb998482e4b097d5cc8b5eae14

4 files changed, 1 insertions, 365 deletions

diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
index 5e51b832..4d0d952c 100644
--- a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
+++ b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/AaiHttpClientFactory.java
@@ -20,8 +20,6 @@
 
 package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service;
 
-import io.vavr.control.Try;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.UUID;
 import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
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)));
     }
 }
diff --git a/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java b/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java
deleted file mode 100644
index f4efe1ab..00000000
--- a/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java
+++ /dev/null
@@ -1,220 +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 static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import io.netty.handler.codec.http.HttpResponseStatus;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.junit.jupiter.api.Test;
-import org.onap.dcaegen2.services.sdk.rest.services.model.DmaapModel;
-import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder;
-import org.onap.dcaegen2.services.sdk.rest.services.model.logging.ImmutableRequestDiagnosticContext;
-import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
-import reactor.core.publisher.Mono;
-import reactor.netty.DisposableServer;
-import reactor.netty.http.client.HttpClient;
-import reactor.netty.http.server.HttpServer;
-import reactor.netty.resources.ConnectionProvider;
-import reactor.test.StepVerifier;
-
-class CloudHttpClientIT {
-
-    private static final int MAX_CONNECTIONS = 1;
-    private static final String SAMPLE_STRING = "sampleString";
-    private static final String SAMPLE_URL = "/sampleURL";
-    private static final String JSON_BODY = "{\"correlationId\":\"NOKnhfsadhff\","
-            + "\"ipaddress-v4\":\"256.22.33.155\", "
-            + "\"ipaddress-v6\":\"200J:0db8:85a3:0000:0000:8a2e:0370:7334\"}";
-    private static final ConnectionProvider connectionProvider = ConnectionProvider.fixed("test", MAX_CONNECTIONS);
-
-    private final DmaapModel dmaapModel = mock(DmaapModel.class);
-    private final JsonBodyBuilder<DmaapModel> jsonBodyBuilder = mock(JsonBodyBuilder.class);
-
-    @Test
-    void successfulPatchResponse() {
-        DisposableServer server = createValidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpResponse> content = cloudHttpClient
-                .patch(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
-                        jsonBodyBuilder, dmaapModel);
-        HttpResponse httpClientResponse = content.block();
-
-        assertEquals(HttpResponseStatus.OK.code(), httpClientResponse.statusCode());
-        server.disposeNow();
-    }
-
-    @Test
-    void errorPatchRequest() {
-        DisposableServer server = createInvalidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpResponse> content = cloudHttpClient
-                .patch(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
-                        jsonBodyBuilder, dmaapModel);
-        HttpResponse httpClientResponse = content.block();
-
-        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), httpClientResponse.statusCode());
-        server.disposeNow();
-    }
-
-    @Test
-    void successfulPostResponse() {
-        DisposableServer server = createValidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpResponse> content = cloudHttpClient
-                .post(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
-                        jsonBodyBuilder, dmaapModel);
-        HttpResponse httpClientResponse = content.block();
-
-        assertEquals(HttpResponseStatus.OK.code(), httpClientResponse.statusCode());
-        server.disposeNow();
-    }
-
-    @Test
-    void errorPostRequest() {
-        DisposableServer server = createInvalidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpResponse> content = cloudHttpClient
-                .post(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
-                        jsonBodyBuilder, dmaapModel);
-        HttpResponse httpClientResponse = content.block();
-
-        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), httpClientResponse.statusCode());
-        server.disposeNow();
-    }
-
-    @Test
-    void successfulGetResponse() {
-        DisposableServer server = createValidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<String> content = cloudHttpClient.get(SAMPLE_URL, String.class);
-        Mono<String> contentWithHeaders = cloudHttpClient.get(SAMPLE_URL, createRequestDiagnosticContext(),
-                createCustomHeaders(), String.class);
-
-        StepVerifier.create(content)
-                .expectNext(SAMPLE_STRING)
-                .expectComplete()
-                .verify();
-        StepVerifier.create(contentWithHeaders)
-                .expectNext(SAMPLE_STRING)
-                .expectComplete()
-                .verify();
-        server.disposeNow();
-    }
-
-    @Test
-    void errorGetRequest() {
-        DisposableServer server = createInvalidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        Mono<String> content = cloudHttpClient.get(SAMPLE_URL, String.class);
-
-        StepVerifier.create(content)
-                .expectError()
-                .verify();
-        server.disposeNow();
-    }
-
-    @Test
-    void successfulPutResponse() {
-        DisposableServer server = createValidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpResponse> content = cloudHttpClient
-            .put(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
-                jsonBodyBuilder, dmaapModel);
-        HttpResponse httpClientResponse = content.block();
-
-        assertEquals(HttpResponseStatus.OK.code(), httpClientResponse.statusCode());
-        server.disposeNow();
-    }
-
-    @Test
-    void errorPutRequest() {
-        DisposableServer server = createInvalidServer();
-        RxHttpClient httpClient = createHttpClientForContextWithAddress(server);
-        CloudHttpClient cloudHttpClient = new CloudHttpClient(httpClient);
-
-        when(jsonBodyBuilder.createJsonBody(dmaapModel)).thenReturn(JSON_BODY);
-        Mono<HttpResponse> content = cloudHttpClient
-            .put(SAMPLE_URL, createRequestDiagnosticContext(), createCustomHeaders(),
-                jsonBodyBuilder, dmaapModel);
-        HttpResponse httpClientResponse = content.block();
-
-        assertEquals(HttpResponseStatus.INTERNAL_SERVER_ERROR.code(), httpClientResponse.statusCode());
-        server.disposeNow();
-    }
-
-    private Map<String, String> createCustomHeaders() {
-        Map<String, String> customHeaders = new HashMap<>();
-        customHeaders.put("X_INVOCATION_ID", UUID.randomUUID().toString());
-        return customHeaders;
-    }
-
-    private DisposableServer createValidServer() {
-        Mono<String> response = Mono.just(SAMPLE_STRING);
-        return HttpServer.create()
-                .handle((req, resp) -> resp.sendString(response))
-                .wiretap(true)
-                .bindNow();
-    }
-
-    private DisposableServer createInvalidServer() {
-        return HttpServer.create()
-                .handle((req, resp) -> Mono.error(new Exception("returnError")))
-                .wiretap(true)
-                .bindNow();
-    }
-
-    private RequestDiagnosticContext createRequestDiagnosticContext() {
-        return ImmutableRequestDiagnosticContext.builder()
-                .invocationId(UUID.randomUUID()).requestId(UUID.randomUUID()).build();
-    }
-
-    private RxHttpClient createHttpClientForContextWithAddress(DisposableServer disposableServer) {
-        HttpClient client = HttpClient.create(connectionProvider)
-                .addressSupplier(disposableServer::address)
-                .wiretap(true);
-        return new RxHttpClient(client);
-    }
-}
\ No newline at end of file