From b1e0ceb789a9c0781bb3b97d4b1ff0e75396fd29 Mon Sep 17 00:00:00 2001 From: Piotr Jaszczyk Date: Wed, 8 May 2019 14:52:24 +0200 Subject: Release DMaaP client API * remove @ExperimentalApi annotation * deprecate old API * extract http-client module + refactor * change DmaapClientFactory so it's more configurable Change-Id: I710d20558eece8cc3d7c0740e765d34737134b3a Issue-ID: DCAEGEN2-1492 Signed-off-by: Piotr Jaszczyk --- .../services/adapters/http/CloudHttpClient.java | 141 ------------- .../rest/services/adapters/http/HttpHeaders.java | 34 ---- .../rest/services/adapters/http/HttpMethod.java | 48 ----- .../rest/services/adapters/http/HttpRequest.java | 59 ------ .../rest/services/adapters/http/HttpResponse.java | 77 ------- .../services/adapters/http/NettyHttpResponse.java | 73 ------- .../rest/services/adapters/http/RequestBody.java | 77 ------- .../rest/services/adapters/http/RxHttpClient.java | 123 ------------ .../adapters/http/exceptions/HttpException.java | 45 ----- .../adapters/http/test/DummyHttpServer.java | 88 -------- .../model/logging/RequestDiagnosticContext.java | 6 + .../services/adapters/http/CloudHttpClientIT.java | 221 --------------------- .../services/adapters/http/RxHttpClientIT.java | 161 --------------- 13 files changed, 6 insertions(+), 1147 deletions(-) delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClient.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpMethod.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpRequest.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpResponse.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/NettyHttpResponse.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RequestBody.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/exceptions/HttpException.java delete mode 100644 rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/test/DummyHttpServer.java delete mode 100644 rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java delete mode 100644 rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java (limited to 'rest-services/common-dependency') diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClient.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClient.java deleted file mode 100644 index 7b87511b..00000000 --- a/rest-services/common-dependency/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 Przemysław Wąsala 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(RxHttpClient.create()); - } - - public CloudHttpClient(SslContext sslContext) { - this(RxHttpClient.create(sslContext)); - } - - public Mono get(String url, Class bodyClass) { - return get(url, RequestDiagnosticContext.create(), bodyClass); - } - - public Mono get(String url, RequestDiagnosticContext context, Class bodyClass) { - return get(url, context, Collections.emptyMap(), bodyClass); - } - - public Mono get( - String url, - RequestDiagnosticContext context, - Map customHeaders) { - return httpClient.call( - ImmutableHttpRequest.builder() - .method(HttpMethod.GET) - .url(url) - .customHeaders(HashMap.ofAll(customHeaders)) - .diagnosticContext(context) - .build()); - } - - public Mono get( - String url, - RequestDiagnosticContext context, - Map customHeaders, - Class bodyClass) { - return get(url, context, customHeaders) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString) - .map(body -> gson.fromJson(body, bodyClass)); - } - - - public Mono post( - String url, - RequestDiagnosticContext context, - Map customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel) { - return callForRawResponse(url, context, customHeaders, jsonBodyBuilder, clientModel, HttpMethod.POST); - } - - public Mono patch( - String url, - RequestDiagnosticContext context, - Map customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel) { - return callForRawResponse(url, context, customHeaders, jsonBodyBuilder, clientModel, HttpMethod.PATCH); - } - - public Mono put( - String url, - RequestDiagnosticContext context, - Map customHeaders, - JsonBodyBuilder jsonBodyBuilder, - ClientModel clientModel) { - return callForRawResponse(url, context, customHeaders, jsonBodyBuilder, clientModel, HttpMethod.PUT); - } - - private Mono callForRawResponse( - String url, - RequestDiagnosticContext context, - Map 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/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java deleted file mode 100644 index 4ef43a59..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java +++ /dev/null @@ -1,34 +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; - -/** - * @author Piotr Jaszczyk - * @since April 2019 - */ -public final class HttpHeaders { - - private HttpHeaders() { - } - - public static final String CONTENT_TYPE = "Content-Type"; - public static final String CONTENT_LENGTH = "Content-Length"; -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpMethod.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpMethod.java deleted file mode 100644 index 78e6789e..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpMethod.java +++ /dev/null @@ -1,48 +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; - -/** - * @author Piotr Jaszczyk - * @since March 2019 - */ -public enum HttpMethod { - - CONNECT(io.netty.handler.codec.http.HttpMethod.CONNECT), - DELETE(io.netty.handler.codec.http.HttpMethod.DELETE), - GET(io.netty.handler.codec.http.HttpMethod.GET), - HEAD(io.netty.handler.codec.http.HttpMethod.HEAD), - OPTIONS(io.netty.handler.codec.http.HttpMethod.OPTIONS), - POST(io.netty.handler.codec.http.HttpMethod.POST), - PATCH(io.netty.handler.codec.http.HttpMethod.PATCH), - PUT(io.netty.handler.codec.http.HttpMethod.PUT), - TRACE(io.netty.handler.codec.http.HttpMethod.TRACE); - - private final io.netty.handler.codec.http.HttpMethod nettyMethod; - - HttpMethod(io.netty.handler.codec.http.HttpMethod nettyMethod) { - this.nettyMethod = nettyMethod; - } - - io.netty.handler.codec.http.HttpMethod asNetty() { - return nettyMethod; - } -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpRequest.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpRequest.java deleted file mode 100644 index 33060c9f..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpRequest.java +++ /dev/null @@ -1,59 +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 io.vavr.collection.HashMap; -import io.vavr.collection.Map; -import org.immutables.value.Value; -import org.jetbrains.annotations.Nullable; -import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; - -/** - * @author Piotr Jaszczyk - * @since March 2019 - */ -@Value.Immutable -public interface HttpRequest { - - String url(); - - HttpMethod method(); - - @Nullable RequestBody body(); - - @Value.Default - default RequestDiagnosticContext diagnosticContext() { - return RequestDiagnosticContext.create(); - } - - @Value.Default - default Map customHeaders() { - return HashMap.empty(); - } - - @Value.Derived - default Map headers() { - final RequestDiagnosticContext ctx = diagnosticContext(); - return ctx == null - ? customHeaders() - : customHeaders().merge(ctx.remoteCallHttpHeaders()); - } -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpResponse.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpResponse.java deleted file mode 100644 index ce100478..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpResponse.java +++ /dev/null @@ -1,77 +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 java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import org.immutables.value.Value; -import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.exceptions.HttpException; - -/** - * @author Piotr Jaszczyk - * @since March 2019 - */ -@Value.Immutable -public interface HttpResponse { - - String url(); - - int statusCode(); - - byte[] rawBody(); - - @Value.Default - default String statusReason() { - return ""; - } - - @Value.Derived - default boolean successful() { - return statusCode() >= 200 && statusCode() < 300; - } - - @Value.Derived - default String bodyAsString() { - return bodyAsString(StandardCharsets.UTF_8); - } - - @Value.Derived - default String bodyAsString(Charset charset) { - return new String(rawBody(), charset); - } - - @Value.Derived - default T bodyAsJson(Class clazz) { - return bodyAsJson(StandardCharsets.UTF_8, new Gson(), clazz); - } - - @Value.Derived - default T bodyAsJson(Charset charset, Gson gson, Class clazz) { - return gson.fromJson(bodyAsString(charset), clazz); - } - - default void throwIfUnsuccessful() { - if (!successful()) { - throw new HttpException(url(), statusCode(), statusReason()); - } - } -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/NettyHttpResponse.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/NettyHttpResponse.java deleted file mode 100644 index 3dcd7098..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/NettyHttpResponse.java +++ /dev/null @@ -1,73 +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 io.netty.handler.codec.http.HttpResponseStatus; -import io.netty.handler.codec.http.HttpStatusClass; -import java.nio.charset.Charset; - -/** - * @author Piotr Jaszczyk - * @since March 2019 - */ -class NettyHttpResponse implements HttpResponse { - - private final String url; - private final HttpResponseStatus status; - private final byte[] body; - - NettyHttpResponse(String url, HttpResponseStatus status, byte[] body) { - this.url = url; - this.status = status; - this.body = body; - } - - @Override - public String url() { - return url; - } - - @Override - public boolean successful() { - return status.codeClass() == HttpStatusClass.SUCCESS; - } - - @Override - public int statusCode() { - return status.code(); - } - - @Override - public String statusReason() { - return status.reasonPhrase(); - } - - @Override - public byte[] rawBody() { - return new byte[0]; - } - - @Override - public String bodyAsString(Charset charset) { - return new String(body, charset); - } - -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RequestBody.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RequestBody.java deleted file mode 100644 index ed218887..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RequestBody.java +++ /dev/null @@ -1,77 +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.JsonElement; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.Unpooled; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import org.immutables.value.Value; -import org.jetbrains.annotations.Nullable; -import org.reactivestreams.Publisher; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.netty.ByteBufFlux; - -/** - * @author Piotr Jaszczyk - * @since March 2019 - */ -@Value.Immutable -public interface RequestBody { - - Publisher contents(); - - @Nullable Integer length(); - - static RequestBody chunkedFromString(Publisher contents) { - return chunkedFromString(contents, StandardCharsets.UTF_8); - } - - static RequestBody chunkedFromString(Publisher contents, Charset charset) { - return ImmutableRequestBody.builder() - .length(null) - .contents(ByteBufFlux.fromString(contents, charset, ByteBufAllocator.DEFAULT)) - .build(); - } - - static RequestBody fromString(String contents) { - return fromString(contents, StandardCharsets.UTF_8); - } - - static RequestBody fromString(String contents, Charset charset) { - ByteBuf encodedContents = ByteBufAllocator.DEFAULT.buffer(); - encodedContents.writeCharSequence(contents, charset); - - return ImmutableRequestBody.builder() - .length(encodedContents.readableBytes()) - .contents(Mono.just(encodedContents.retain())) - .build(); - } - - static RequestBody fromJson(JsonElement contents) { - return fromString(contents.toString()); - } - -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java deleted file mode 100644 index 3c010ef2..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java +++ /dev/null @@ -1,123 +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 io.netty.handler.ssl.SslContext; -import io.vavr.collection.Stream; -import java.util.stream.Collectors; -import org.jetbrains.annotations.NotNull; -import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import reactor.core.publisher.Mono; -import reactor.netty.http.client.HttpClient; -import reactor.netty.http.client.HttpClient.ResponseReceiver; -import reactor.netty.http.client.HttpClientRequest; -import reactor.netty.http.client.HttpClientResponse; - -/** - * @since 1.1.4 - */ -public class RxHttpClient { - - private static final Logger LOGGER = LoggerFactory.getLogger(RxHttpClient.class); - private final HttpClient httpClient; - - public static RxHttpClient create() { - return new RxHttpClient(HttpClient.create()); - } - - // TODO: hide netty from public api (io.netty.handler.ssl.SslContext) - public static RxHttpClient create(@NotNull - SslContext sslContext) { - return new RxHttpClient(HttpClient.create().secure(sslContextSpec -> sslContextSpec.sslContext(sslContext))); - } - - RxHttpClient(HttpClient httpClient) { - this.httpClient = httpClient; - } - - public Mono call(HttpRequest request) { - return prepareRequest(request) - .responseSingle((resp, content) -> - content.asByteArray() - .defaultIfEmpty(new byte[0]) - .map(bytes -> new NettyHttpResponse(request.url(), resp.status(), bytes))); - } - - ResponseReceiver prepareRequest(HttpRequest request) { - final HttpClient theClient = httpClient - .doOnRequest((req, conn) -> logRequest(request.diagnosticContext(), req)) - .doOnResponse((rsp, conn) -> logResponse(request.diagnosticContext(), rsp)) - .headers(hdrs -> request.headers().forEach(hdr -> hdrs.set(hdr._1, hdr._2))); - - return prepareBody(request, theClient); - } - - private ResponseReceiver prepareBody(HttpRequest request, HttpClient theClient) { - if (request.body() == null) { - return prepareBodyWithoutContents(request, theClient); - } else { - return request.body().length() == null - ? prepareBodyChunked(request, theClient) - : prepareBodyUnchunked(request, theClient); - } - } - - private ResponseReceiver prepareBodyChunked(HttpRequest request, HttpClient theClient) { - return theClient - .chunkedTransfer(true) - .request(request.method().asNetty()) - .send(request.body().contents()) - .uri(request.url()); - } - - private ResponseReceiver prepareBodyUnchunked(HttpRequest request, HttpClient theClient) { - return theClient - .headers(hdrs -> hdrs.set(HttpHeaders.CONTENT_LENGTH, request.body().length().toString())) - .request(request.method().asNetty()) - .send(request.body().contents()) - .uri(request.url()); - } - - private ResponseReceiver prepareBodyWithoutContents(HttpRequest request, HttpClient theClient) { - return theClient - .request(request.method().asNetty()) - .uri(request.url()); - } - - private void logRequest(RequestDiagnosticContext context, HttpClientRequest httpClientRequest) { - context.withSlf4jMdc(LOGGER.isDebugEnabled(), () -> { - LOGGER.debug("Request: {} {} {}", httpClientRequest.method(), httpClientRequest.uri(), - httpClientRequest.requestHeaders()); - if (LOGGER.isTraceEnabled()) { - final String headers = Stream.ofAll(httpClientRequest.requestHeaders()) - .map(entry -> entry.getKey() + "=" + entry.getValue()) - .collect(Collectors.joining("\n")); - LOGGER.trace(headers); - } - }); - } - - private void logResponse(RequestDiagnosticContext context, HttpClientResponse httpClientResponse) { - context.withSlf4jMdc(LOGGER.isDebugEnabled(), - () -> LOGGER.debug("Response status: {}", httpClientResponse.status())); - } -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/exceptions/HttpException.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/exceptions/HttpException.java deleted file mode 100644 index 9631f4c5..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/exceptions/HttpException.java +++ /dev/null @@ -1,45 +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.exceptions; - -/** - * @author Piotr Jaszczyk - * @since March 2019 - */ -public class HttpException extends RuntimeException { - - private final String url; - private final int responseCode; - private final String reason; - - public HttpException(String url, int responseCode, String reason) { - this.url = url; - this.responseCode = responseCode; - this.reason = reason; - } - - @Override - public String getMessage() { - return String.format("Request failed for URL '%s'. Response code: %d %s", - url, - responseCode, - reason); - } -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/test/DummyHttpServer.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/test/DummyHttpServer.java deleted file mode 100644 index e565c786..00000000 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/test/DummyHttpServer.java +++ /dev/null @@ -1,88 +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.test; - -import io.vavr.CheckedFunction0; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.function.Consumer; -import org.reactivestreams.Publisher; -import reactor.core.publisher.Mono; -import reactor.netty.DisposableServer; -import reactor.netty.http.server.HttpServer; -import reactor.netty.http.server.HttpServerResponse; -import reactor.netty.http.server.HttpServerRoutes; - -/** - * @author Piotr Jaszczyk - * @since February 2019 - */ -public class DummyHttpServer { - - private final DisposableServer server; - - private DummyHttpServer(DisposableServer server) { - this.server = server; - } - - public static DummyHttpServer start(Consumer routes) { - return new DummyHttpServer(HttpServer.create() - .host("127.0.0.1") - .route(routes) - .bind() - .block()); - } - - public static Publisher sendResource(HttpServerResponse httpServerResponse, String resourcePath) { - return sendString(httpServerResponse, Mono.fromCallable(() -> readResource(resourcePath))); - } - - public static Publisher sendString(HttpServerResponse httpServerResponse, Publisher content) { - return httpServerResponse.sendString(content); - } - - public void close() { - server.disposeNow(); - } - - public String host() { - return server.host(); - } - - public int port() { - return server.port(); - } - - private static String readResource(String resourcePath) { - try { - return CheckedFunction0.constant(resourcePath) - .andThen(DummyHttpServer.class::getResource) - .andThen(URL::toURI) - .andThen(Paths::get) - .andThen(Files::readAllBytes) - .andThen(String::new) - .apply(); - } catch (Throwable throwable) { - throw new RuntimeException(throwable); - } - } -} diff --git a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/model/logging/RequestDiagnosticContext.java b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/model/logging/RequestDiagnosticContext.java index 97269064..0c4a4b1f 100644 --- a/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/model/logging/RequestDiagnosticContext.java +++ b/rest-services/common-dependency/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/model/logging/RequestDiagnosticContext.java @@ -24,6 +24,7 @@ import io.vavr.collection.HashMap; import io.vavr.collection.Map; import java.util.UUID; import org.immutables.value.Value; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.MDC; @@ -91,6 +92,11 @@ public interface RequestDiagnosticContext { } } + default @NotNull RequestDiagnosticContext withNewInvocationId() { + return ImmutableRequestDiagnosticContext.copyOf(this) + .withInvocationId(UUID.randomUUID()); + } + static ImmutableRequestDiagnosticContext create() { return ImmutableRequestDiagnosticContext.builder() .requestId(UUID.randomUUID()) diff --git a/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java b/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java deleted file mode 100644 index d221a809..00000000 --- a/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/CloudHttpClientIT.java +++ /dev/null @@ -1,221 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * DCAEGEN2-SERVICES-SDK - * ================================================================================ - * Copyright (C) 2018 NOKIA Intellectual Property. 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; -import reactor.netty.http.client.HttpClientResponse; - -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 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 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 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 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 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 content = cloudHttpClient.get(SAMPLE_URL, String.class); - Mono 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 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 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 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 createCustomHeaders() { - Map customHeaders = new HashMap<>(); - customHeaders.put("X_INVOCATION_ID", UUID.randomUUID().toString()); - return customHeaders; - } - - private DisposableServer createValidServer() { - Mono 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 diff --git a/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java b/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java deleted file mode 100644 index 8c57a693..00000000 --- a/rest-services/common-dependency/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java +++ /dev/null @@ -1,161 +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.assertj.core.api.Assertions.assertThat; -import static org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer.sendString; - -import io.netty.handler.codec.http.HttpResponseStatus; -import java.net.MalformedURLException; -import java.net.URL; -import java.time.Duration; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.exceptions.HttpException; -import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.test.DummyHttpServer; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; - -class RxHttpClientIT { - - private static final Duration TIMEOUT = Duration.ofHours(5); - private final RxHttpClient cut = RxHttpClient.create(); - private static DummyHttpServer httpServer; - - @BeforeAll - static void setUpClass() { - httpServer = DummyHttpServer.start(routes -> - routes.get("/sample-get", (req, resp) -> sendString(resp, Mono.just("OK"))) - .get("/sample-get-500", (req, resp) -> resp.status(HttpResponseStatus.INTERNAL_SERVER_ERROR).send()) - .post("/headers-post", (req, resp) -> resp - .sendString(Mono.just(req.requestHeaders().toString()))) - .post("/echo-post", (req, resp) -> resp.send(req.receive().retain())) - ); - } - - @AfterAll - static void tearDownClass() { - httpServer.close(); - } - - private ImmutableHttpRequest.Builder requestFor(String path) throws MalformedURLException { - return ImmutableHttpRequest.builder() - .url(new URL("http", httpServer.host(), httpServer.port(), path).toString()); - } - - @Test - void simpleGet() throws Exception { - // given - final HttpRequest httpRequest = requestFor("/sample-get").method(HttpMethod.GET).build(); - - // when - final Mono bodyAsString = cut.call(httpRequest) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString); - - // then - StepVerifier.create(bodyAsString).expectNext("OK").expectComplete().verify(TIMEOUT); - } - - @Test - void getWithError() throws Exception { - // given - final HttpRequest httpRequest = requestFor("/sample-get-500").method(HttpMethod.GET).build(); - - // when - final Mono bodyAsString = cut.call(httpRequest) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString); - - // then - StepVerifier.create(bodyAsString).expectError(HttpException.class).verify(TIMEOUT); - } - - @Test - void simplePost() throws Exception { - // given - final String requestBody = "hello world"; - final HttpRequest httpRequest = requestFor("/echo-post") - .method(HttpMethod.POST) - .body(RequestBody.fromString(requestBody)) - .build(); - - // when - final Mono bodyAsString = cut.call(httpRequest) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString); - - // then - StepVerifier.create(bodyAsString) - .expectNext(requestBody) - .expectComplete() - .verify(TIMEOUT); - } - - @Test - void testChunkedEncoding() throws Exception { - // given - final String requestBody = "hello world"; - final HttpRequest httpRequest = requestFor("/headers-post") - .method(HttpMethod.POST) - .body(RequestBody.chunkedFromString(Mono.just(requestBody))) - .build(); - - // when - final Mono bodyAsString = cut.call(httpRequest) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString); - - // then - StepVerifier.create(bodyAsString.map(String::toLowerCase)) - .consumeNextWith(responseBody -> { - assertThat(responseBody).contains("transfer-encoding: chunked"); - assertThat(responseBody).doesNotContain("content-length"); - }) - .expectComplete() - .verify(TIMEOUT); - } - - @Test - void testUnchunkedEncoding() throws Exception { - // given - final String requestBody = "hello world"; - final HttpRequest httpRequest = requestFor("/headers-post") - .method(HttpMethod.POST) - .body(RequestBody.fromString(requestBody)) - .build(); - - // when - final Mono bodyAsString = cut.call(httpRequest) - .doOnNext(HttpResponse::throwIfUnsuccessful) - .map(HttpResponse::bodyAsString); - - // then - StepVerifier.create(bodyAsString.map(String::toLowerCase)) - .consumeNextWith(responseBody -> { - assertThat(responseBody).doesNotContain("transfer-encoding"); - assertThat(responseBody).contains("content-length"); - }) - .expectComplete() - .verify(TIMEOUT); - } -} \ No newline at end of file -- cgit 1.2.3-korg