Simplify retries

Author: mfvanek

spring-boot-2-demo-app/src/main/java/io/github/mfvanek/spring/boot2/test/config/WebClientConfig.java

@@ -1,20 +1,18 @@
 package io.github.mfvanek.spring.boot2.test.config;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Configuration
-@RequiredArgsConstructor
 public class WebClientConfig {
 
     @Value("${app.external-base-url}")
     private String external;
 
     @Bean
-    WebClient webClient() {
+    public WebClient webClient() {
         return WebClient.builder().baseUrl(external).build();
     }
 }

spring-boot-2-demo-app/src/main/java/io/github/mfvanek/spring/boot2/test/service/PublicApiService.java

@@ -5,12 +5,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.mfvanek.spring.boot2.test.service.dto.CurrentTime;
 import io.github.mfvanek.spring.boot2.test.service.dto.ParsedDateTime;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
+import org.springframework.retry.ExhaustedRetryException;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -23,11 +23,11 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
-@Getter
 public class PublicApiService {
 
     @Value("${app.retries}")
-    private String retries;
+    private int retries;
+
     private final ObjectMapper mapper;
     private final WebClient webClient;
 
@@ -36,7 +36,7 @@ public LocalDateTime getZonedTime() {
         try {
             final ParsedDateTime result = getZonedTimeFromWorldTimeApi().getDatetime();
             return result.toLocalDateTime();
-        } catch (RuntimeException e) {
+        } catch (ExhaustedRetryException e) {
             log.warn("Failed to get response", e);
         } catch (JsonProcessingException e) {
             log.warn("Failed to convert response", e);
@@ -51,12 +51,12 @@ private CurrentTime getZonedTimeFromWorldTimeApi() throws JsonProcessingExceptio
             .accept(MediaType.APPLICATION_JSON)
             .retrieve()
             .bodyToMono(String.class)
-            .retryWhen(Retry.fixedDelay(3, Duration.ofSeconds(2))
+            .retryWhen(Retry.fixedDelay(retries, Duration.ofSeconds(2))
                 .doBeforeRetry(retrySignal -> log.info("Retrying request to {}, attempt {}/{} due to error:",
                     webClient.options().uri(String.join("", zoneNames)), retries, retrySignal.totalRetries() + 1, retrySignal.failure()))
                 .onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> {
                     log.error("Request to {} failed after {} attempts.", webClient.options().uri(String.join("", zoneNames)), retrySignal.totalRetries() + 1);
-                    return new RuntimeException("Retries exhausted", retrySignal.failure());
+                    return new ExhaustedRetryException("Retries exhausted", retrySignal.failure());
                 })
             );
         return mapper.readValue(response.block(), CurrentTime.class);

spring-boot-2-demo-app/src/test/java/io/github/mfvanek/spring/boot2/test/service/PublicApiServiceTest.java

@@ -65,7 +65,7 @@ void retriesThreeTimesToGetZonedTime(@Nonnull final CapturedOutput output) throw
             ));
 
         final LocalDateTime result = publicApiService.getZonedTime();
-        verify(1 + 3, getRequestedFor(urlPathMatching("/" + zoneNames)));
+        verify(2, getRequestedFor(urlPathMatching("/" + zoneNames)));
 
         assertThat(result).isNull();
         assertThat(output).contains("Retrying request to ", "Retries exhausted");

spring-boot-2-demo-app/src/test/resources/application-test.yml

@@ -1,2 +1,3 @@
 app:
     external-base-url: "http://localhost:${wiremock.server.port}/"
+    retries: 1

spring-boot-3-demo-app/src/main/java/io/github/mfvanek/spring/boot3/test/config/WebClientConfig.java

@@ -1,19 +1,18 @@
 package io.github.mfvanek.spring.boot3.test.config;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Configuration
-@RequiredArgsConstructor
 public class WebClientConfig {
+
     @Value("${app.external-base-url}")
     private String external;
 
     @Bean
-    WebClient webClient() {
+    public WebClient webClient() {
         return WebClient.builder().baseUrl(external).build();
     }
 }

spring-boot-3-demo-app/src/main/java/io/github/mfvanek/spring/boot3/test/service/PublicApiService.java

@@ -4,12 +4,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.mfvanek.spring.boot3.test.service.dto.CurrentTime;
 import io.github.mfvanek.spring.boot3.test.service.dto.ParsedDateTime;
-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.lang.Nullable;
+import org.springframework.retry.ExhaustedRetryException;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -22,11 +22,11 @@
 @Slf4j
 @Service
 @RequiredArgsConstructor
-@Getter
 public class PublicApiService {
 
     @Value("${app.retries}")
-    private String retries;
+    private int retries;
+
     private final ObjectMapper mapper;
     private final WebClient webClient;
 
@@ -35,7 +35,7 @@ public LocalDateTime getZonedTime() {
         try {
             final ParsedDateTime result = getZonedTimeFromWorldTimeApi().getDatetime();
             return result.toLocalDateTime();
-        } catch (RuntimeException e) {
+        } catch (ExhaustedRetryException e) {
             log.warn("Failed to get response", e);
         } catch (JsonProcessingException e) {
             log.warn("Failed to convert response", e);
@@ -50,12 +50,12 @@ private CurrentTime getZonedTimeFromWorldTimeApi() throws JsonProcessingExceptio
             .accept(MediaType.APPLICATION_JSON)
             .retrieve()
             .bodyToMono(String.class)
-            .retryWhen(Retry.fixedDelay(3, Duration.ofSeconds(2))
+            .retryWhen(Retry.fixedDelay(retries, Duration.ofSeconds(2))
                 .doBeforeRetry(retrySignal -> log.info("Retrying request to {}, attempt {}/{} due to error:",
                     webClient.options().uri(String.join("", zoneNames)), retries, retrySignal.totalRetries() + 1, retrySignal.failure()))
                 .onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> {
                     log.error("Request to {} failed after {} attempts.", webClient.options().uri(String.join("", zoneNames)), retrySignal.totalRetries() + 1);
-                    return new RuntimeException("Retries exhausted", retrySignal.failure());
+                    return new ExhaustedRetryException("Retries exhausted", retrySignal.failure());
                 })
             );
         return mapper.readValue(response.block(), CurrentTime.class);

spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/service/PublicApiServiceTest.java

@@ -65,7 +65,7 @@ void retriesThreeTimesToGetZonedTime(@Nonnull final CapturedOutput output) throw
             ));
 
         final LocalDateTime result = publicApiService.getZonedTime();
-        verify(1 + 3, getRequestedFor(urlPathMatching("/" + zoneNames)));
+        verify(2, getRequestedFor(urlPathMatching("/" + zoneNames)));
 
         assertThat(result).isNull();
         assertThat(output).contains("Retrying request to ", "Retries exhausted");

spring-boot-3-demo-app/src/test/resources/application-test.yml

@@ -1,2 +1,3 @@
 app:
     external-base-url: "http://localhost:${wiremock.server.port}/"
+    retries: 1