diff options
| -rw-r--r-- | .gitreview | 4 | ||||
| -rw-r--r-- | components/bbs-event-processor/pom.xml | 10 | ||||
| -rw-r--r-- | components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/ConsulConfigurationGateway.java | 6 |
3 files changed, 15 insertions, 5 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000..4acf10dd --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=dcaegen2/services.git diff --git a/components/bbs-event-processor/pom.xml b/components/bbs-event-processor/pom.xml index fd9b6d0d..eb47fccb 100644 --- a/components/bbs-event-processor/pom.xml +++ b/components/bbs-event-processor/pom.xml @@ -12,7 +12,7 @@ <groupId>org.onap.dcaegen2.services.components</groupId> <artifactId>bbs-event-processor</artifactId> - <version>2.0.1-SNAPSHOT</version> + <version>2.1.0-SNAPSHOT</version> <name>dcaegen2-services-bbs-event-processor</name> <description>BBS Re-Registration and CPE Authentication Handler</description> @@ -28,10 +28,10 @@ <properties> <java.version>11</java.version> <immutables.version>2.8.3</immutables.version> - <spring-boot.version>2.2.9.RELEASE</spring-boot.version> + <spring-boot.version>2.4.0</spring-boot.version> <junit-platform.version>1.1.0</junit-platform.version> <jacoco.version>0.8.2</jacoco.version> - <dcae.sdk.version>1.4.1</dcae.sdk.version> + <dcae.sdk.version>1.5.0</dcae.sdk.version> <wiremock.version>2.24.0</wiremock.version> <jaxb.api.version>2.3.0</jaxb.api.version> <springfox-swagger.version>3.0.0</springfox-swagger.version> @@ -126,6 +126,10 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-validation</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> diff --git a/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/ConsulConfigurationGateway.java b/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/ConsulConfigurationGateway.java index 4ac85495..b660b718 100644 --- a/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/ConsulConfigurationGateway.java +++ b/components/bbs-event-processor/src/main/java/org/onap/bbs/event/processor/config/ConsulConfigurationGateway.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * BBS-RELOCATION-CPE-AUTHENTICATION-HANDLER * ================================================================================ - * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved. + * Copyright (C) 2019-2020 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. @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.function.Function; import org.jetbrains.annotations.NotNull; import org.onap.bbs.event.processor.exceptions.ApplicationEnvironmentException; @@ -48,6 +49,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import reactor.core.Disposable; +import reactor.util.retry.Retry; @Component public class ConsulConfigurationGateway { @@ -128,7 +130,7 @@ public class ConsulConfigurationGateway { // Create the client and use it to get the configuration cbsFetchPipeline = CbsClientFactory.createCbsClient(cbsClientConfig) .doOnError(e -> LOGGER.warn("CBS Configuration fetch failed with error: {}", e)) - .retry(e -> true) + .retryWhen(Retry.from(Function.identity())) .flatMapMany(cbsClient -> cbsClient.updates(cbsRequest, initialDelay, period)) .subscribe(this::parseConsulRetrievedConfiguration, this::handleErrors); } |