From 7bd3fdd1528dfcf85475a8a6ffc3613dfcc562cd Mon Sep 17 00:00:00 2001
From: Si Tang <ts0411@gmail.com>
Date: Tue, 26 Oct 2021 20:38:25 +0900
Subject: [PATCH] Upgrade Spring Boot to 2.5.6

* #931: upgrade Spring Boot to 2.5.6

* #931: add spring-boot-starter-validation dependency
---
 .../kafka/ui/client/RetryingKafkaConnectClient.java    | 10 +++-------
 kafka-ui-contract/pom.xml                              |  5 +++++
 pom.xml                                                |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
index 724f8bc272..f8d52f83f4 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/client/RetryingKafkaConnectClient.java
@@ -18,7 +18,7 @@ import org.springframework.web.client.RestClientException;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.retry.Retry;
+import reactor.util.retry.Retry;
 
 @Log4j2
 public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
@@ -30,9 +30,7 @@ public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
 
   private static <T> Mono<T> withRetryOnConflict(Mono<T> publisher) {
     return publisher.retryWhen(
-        Retry.onlyIf(e -> e.exception() instanceof WebClientResponseException.Conflict)
-            .retryMax(MAX_RETRIES)
-    )
+            Retry.max(MAX_RETRIES).filter(e -> e instanceof WebClientResponseException.Conflict))
         .onErrorResume(WebClientResponseException.Conflict.class,
             e -> Mono.error(new RebalanceInProgressException()))
         .doOnError(log::error);
@@ -40,9 +38,7 @@ public class RetryingKafkaConnectClient extends KafkaConnectClientApi {
 
   private static <T> Flux<T> withRetryOnConflict(Flux<T> publisher) {
     return publisher.retryWhen(
-        Retry.onlyIf(e -> e.exception() instanceof WebClientResponseException.Conflict)
-            .retryMax(MAX_RETRIES)
-    )
+            Retry.max(MAX_RETRIES).filter(e -> e instanceof WebClientResponseException.Conflict))
         .onErrorResume(WebClientResponseException.Conflict.class,
             e -> Mono.error(new RebalanceInProgressException()))
         .doOnError(log::error);
diff --git a/kafka-ui-contract/pom.xml b/kafka-ui-contract/pom.xml
index 0d4c9574b2..3a99eb66ad 100644
--- a/kafka-ui-contract/pom.xml
+++ b/kafka-ui-contract/pom.xml
@@ -23,6 +23,11 @@
                     <artifactId>spring-boot-starter-webflux</artifactId>
                     <version>${spring-boot.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-validation</artifactId>
+                    <version>${spring-boot.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>io.swagger</groupId>
                     <artifactId>swagger-annotations</artifactId>
diff --git a/pom.xml b/pom.xml
index a9ecb99473..5693fe0d72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.target>13</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <spring-boot.version>2.2.4.RELEASE</spring-boot.version>
+        <spring-boot.version>2.5.6</spring-boot.version>
         <jackson-databind-nullable.version>0.2.1</jackson-databind-nullable.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <org.projectlombok.version>1.18.20</org.projectlombok.version>