From 159f1c86e508bf67ee08a7d42105afa2c2e1bf3a Mon Sep 17 00:00:00 2001 From: Pawel Date: Wed, 3 Feb 2021 16:04:14 +0100 Subject: Add possibility to modify the configuration for persistent connection Issue-ID: DCAEGEN2-1483 Signed-off-by: Pawel Change-Id: Ia5c0699359fe2317bea6177fe6dfce5c68579ba9 --- pom.xml | 2 +- rest-services/cbs-client/pom.xml | 2 +- rest-services/dmaap-client/pom.xml | 2 +- .../dmaap/client/api/DmaapClientFactory.java | 13 +++ .../model/config/DmaapClientConfiguration.java | 4 + .../model/config/DmaapConnectionPoolConfig.java | 39 +++++++++ .../dmaap/client/api/MessageRouterPublisherIT.java | 94 +++++++++++++++++++++- .../client/api/MessageRouterSubscriberIT.java | 40 ++++++++- rest-services/http-client/pom.xml | 2 +- .../adapters/http/RxHttpClientFactory.java | 18 ++++- .../adapters/http/config/ConnectionPoolConfig.java | 33 ++++++++ .../adapters/http/config/RxHttpClientConfig.java | 1 + .../services/adapters/http/RxHttpClientIT.java | 32 ++++++++ rest-services/model/pom.xml | 2 +- rest-services/pom.xml | 2 +- security/crypt-password/pom.xml | 2 +- security/pom.xml | 2 +- security/ssl/pom.xml | 2 +- services/external-schema-manager/pom.xml | 2 +- services/hv-ves-client/pom.xml | 2 +- services/hv-ves-client/producer/api/pom.xml | 2 +- services/hv-ves-client/producer/ct/pom.xml | 2 +- services/hv-ves-client/producer/impl/pom.xml | 2 +- services/hv-ves-client/producer/pom.xml | 2 +- services/hv-ves-client/protobuf/pom.xml | 2 +- services/pom.xml | 2 +- standardization/api-custom-header/pom.xml | 2 +- standardization/moher-api/healthstate/pom.xml | 2 +- standardization/moher-api/metrics/pom.xml | 2 +- standardization/moher-api/pom.xml | 2 +- standardization/moher-api/server-adapters/pom.xml | 2 +- .../server-adapters/reactor-netty/pom.xml | 2 +- .../server-adapters/spring-webflux/pom.xml | 2 +- standardization/pom.xml | 2 +- version.properties | 2 +- 35 files changed, 296 insertions(+), 30 deletions(-) create mode 100644 rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapConnectionPoolConfig.java create mode 100644 rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/ConnectionPoolConfig.java diff --git a/pom.xml b/pom.xml index 2c2ed16b..934364f7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.dcaegen2.services sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT dcaegen2-services-sdk Common SDK repo for all DCAE Services diff --git a/rest-services/cbs-client/pom.xml b/rest-services/cbs-client/pom.xml index ea1eae08..9813d3c7 100644 --- a/rest-services/cbs-client/pom.xml +++ b/rest-services/cbs-client/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services diff --git a/rest-services/dmaap-client/pom.xml b/rest-services/dmaap-client/pom.xml index b8620311..54b9a37e 100644 --- a/rest-services/dmaap-client/pom.xml +++ b/rest-services/dmaap-client/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services 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 95850078..ee4f6d38 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 @@ -23,6 +23,8 @@ import io.vavr.control.Option; import org.jetbrains.annotations.NotNull; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClientFactory; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ConnectionPoolConfig; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ImmutableConnectionPoolConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ImmutableRetryConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ImmutableRxHttpClientConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.RetryConfig; @@ -68,6 +70,7 @@ public final class DmaapClientFactory { private static @NotNull RxHttpClient createHttpClient(DmaapClientConfiguration config) { RxHttpClientConfig clientConfig = ImmutableRxHttpClientConfig.builder() + .connectionPool(createConnectionPool(config)) .retryConfig(createRetry(config)) .build(); return config.securityKeys() == null @@ -85,5 +88,15 @@ public final class DmaapClientFactory { .build()) .getOrNull(); } + + private static ConnectionPoolConfig createConnectionPool(DmaapClientConfiguration config){ + return Option.of(config.connectionPoolConfig()) + .map(cp -> ImmutableConnectionPoolConfig.builder() + .connectionPool(cp.connectionPool()) + .maxIdleTime(Duration.ofSeconds(cp.maxIdleTime())) + .maxLifeTime(Duration.ofSeconds(cp.maxLifeTime())) + .build()) + .getOrNull(); + } } 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 index 3e283511..6dcdf988 100644 --- 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 @@ -36,4 +36,8 @@ public interface DmaapClientConfiguration { default @Nullable DmaapRetryConfig retryConfig(){ return null; } + @Value.Default + default @Nullable DmaapConnectionPoolConfig connectionPoolConfig (){ + return null; + } } diff --git a/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapConnectionPoolConfig.java b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapConnectionPoolConfig.java new file mode 100644 index 00000000..38166e4e --- /dev/null +++ b/rest-services/dmaap-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/model/config/DmaapConnectionPoolConfig.java @@ -0,0 +1,39 @@ +/* + * ============LICENSE_START==================================== + * DCAEGEN2-SERVICES-SDK + * ========================================================= + * Copyright (C) 2021 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; + +@Value.Immutable +public interface DmaapConnectionPoolConfig { + + @Value.Default + default int connectionPool(){ + return 16; + } + @Value.Default + default int maxLifeTime(){ + return Integer.MAX_VALUE; + } + @Value.Default + default int maxIdleTime(){ + return Integer.MAX_VALUE; + } +} \ No newline at end of file diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java index 825ea395..ffd301c3 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterPublisherIT.java @@ -34,6 +34,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRo import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishResponse; 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.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.ImmutableDmaapConnectionPoolConfig; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.ImmutableDmaapRetryConfig; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.ImmutableMessageRouterPublisherConfig; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.MessageRouterPublisherConfig; @@ -337,6 +338,7 @@ class MessageRouterPublisherIT { @Test void publisher_shouldRetryWhenRetryableHttpCodeAndSuccessfullyPublish() { + //given final String topic = "TOPIC11"; final String topicUrl = String.format("%s/%s", PROXY_MOCK_EVENTS_PATH, topic); @@ -369,6 +371,7 @@ class MessageRouterPublisherIT { @Test void publisher_shouldRetryWhenClientTimeoutAndSuccessfullyPublish() { + //given final String topic = "TOPIC12"; final String topicUrl = String.format("%s/%s", PROXY_MOCK_EVENTS_PATH, topic); @@ -400,6 +403,7 @@ class MessageRouterPublisherIT { @Test void publisher_shouldRetryManyTimesAndSuccessfullyPublish() { + //given final String topic = "TOPIC13"; final String topicUrl = String.format("%s/%s", PROXY_MOCK_EVENTS_PATH, topic); @@ -440,6 +444,7 @@ class MessageRouterPublisherIT { @Test void publisher_shouldHandleLastRetryError500() { + //given final String topic = "TOPIC14"; final String topicUrl = String.format("%s/%s", PROXY_MOCK_EVENTS_PATH, topic); @@ -472,6 +477,70 @@ class MessageRouterPublisherIT { MOCK_SERVER_CLIENT.verify(request().withPath(path), VerificationTimes.exactly(2)); } + @Test + void publisher_shouldSuccessfullyPublishWhenConnectionPoolConfigurationIsSet() { + //given + final String topic = "TOPIC15"; + final String topicUrl = String.format("%s/%s", PROXY_MOCK_EVENTS_PATH, topic); + + final List singleJsonMessage = List.of("{\"message\":\"message1\"}"); + final List expectedItems = getAsJsonElements(singleJsonMessage); + final Flux plainBatch = plainBatch(singleJsonMessage); + + final MessageRouterPublishRequest publishRequest = createPublishRequest(topicUrl, Duration.ofSeconds(1)); + final MessageRouterPublishResponse expectedResponse = successPublishResponse(expectedItems); + + final String path = String.format("/events/%s", topic); + MOCK_SERVER_CLIENT + .when(request().withPath(path), Times.once()) + .respond(response().withStatusCode(200)); + + final MessageRouterPublisher publisher = DmaapClientFactory.createMessageRouterPublisher(connectionPoolConfiguration()); + + //when + final Flux result = publisher.put(publishRequest, plainBatch); + + //then + StepVerifier.create(result) + .expectNext(expectedResponse) + .expectComplete() + .verify(); + + MOCK_SERVER_CLIENT.verify(request().withPath(path).withKeepAlive(true), VerificationTimes.exactly(1)); + } + + @Test + void publisher_shouldRetryWhenClientTimeoutAndSuccessfullyPublishWithConnectionPoolConfiguration() { + //given + final String topic = "TOPIC16"; + final String topicUrl = String.format("%s/%s", PROXY_MOCK_EVENTS_PATH, topic); + + final List singleJsonMessage = List.of("{\"message\":\"message1\"}"); + final List expectedItems = getAsJsonElements(singleJsonMessage); + final Flux plainBatch = plainBatch(singleJsonMessage); + + final MessageRouterPublishRequest publishRequest = createPublishRequest(topicUrl, Duration.ofSeconds(1)); + final MessageRouterPublishResponse expectedResponse = successPublishResponse(expectedItems); + + final String path = String.format("/events/%s", topic); + MOCK_SERVER_CLIENT + .when(request().withPath(path), Times.once()) + .respond(response().withDelay(TimeUnit.SECONDS, 10)); + + final MessageRouterPublisher publisher = DmaapClientFactory.createMessageRouterPublisher(connectionPoolAndRetryConfiguration()); + + //when + final Flux result = publisher.put(publishRequest, plainBatch); + + //then + StepVerifier.create(result) + .expectNext(expectedResponse) + .expectComplete() + .verify(); + + MOCK_SERVER_CLIENT.verify(request().withPath(path).withKeepAlive(true), VerificationTimes.exactly(2)); + } + private MessageRouterPublisherConfig retryConfig(int retryInterval, int retryCount) { return ImmutableMessageRouterPublisherConfig.builder() @@ -481,4 +550,27 @@ class MessageRouterPublisherIT { .build()) .build(); } -} + private MessageRouterPublisherConfig connectionPoolConfiguration() { + return ImmutableMessageRouterPublisherConfig.builder() + .connectionPoolConfig(ImmutableDmaapConnectionPoolConfig.builder() + .connectionPool(10) + .maxIdleTime(10) + .maxLifeTime(20) + .build()) + .build(); + } + + private MessageRouterPublisherConfig connectionPoolAndRetryConfiguration() { + return ImmutableMessageRouterPublisherConfig.builder() + .connectionPoolConfig(ImmutableDmaapConnectionPoolConfig.builder() + .connectionPool(10) + .maxIdleTime(10) + .maxLifeTime(20) + .build()) + .retryConfig(ImmutableDmaapRetryConfig.builder() + .retryIntervalInSeconds(1) + .retryCount(1) + .build()) + .build(); + } +} \ No newline at end of file diff --git a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java index 2cc6d339..8f4edab0 100644 --- a/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java +++ b/rest-services/dmaap-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/dmaap/client/api/MessageRouterSubscriberIT.java @@ -23,7 +23,6 @@ package org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.api; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import io.vavr.collection.List; -import io.vavr.control.Try; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -33,6 +32,7 @@ import org.mockserver.verify.VerificationTimes; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishRequest; 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.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.ImmutableDmaapConnectionPoolConfig; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.ImmutableDmaapRetryConfig; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.ImmutableMessageRouterSubscriberConfig; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.config.MessageRouterPublisherConfig; @@ -415,6 +415,34 @@ class MessageRouterSubscriberIT { MOCK_SERVER_CLIENT.verify(request().withPath(path), VerificationTimes.exactly(2)); } + @Test + void subscriber_shouldSubscribeToTopicWithConnectionPoolConfiguration() { + //given + final String topic = "TOPIC4"; + final String topicUrl = String.format("%s/%s", EVENTS_PATH, topic); + final MessageRouterPublishRequest publishRequest = createPublishRequest(topicUrl); + final MessageRouterSubscribeRequest subscribeRequest = createMRSubscribeRequest(topicUrl, + CONSUMER_GROUP, CONSUMER_ID); + + final List twoJsonMessages = List.of("{\"message\":\"message1\"}", + "{\"differentMessage\":\"message2\"}"); + final List messages = getAsJsonElements(twoJsonMessages); + final Flux jsonMessageBatch = jsonBatch(twoJsonMessages); + + final MessageRouterSubscriber subscriber = DmaapClientFactory.createMessageRouterSubscriber(connectionPoolConfiguration()); + + //when + registerTopic(publisher, publishRequest, subscriber, subscribeRequest); + final Flux result = publisher.put(publishRequest, jsonMessageBatch) + .thenMany(subscriber.subscribeForElements(subscribeRequest, Duration.ofSeconds(1))); + + //then + StepVerifier.create(result.take(2)) + .expectNext(messages.get(0)) + .expectNext(messages.get(1)) + .expectComplete() + .verify(TIMEOUT); + } private MessageRouterSubscriberConfig retryConfig(int retryInterval, int retryCount) { return ImmutableMessageRouterSubscriberConfig.builder() @@ -424,4 +452,14 @@ class MessageRouterSubscriberIT { .build()) .build(); } + + private MessageRouterSubscriberConfig connectionPoolConfiguration() { + return ImmutableMessageRouterSubscriberConfig.builder() + .connectionPoolConfig(ImmutableDmaapConnectionPoolConfig.builder() + .connectionPool(10) + .maxIdleTime(10) + .maxLifeTime(20) + .build()) + .build(); + } } diff --git a/rest-services/http-client/pom.xml b/rest-services/http-client/pom.xml index d9a11065..6b0ab0c1 100644 --- a/rest-services/http-client/pom.xml +++ b/rest-services/http-client/pom.xml @@ -28,7 +28,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services 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 118df52b..0567b1b4 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 @@ -23,11 +23,13 @@ package org.onap.dcaegen2.services.sdk.rest.services.adapters.http; import io.netty.handler.ssl.SslContext; import io.vavr.control.Option; import org.jetbrains.annotations.NotNull; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ConnectionPoolConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.RxHttpClientConfig; import org.onap.dcaegen2.services.sdk.security.ssl.SecurityKeys; import org.onap.dcaegen2.services.sdk.security.ssl.SslFactory; import org.onap.dcaegen2.services.sdk.security.ssl.TrustStoreKeys; import reactor.netty.http.client.HttpClient; +import reactor.netty.resources.ConnectionProvider; /** * @author Piotr Jaszczyk @@ -44,8 +46,11 @@ public final class RxHttpClientFactory { return new RxHttpClient(HttpClient.create()); } - public static RxHttpClient create(RxHttpClientConfig config) { - return createWithConfig(HttpClient.create(), config); + public static RxHttpClient create(RxHttpClientConfig config){ + return Option.of(config.connectionPool()) + .map(RxHttpClientFactory::createConnectionProvider) + .map(provider -> createWithConfig(HttpClient.create(provider), config)) + .getOrElse(createWithConfig(HttpClient.create(), config)); } public static RxHttpClient create(SecurityKeys securityKeys) { @@ -93,4 +98,13 @@ public final class RxHttpClientFactory { .map(retryConfig -> new RxHttpClient(httpClient, retryConfig)) .getOrElse(() -> new RxHttpClient(httpClient)); } + + @NotNull + private static ConnectionProvider createConnectionProvider(ConnectionPoolConfig connectionPoolConfig) { + return ConnectionProvider.builder("fixed") + .maxConnections(connectionPoolConfig.connectionPool()) + .maxIdleTime(connectionPoolConfig.maxIdleTime()) + .maxLifeTime(connectionPoolConfig.maxLifeTime()) + .build(); + } } diff --git a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/ConnectionPoolConfig.java b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/ConnectionPoolConfig.java new file mode 100644 index 00000000..d1d5c565 --- /dev/null +++ b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/ConnectionPoolConfig.java @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START==================================== + * DCAEGEN2-SERVICES-SDK + * ========================================================= + * Copyright (C) 2021 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.config; + +import org.immutables.value.Value; + +import java.time.Duration; + +@Value.Immutable +public interface ConnectionPoolConfig { + + int connectionPool(); + Duration maxIdleTime(); + Duration maxLifeTime(); +} \ No newline at end of file diff --git a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/RxHttpClientConfig.java b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/RxHttpClientConfig.java index 78a88a47..b17a35cd 100644 --- a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/RxHttpClientConfig.java +++ b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/config/RxHttpClientConfig.java @@ -26,4 +26,5 @@ import org.jetbrains.annotations.Nullable; @Value.Immutable public interface RxHttpClientConfig { @Nullable RetryConfig retryConfig(); + @Nullable ConnectionPoolConfig connectionPool(); } diff --git a/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java b/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java index 8d076e02..ff4f0297 100644 --- a/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java +++ b/rest-services/http-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClientIT.java @@ -26,6 +26,7 @@ import io.vavr.Tuple; import io.vavr.collection.HashSet; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; +import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ImmutableConnectionPoolConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ImmutableRetryConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.config.ImmutableRxHttpClientConfig; import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.exceptions.HttpException; @@ -336,6 +337,28 @@ class RxHttpClientIT { assertNoRetry(); } + @Test + void simpleGetWithCustomConnectionPool() throws Exception { + // given + final HttpRequest httpRequest = requestFor("/sample-get") + .method(HttpMethod.GET) + .build(); + final RxHttpClient cut = RxHttpClientFactory.create(ImmutableRxHttpClientConfig.builder() + .connectionPool(defaultConnectionPoolConfig()) + .build()); + + // when + final Mono bodyAsString = cut.call(httpRequest) + .doOnNext(HttpResponse::throwIfUnsuccessful) + .map(HttpResponse::bodyAsString); + + // then + StepVerifier.create(bodyAsString) + .expectNext("OK") + .expectComplete() + .verify(TIMEOUT); + } + private ImmutableHttpRequest.Builder requestFor(String path) throws MalformedURLException { return ImmutableHttpRequest.builder() .url(new URL("http", HTTP_SERVER.host(), HTTP_SERVER.port(), path).toString()); @@ -367,4 +390,13 @@ class RxHttpClientIT { private void assert400(HttpResponse httpResponse) { assertThat(httpResponse.statusCode()).isEqualTo(400); } + + private ImmutableConnectionPoolConfig defaultConnectionPoolConfig(){ + return ImmutableConnectionPoolConfig + .builder() + .connectionPool(1) + .maxIdleTime(Duration.ofSeconds(5)) + .maxLifeTime(Duration.ofSeconds(10)) + .build(); + } } diff --git a/rest-services/model/pom.xml b/rest-services/model/pom.xml index d75c2e18..8f259d0f 100644 --- a/rest-services/model/pom.xml +++ b/rest-services/model/pom.xml @@ -27,7 +27,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services diff --git a/rest-services/pom.xml b/rest-services/pom.xml index 5e22eeac..7a3277f0 100644 --- a/rest-services/pom.xml +++ b/rest-services/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk diff --git a/security/crypt-password/pom.xml b/security/crypt-password/pom.xml index 959e0f7a..7c6495ae 100644 --- a/security/crypt-password/pom.xml +++ b/security/crypt-password/pom.xml @@ -6,7 +6,7 @@ org.onap.dcaegen2.services.sdk.security dcaegen2-services-sdk-security - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT 4.0.0 diff --git a/security/pom.xml b/security/pom.xml index be9a0b62..b63672c3 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk.security diff --git a/security/ssl/pom.xml b/security/ssl/pom.xml index 0ced1a4d..1b77b756 100644 --- a/security/ssl/pom.xml +++ b/security/ssl/pom.xml @@ -6,7 +6,7 @@ org.onap.dcaegen2.services.sdk.security dcaegen2-services-sdk-security - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ssl diff --git a/services/external-schema-manager/pom.xml b/services/external-schema-manager/pom.xml index e270254b..9c77527f 100644 --- a/services/external-schema-manager/pom.xml +++ b/services/external-schema-manager/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-services - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT dcaegen2-services-sdk-services-external-schema-manager diff --git a/services/hv-ves-client/pom.xml b/services/hv-ves-client/pom.xml index 8ec6d392..970ecc19 100644 --- a/services/hv-ves-client/pom.xml +++ b/services/hv-ves-client/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-services - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT dcaegen2-services-sdk-services-hvvesclient diff --git a/services/hv-ves-client/producer/api/pom.xml b/services/hv-ves-client/producer/api/pom.xml index 1900f736..a0b77d50 100644 --- a/services/hv-ves-client/producer/api/pom.xml +++ b/services/hv-ves-client/producer/api/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk hvvesclient-producer - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hvvesclient-producer-api diff --git a/services/hv-ves-client/producer/ct/pom.xml b/services/hv-ves-client/producer/ct/pom.xml index 980570fc..7f5907bb 100644 --- a/services/hv-ves-client/producer/ct/pom.xml +++ b/services/hv-ves-client/producer/ct/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk hvvesclient-producer - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hvvesclient-producer-ct diff --git a/services/hv-ves-client/producer/impl/pom.xml b/services/hv-ves-client/producer/impl/pom.xml index 7d1bd741..7321f749 100644 --- a/services/hv-ves-client/producer/impl/pom.xml +++ b/services/hv-ves-client/producer/impl/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk hvvesclient-producer - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hvvesclient-producer-impl diff --git a/services/hv-ves-client/producer/pom.xml b/services/hv-ves-client/producer/pom.xml index 2601eb0f..3b206933 100644 --- a/services/hv-ves-client/producer/pom.xml +++ b/services/hv-ves-client/producer/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-services-hvvesclient - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT hvvesclient-producer diff --git a/services/hv-ves-client/protobuf/pom.xml b/services/hv-ves-client/protobuf/pom.xml index 2e0d87e7..b16bbc05 100644 --- a/services/hv-ves-client/protobuf/pom.xml +++ b/services/hv-ves-client/protobuf/pom.xml @@ -26,7 +26,7 @@ dcaegen2-services-sdk-services-hvvesclient org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT High Volume VES Collector Client :: Protobuf diff --git a/services/pom.xml b/services/pom.xml index 7d9a37dd..df5d9fcc 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -26,7 +26,7 @@ org.onap.dcaegen2.services sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT org.onap.dcaegen2.services.sdk diff --git a/standardization/api-custom-header/pom.xml b/standardization/api-custom-header/pom.xml index e9792d25..a0348cbd 100644 --- a/standardization/api-custom-header/pom.xml +++ b/standardization/api-custom-header/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-standardization - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/standardization/moher-api/healthstate/pom.xml b/standardization/moher-api/healthstate/pom.xml index 76ab81e4..6a599f1d 100644 --- a/standardization/moher-api/healthstate/pom.xml +++ b/standardization/moher-api/healthstate/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT Monitoring and Healthcheck :: Health state diff --git a/standardization/moher-api/metrics/pom.xml b/standardization/moher-api/metrics/pom.xml index 0cd8f55a..2a88f202 100644 --- a/standardization/moher-api/metrics/pom.xml +++ b/standardization/moher-api/metrics/pom.xml @@ -26,7 +26,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT Monitoring and Healthcheck :: Metrics diff --git a/standardization/moher-api/pom.xml b/standardization/moher-api/pom.xml index 37090d65..1b3799f2 100644 --- a/standardization/moher-api/pom.xml +++ b/standardization/moher-api/pom.xml @@ -26,7 +26,7 @@ dcaegen2-services-sdk-standardization org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT Monitoring and Healthcheck diff --git a/standardization/moher-api/server-adapters/pom.xml b/standardization/moher-api/server-adapters/pom.xml index 283d816a..99c2e470 100644 --- a/standardization/moher-api/server-adapters/pom.xml +++ b/standardization/moher-api/server-adapters/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT Monitoring and Healthcheck :: Server Adapters diff --git a/standardization/moher-api/server-adapters/reactor-netty/pom.xml b/standardization/moher-api/server-adapters/reactor-netty/pom.xml index cb9efb9f..803923dd 100644 --- a/standardization/moher-api/server-adapters/reactor-netty/pom.xml +++ b/standardization/moher-api/server-adapters/reactor-netty/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-server-adapters org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT Monitoring and Healthcheck :: Server Adapters :: Reactor Netty diff --git a/standardization/moher-api/server-adapters/spring-webflux/pom.xml b/standardization/moher-api/server-adapters/spring-webflux/pom.xml index 34ea3a0a..69b99a3d 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/pom.xml +++ b/standardization/moher-api/server-adapters/spring-webflux/pom.xml @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-server-adapters org.onap.dcaegen2.services.sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT Monitoring and Healthcheck :: Server Adapters :: Spring Webflux diff --git a/standardization/pom.xml b/standardization/pom.xml index e7808343..f2ff5ba3 100644 --- a/standardization/pom.xml +++ b/standardization/pom.xml @@ -8,7 +8,7 @@ org.onap.dcaegen2.services sdk - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT .. diff --git a/version.properties b/version.properties index eabef1f2..24828c2f 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1 -minor=6 +minor=7 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} -- cgit 1.2.3-korg