summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Malewski <maciej.malewski@nokia.com>2021-02-03 10:45:43 +0100
committerMaciej Malewski <maciej.malewski@nokia.com>2021-02-03 12:04:35 +0100
commit14011f96caec688a121f9a9f19a0f27c37a67770 (patch)
tree0153293c221a43de9aedee123e7c17244520c692
parent96d7a363baa17b931d1599e4582de2fe6ee22574 (diff)
Upgrade Spring Boot and Spring Cloud versions
Spring Boot from 2.2.4.RELEASE to 2.4.2 Spring Cloud from Greenwich.SR1 to 2020.0.1 Issue-ID: DCAEGEN2-2537 Signed-off-by: Maciej Malewski <maciej.malewski@nokia.com> Change-Id: I51c8c450133a68435799802f548bb16ba562550c
-rw-r--r--pom.xml6
-rw-r--r--prh-app-server/pom.xml6
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocator.java9
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocatorTest.java4
-rw-r--r--prh-commons/pom.xml2
5 files changed, 16 insertions, 11 deletions
diff --git a/pom.xml b/pom.xml
index 00c683c2..28f5c32a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
~ ============LICENSE_START=======================================================
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
- ~ Copyright (C) 2018-2020 NOKIA Intellectual Property. All rights reserved.
+ ~ Copyright (C) 2018-2021 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.
@@ -47,8 +47,8 @@
<properties>
<java.version>11</java.version>
- <spring-boot.version>2.2.4.RELEASE</spring-boot.version>
- <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+ <spring-boot.version>2.4.2</spring-boot.version>
+ <spring-cloud.version>2020.0.1</spring-cloud.version>
<springfox.version>3.0.0</springfox.version>
<immutables.version>2.7.5</immutables.version>
<sdk.version>1.4.3</sdk.version>
diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index 630a0080..aaaf47b3 100644
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -3,7 +3,7 @@
~ ============LICENSE_START=======================================================
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
- ~ Copyright (C) 2018-2020 NOKIA Intellectual Property. All rights reserved.
+ ~ Copyright (C) 2018-2021 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.
@@ -221,6 +221,10 @@
<artifactId>spring-cloud-starter-config</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocator.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocator.java
index 7b660202..c068988c 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocator.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocator.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* PNF-REGISTRATION-HANDLER
* ================================================================================
- * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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 org.springframework.cloud.bootstrap.config.PropertySourceLocator;
import org.springframework.core.env.Environment;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
+import reactor.util.retry.Retry;
import java.util.Map;
@@ -63,9 +64,9 @@ public class CbsPropertySourceLocator implements PropertySourceLocator {
Map<String, Object> properties = cbsClientFactoryFacade.createCbsClient(cbsClientConfiguration)
.flatMap(cbsClient -> cbsClient.get(CbsRequests.getAll(RequestDiagnosticContext.create())))
.doOnError(e -> LOGGER.warn("Failed fetching config properties from CBS - retrying...", e))
- .retryBackoff(cbsProperties.getFetchRetries().getMaxAttempts(),
- cbsProperties.getFetchRetries().getFirstBackoff(),
- cbsProperties.getFetchRetries().getMaxBackoff())
+ .retryWhen(Retry.
+ backoff(cbsProperties.getFetchRetries().getMaxAttempts(), cbsProperties.getFetchRetries().getFirstBackoff()).
+ maxBackoff(cbsProperties.getFetchRetries().getMaxBackoff()))
.doOnNext(this::updateCbsConfig)
.map(cbsJsonToPropertyMapConverter::convertToMap)
.block();
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocatorTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocatorTest.java
index faf1867a..22a11ed6 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocatorTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/bootstrap/CbsPropertySourceLocatorTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* PNF-REGISTRATION-HANDLER
* ================================================================================
- * Copyright (C) 2019 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2019-2021 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.
@@ -80,7 +80,7 @@ class CbsPropertySourceLocatorTest {
@BeforeEach
void setup() {
- virtualTimeScheduler = VirtualTimeScheduler.getOrSet();
+ virtualTimeScheduler = VirtualTimeScheduler.getOrSet(true);
when(cbsClientConfigurationResolver.resolveCbsClientConfiguration()).thenReturn(cbsClientConfiguration);
when(cbsClientFactoryFacade.createCbsClient(cbsClientConfiguration)).thenReturn(Mono.just(cbsClient));
diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml
index a9b94bfe..096253b7 100644
--- a/prh-commons/pom.xml
+++ b/prh-commons/pom.xml
@@ -3,7 +3,7 @@
~ ============LICENSE_START=======================================================
~ PNF-REGISTRATION-HANDLER
~ ================================================================================
- ~ Copyright (C) 2018-2019 NOKIA Intellectual Property. All rights reserved.
+ ~ Copyright (C) 2018-2021 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.