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 --- .../dmaap/client/api/DmaapClientFactory.java | 47 +++++++++------------- .../dmaap/client/api/MessageRouterPublisher.java | 1 - .../dmaap/client/api/MessageRouterSubscriber.java | 1 - .../client/config/DmaapConsumerConfiguration.java | 2 + .../dmaap/client/config/DmaapCustomConfig.java | 2 + .../client/config/DmaapPublisherConfiguration.java | 2 + .../client/impl/MessageRouterPublisherImpl.java | 8 +++- .../client/impl/MessageRouterSubscriberImpl.java | 7 +++- .../services/dmaap/client/model/DmaapRequest.java | 1 - .../services/dmaap/client/model/DmaapResponse.java | 1 - .../client/model/MessageRouterPublishRequest.java | 1 - .../client/model/MessageRouterPublishResponse.java | 1 - .../model/MessageRouterSubscribeRequest.java | 2 +- .../model/MessageRouterSubscribeResponse.java | 1 - .../model/config/DmaapClientConfiguration.java | 36 +++++++++++++++++ .../model/config/MessageRouterPublisherConfig.java | 46 +++++++++++++++++++++ .../config/MessageRouterSubscriberConfig.java | 40 ++++++++++++++++++ .../service/DMaaPAbstractReactiveHttpClient.java | 5 +++ .../client/service/DMaaPClientServiceUtils.java | 2 + .../ConsumerReactiveHttpClientFactory.java | 3 +- .../consumer/DMaaPConsumerReactiveHttpClient.java | 2 + .../consumer/DMaaPReactiveWebClientFactory.java | 2 + .../producer/DMaaPPublisherReactiveHttpClient.java | 2 + .../service/producer/DmaaPRestTemplateFactory.java | 5 +++ .../PublisherReactiveHttpClientFactory.java | 4 ++ .../dmaap/client/utlis/SecurityKeysUtil.java | 7 +++- 26 files changed, 187 insertions(+), 44 deletions(-) create mode 100644 rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapClientConfiguration.java create mode 100644 rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterPublisherConfig.java create mode 100644 rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterSubscriberConfig.java (limited to 'rest-services/dmaap-client/src/main/java') diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/DmaapClientFactory.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/DmaapClientFactory.java index 0ac2d0bd..3c27da10 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/DmaapClientFactory.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/DmaapClientFactory.java @@ -17,57 +17,46 @@ * limitations under the License. * ============LICENSE_END===================================== */ - package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api; -import com.google.gson.Gson; -import io.netty.handler.ssl.SslContext; -import io.vavr.Lazy; -import java.time.Duration; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient; -import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClientFactory; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.impl.MessageRouterPublisherImpl; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.impl.MessageRouterSubscriberImpl; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.DmaapClientConfiguration; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.MessageRouterPublisherConfig; +import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.MessageRouterSubscriberConfig; /** - * WARNING: This is a proof-of-concept. It is untested. API may change or be removed. Use at your own risk. - * You've been warned. * * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi public final class DmaapClientFactory { - private static final Duration DEFAULT_MAX_BATCH_DURATION = Duration.ofSeconds(1); - private static final int DEFAULT_MAX_BATCH_SIZE = 512; - private DmaapClientFactory() { } - public static @NotNull MessageRouterPublisher createMessageRouterPublisher() { - return new MessageRouterPublisherImpl( - RxHttpClient.create(), - DEFAULT_MAX_BATCH_SIZE, - DEFAULT_MAX_BATCH_DURATION); - } + public static @NotNull MessageRouterPublisher createMessageRouterPublisher( + @NotNull MessageRouterPublisherConfig clientConfiguration) { - public static @NotNull MessageRouterPublisher createMessageRouterPublisher(@NotNull SslContext sslContext) { return new MessageRouterPublisherImpl( - RxHttpClient.create(sslContext), - DEFAULT_MAX_BATCH_SIZE, - DEFAULT_MAX_BATCH_DURATION); + createHttpClient(clientConfiguration), + clientConfiguration.maxBatchSize(), + clientConfiguration.maxBatchDuration()); } - public static @NotNull MessageRouterSubscriber createMessageRouterSubscriber() { - return new MessageRouterSubscriberImpl(RxHttpClient.create(), new Gson()); + public static @NotNull MessageRouterSubscriber createMessageRouterSubscriber( + @NotNull MessageRouterSubscriberConfig clientConfiguration) { + return new MessageRouterSubscriberImpl( + createHttpClient(clientConfiguration), + clientConfiguration.gsonInstance()); } - public static @NotNull MessageRouterSubscriber createMessageRouterSubscriber(@NotNull SslContext sslContext) { - return new MessageRouterSubscriberImpl( - RxHttpClient.create(sslContext), - new Gson()); + private static @NotNull RxHttpClient createHttpClient(DmaapClientConfiguration config) { + return config.securityKeys() == null + ? RxHttpClientFactory.create() + : RxHttpClientFactory.create(config.securityKeys()); } } diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisher.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisher.java index c205f472..e37bdcdf 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisher.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisher.java @@ -30,7 +30,6 @@ import reactor.core.publisher.Flux; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi public interface MessageRouterPublisher { Flux put(MessageRouterPublishRequest request, Flux items); } diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriber.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriber.java index f3aba76d..c1fadbfa 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriber.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriber.java @@ -32,7 +32,6 @@ import reactor.core.publisher.Mono; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi public interface MessageRouterSubscriber { Mono get(MessageRouterSubscribeRequest request); diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfiguration.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfiguration.java index 75816ea4..91e026af 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfiguration.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapConsumerConfiguration.java @@ -25,10 +25,12 @@ import org.immutables.value.Value; /** * @author Przemysław Wąsala on 3/23/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ @Value.Immutable(prehash = true) @Value.Style(builder = "new") @Gson.TypeAdapters +@Deprecated public abstract class DmaapConsumerConfiguration implements DmaapCustomConfig { private static final long serialVersionUID = 1L; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java index 6cfb358b..29c3a5e8 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapCustomConfig.java @@ -25,7 +25,9 @@ import org.immutables.value.Value; /** * @author Przemysław Wąsala on 3/28/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ +@Deprecated public interface DmaapCustomConfig extends Serializable { @Deprecated diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfiguration.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfiguration.java index 3866f9b4..df813705 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfiguration.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/config/DmaapPublisherConfiguration.java @@ -25,10 +25,12 @@ import org.immutables.value.Value; /** * @author Przemysław Wąsala on 3/23/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ @Value.Immutable(prehash = true) @Value.Style(builder = "new") @Gson.TypeAdapters +@Deprecated public abstract class DmaapPublisherConfiguration implements DmaapCustomConfig { private static final long serialVersionUID = 1L; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterPublisherImpl.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterPublisherImpl.java index f09c5397..aa88b9ee 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterPublisherImpl.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterPublisherImpl.java @@ -40,6 +40,8 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.Immutable import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishRequest; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishResponse; import org.reactivestreams.Publisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -47,11 +49,11 @@ import reactor.core.publisher.Mono; * @author Piotr Jaszczyk * @since March 2019 */ -// TODO: This is a PoC. It's untested. public class MessageRouterPublisherImpl implements MessageRouterPublisher { private final RxHttpClient httpClient; private final int maxBatchSize; private final Duration maxBatchDuration; + private static final Logger LOGGER = LoggerFactory.getLogger(MessageRouterPublisherImpl.class); public MessageRouterPublisherImpl(RxHttpClient httpClient, int maxBatchSize, Duration maxBatchDuration) { this.httpClient = httpClient; @@ -70,6 +72,8 @@ public class MessageRouterPublisherImpl implements MessageRouterPublisher { private Publisher pushBatchToMr( MessageRouterPublishRequest request, List batch) { + LOGGER.debug("Sending a batch of {} items to DMaaP MR", batch.size()); + LOGGER.trace("The items to be sent: {}", batch); return httpClient.call(buildHttpRequest(request, asJsonBody(batch))) .map(httpResponse -> buildResponse(httpResponse, batch)); } @@ -84,7 +88,7 @@ public class MessageRouterPublisherImpl implements MessageRouterPublisher { return ImmutableHttpRequest.builder() .method(HttpMethod.POST) .url(request.sinkDefinition().topicUrl()) - .diagnosticContext(request.diagnosticContext()) + .diagnosticContext(request.diagnosticContext().withNewInvocationId()) .customHeaders(HashMap.of(HttpHeaders.CONTENT_TYPE, request.contentType())) .body(body) .build(); diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java index e91a77fa..2f49ddf5 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/impl/MessageRouterSubscriberImpl.java @@ -35,16 +35,18 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.MessageRout import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.ImmutableMessageRouterSubscribeResponse; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterSubscribeRequest; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterSubscribeResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; /** * @author Piotr Jaszczyk * @since March 2019 */ -// TODO: This is a PoC. It's untested. public class MessageRouterSubscriberImpl implements MessageRouterSubscriber { private final RxHttpClient httpClient; private final Gson gson; + private static final Logger LOGGER = LoggerFactory.getLogger(MessageRouterSubscriberImpl.class); public MessageRouterSubscriberImpl(RxHttpClient httpClient, Gson gson) { this.httpClient = httpClient; @@ -53,6 +55,7 @@ public class MessageRouterSubscriberImpl implements MessageRouterSubscriber { @Override public Mono get(MessageRouterSubscribeRequest request) { + LOGGER.debug("Requesting new items from DMaaP MR: {}", request); return httpClient.call(buildGetHttpRequest(request)).map(this::buildGetResponse); } @@ -70,7 +73,7 @@ public class MessageRouterSubscriberImpl implements MessageRouterSubscriber { return ImmutableHttpRequest.builder() .method(HttpMethod.GET) .url(buildSubscribeUrl(request)) - .diagnosticContext(request.diagnosticContext()) + .diagnosticContext(request.diagnosticContext().withNewInvocationId()) .build(); } diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapRequest.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapRequest.java index 2bed4c9f..6b3e2c4a 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapRequest.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapRequest.java @@ -28,7 +28,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnos * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi public interface DmaapRequest { @Value.Default default RequestDiagnosticContext diagnosticContext() { diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapResponse.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapResponse.java index 8b4d41e2..c3e37263 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapResponse.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/DmaapResponse.java @@ -28,7 +28,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi public interface DmaapResponse { @Nullable String failReason(); diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishRequest.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishRequest.java index 4c816f31..77f92e77 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishRequest.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishRequest.java @@ -28,7 +28,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi @Value.Immutable public interface MessageRouterPublishRequest extends DmaapRequest { diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishResponse.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishResponse.java index cc038a6e..8dcf17b7 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishResponse.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterPublishResponse.java @@ -30,7 +30,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi @Value.Immutable public interface MessageRouterPublishResponse extends DmaapResponse { diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeRequest.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeRequest.java index f32fd0ee..23284877 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeRequest.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeRequest.java @@ -29,7 +29,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi @Value.Immutable public interface MessageRouterSubscribeRequest extends DmaapRequest { @@ -39,6 +38,7 @@ public interface MessageRouterSubscribeRequest extends DmaapRequest { @Nullable Duration timeout(); + @Value.Default default String consumerId() { return Constants.CLASS_LOADER_SCOPED_UNIQUE_ID; } diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeResponse.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeResponse.java index 13ec63cd..3680ca60 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeResponse.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/MessageRouterSubscribeResponse.java @@ -29,7 +29,6 @@ import org.onap.dcaegen2.services.sdk.rest.services.annotations.ExperimentalApi; * @author Piotr Jaszczyk * @since 1.1.4 */ -@ExperimentalApi @Value.Immutable public interface MessageRouterSubscribeResponse extends DmaapResponse { diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapClientConfiguration.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapClientConfiguration.java new file mode 100644 index 00000000..ac677f02 --- /dev/null +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapClientConfiguration.java @@ -0,0 +1,36 @@ +/* + * ============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.dmaap.client.model.config; + +import org.immutables.value.Value; +import org.jetbrains.annotations.Nullable; +import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; + +/** + * @author Piotr Jaszczyk + * @since 1.2.0 + */ +public interface DmaapClientConfiguration { + @Value.Default + default @Nullable SecurityKeys securityKeys() { + return null; + } + +} diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterPublisherConfig.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterPublisherConfig.java new file mode 100644 index 00000000..dc753777 --- /dev/null +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterPublisherConfig.java @@ -0,0 +1,46 @@ +/* + * ============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.dmaap.client.model.config; + +import java.time.Duration; +import org.immutables.value.Value; + +/** + * @author Piotr Jaszczyk + * @since 1.2.0 + */ +@Value.Immutable +public interface MessageRouterPublisherConfig extends DmaapClientConfiguration { + + @Value.Default + default Duration maxBatchDuration() { + return Duration.ofSeconds(1); + } + + @Value.Default + default int maxBatchSize() { + return 512; + } + + static MessageRouterPublisherConfig createDefault() { + return ImmutableMessageRouterPublisherConfig.builder().build(); + } +} diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterSubscriberConfig.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterSubscriberConfig.java new file mode 100644 index 00000000..84d9969a --- /dev/null +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/MessageRouterSubscriberConfig.java @@ -0,0 +1,40 @@ +/* + * ============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.dmaap.client.model.config; + +import com.google.gson.Gson; +import org.immutables.value.Value; + +/** + * @author Piotr Jaszczyk + * @since 1.2.0 + */ +@Value.Immutable +public interface MessageRouterSubscriberConfig extends DmaapClientConfiguration { + @Value.Default + default Gson gsonInstance() { + return new Gson(); + } + + static MessageRouterSubscriberConfig createDefault() { + return ImmutableMessageRouterSubscriberConfig.builder().build(); + } +} diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPAbstractReactiveHttpClient.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPAbstractReactiveHttpClient.java index 55fa7fb7..aee961ef 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPAbstractReactiveHttpClient.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPAbstractReactiveHttpClient.java @@ -24,6 +24,11 @@ import java.util.UUID; import org.onap.dcaegen2.services.sdk.rest.services.model.logging.ImmutableRequestDiagnosticContext; import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; +/** + * + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} + */ +@Deprecated public abstract class DMaaPAbstractReactiveHttpClient { protected final static String SLASH = "/"; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPClientServiceUtils.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPClientServiceUtils.java index 3876b527..3b4f55ab 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPClientServiceUtils.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/DMaaPClientServiceUtils.java @@ -25,7 +25,9 @@ import java.util.Map; /** * @author Marcin Migdal on 3/8/2019 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ +@Deprecated public final class DMaaPClientServiceUtils { public final static String CONTENT_TYPE = "Content-Type"; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/ConsumerReactiveHttpClientFactory.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/ConsumerReactiveHttpClientFactory.java index e92ad3f1..5e1a0648 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/ConsumerReactiveHttpClientFactory.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/ConsumerReactiveHttpClientFactory.java @@ -20,12 +20,13 @@ package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.service.consumer; -import javax.net.ssl.SSLException; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapConsumerConfiguration; /** * @author Przemysław Wąsala on 6/26/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ +@Deprecated public class ConsumerReactiveHttpClientFactory { private final DMaaPReactiveWebClientFactory reactiveWebClientFactory; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java index 81a62eba..83678d26 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPConsumerReactiveHttpClient.java @@ -37,7 +37,9 @@ import reactor.core.publisher.Mono; /** * @author Przemysław Wąsala on 6/26/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ +@Deprecated public class DMaaPConsumerReactiveHttpClient extends DMaaPAbstractReactiveHttpClient { private final DmaapConsumerConfiguration consumerConfiguration; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactory.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactory.java index 3d3c54af..65f0b608 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactory.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/consumer/DMaaPReactiveWebClientFactory.java @@ -29,7 +29,9 @@ import org.onap.dcaegen2.services.sdk.security.ssl.SslFactory; /** * @author Przemysław Wąsala on 7/4/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ +@Deprecated public class DMaaPReactiveWebClientFactory { private final SslFactory sslFactory; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java index 0d453e47..7173624d 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DMaaPPublisherReactiveHttpClient.java @@ -39,7 +39,9 @@ import java.util.Optional; /** * @author Przemysław Wąsala on 7/4/18 + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} */ +@Deprecated public class DMaaPPublisherReactiveHttpClient extends DMaaPAbstractReactiveHttpClient { private final DmaapPublisherConfiguration dmaapPublisherConfiguration; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactory.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactory.java index 2d71760d..30079802 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactory.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/DmaaPRestTemplateFactory.java @@ -27,6 +27,11 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.utlis.SecurityK import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; import org.onap.dcaegen2.services.sdk.security.ssl.SslFactory; +/** + * + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} + */ +@Deprecated public class DmaaPRestTemplateFactory { private SslFactory sslFactory; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/PublisherReactiveHttpClientFactory.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/PublisherReactiveHttpClientFactory.java index 953a3319..9e6cce27 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/PublisherReactiveHttpClientFactory.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/service/producer/PublisherReactiveHttpClientFactory.java @@ -23,6 +23,10 @@ package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.service.produc import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration; import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder; +/** + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} + */ +@Deprecated public class PublisherReactiveHttpClientFactory { private final DmaaPRestTemplateFactory restTemplateFactory; diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java index 7ee06e9c..c688ab0b 100644 --- a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/utlis/SecurityKeysUtil.java @@ -30,14 +30,17 @@ import org.onap.dcaegen2.services.sdk.security.ssl.ImmutableSecurityKeysStore; import org.onap.dcaegen2.services.sdk.security.ssl.Passwords; import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; +/** + * @deprecated Use new API {@link org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api.DmaapClientFactory} + */ +@Deprecated public final class SecurityKeysUtil { private SecurityKeysUtil(){ } - @NotNull - public static SecurityKeys fromDmappCustomConfig(DmaapCustomConfig configuration){ + public static @NotNull SecurityKeys fromDmappCustomConfig(DmaapCustomConfig configuration){ return ImmutableSecurityKeys.builder() .keyStore(ImmutableSecurityKeysStore.of(resource(configuration.keyStorePath()).get())) .keyStorePassword(Passwords.fromResource(configuration.keyStorePasswordPath())) -- cgit 1.2.3-korg