- Refactor error handling in retry logic for WebClient calls across multiple command classes.

stigus · stigus · commit a26d45998905 · 2026-05-28T08:58:58.000+02:00
- Simplify lambda expressions in onRetryExhaustedThrow to improve readability.
#deploy-test-dolly-backend
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdPostCommand.java
@@ -45,9 +45,9 @@ public Flux<ArbeidsforholdRespons> call() {
                         .build())
                 .doOnError(WebClientError.logTo(log))
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
-                                .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
-                                        responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->
+                        .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
+                                responseException.getStatusCode().is5xxServerError())
+                        .onRetryExhaustedThrow(((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))
                 .onErrorResume(error -> Flux.just(ArbeidsforholdRespons.builder()
                         .miljoe(miljoe)
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdPutCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdPutCommand.java
@@ -52,7 +52,7 @@ public Flux<ArbeidsforholdRespons> call() {
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
                                 responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->
+                        .onRetryExhaustedThrow(((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))
                 .onErrorResume(error -> Flux.just(ArbeidsforholdRespons.builder()
                         .miljoe(miljoe)
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/command/InntektstubCheckImportCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/command/InntektstubCheckImportCommand.java
@@ -50,7 +50,7 @@ public Mono<CheckImportResponse> call() {
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
                                 responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->
+                        .onRetryExhaustedThrow(((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))
                 .onErrorResume(error -> {
                     var description = WebClientError.describe(error);
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/command/InntektstubPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektstub/command/InntektstubPostCommand.java
@@ -39,7 +39,7 @@ public Flux<Inntektsinformasjon> call() {
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
                                 responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->
+                        .onRetryExhaustedThrow(((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))
                 .onErrorResume(throwable -> {
                     var description = WebClientError.describe(throwable);
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kelvinaap/command/AapBehandlingStatusPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kelvinaap/command/AapBehandlingStatusPostCommand.java
@@ -42,8 +42,8 @@ public Mono<AapStatusResponse> call() {
                 .doOnError(WebClientError.logTo(log))
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
-                                             responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->
+                                responseException.getStatusCode().is5xxServerError())
+                        .onRetryExhaustedThrow(((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))
                 .onErrorResume(error -> {
                     val feilmelding = WebClientError.describe(error);
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kelvinaap/command/AapOpprettOgFullfoerPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/kelvinaap/command/AapOpprettOgFullfoerPostCommand.java
@@ -43,8 +43,8 @@ public Mono<AapOpprettResponse> call() {
                 .doOnError(WebClientError.logTo(log))
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
-                                             responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow((retryBackoffSpec, lastSignal) ->
+                                responseException.getStatusCode().is5xxServerError())
+                        .onRetryExhaustedThrow((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage()))))
                 .onErrorResume(error -> {
                     val feilmelding = WebClientError.describe(error);
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortHentCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortHentCommand.java
@@ -51,7 +51,7 @@ public Mono<SkattekortResponse> call() {
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
                                 responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow((retryBackoffSpec, lastSignal) ->
+                        .onRetryExhaustedThrow((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage()))))
                 .onErrorResume(throwable -> {
                     WebClientError.Description description = WebClientError.describe(throwable);
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortOpprettCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skattekort/command/SkattekortOpprettCommand.java
@@ -48,9 +48,9 @@ public Mono<SkattekortResponse> call() {
                 .retryWhen(Retry.fixedDelay(3, ofSeconds(5))
                         .filter(throwable -> throwable instanceof WebClientResponseException responseException &&
                                 responseException.getStatusCode().is5xxServerError())
-                        .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->
+                        .onRetryExhaustedThrow(((_, lastSignal) ->
                                 new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))
                 .onErrorResume(throwable ->
-                    SkattekortResponse.of(WebClientError.describe(throwable)));
+                        SkattekortResponse.of(WebClientError.describe(throwable)));
     }
 }
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java
@@ -182,7 +182,7 @@ public boolean isNonEmpty() {
                     try {
                         var object = method.invoke(this);
                         return nonNull(object) && (!(object instanceof List) || !((List<?>) object).isEmpty());
-                    } catch (IllegalAccessException | InvocationTargetException e) {
+                    } catch (IllegalAccessException | InvocationTargetException _) {
                         return true;
                     }
                 });
diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/ExcelUtil.java b/apps/dolly-backend/src/main/java/no/nav/dolly/service/excel/ExcelUtil.java
@@ -48,7 +48,7 @@ private static Map<String, Integer> createLinkReferanser(List<Object[]> opplysni
 
         return IntStream.range(0, opplysninger.size()).boxed()
                 .collect(Collectors.toMap(row -> (String) opplysninger.get(row)[indekskolonne], row -> row,
-                        (row1, row2) -> row1));
+                        (row1, _) -> row1));
     }
 
     @SuppressWarnings("all")

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ public Mono<SkattekortResponse> call() {`
`48`	`48`	`.retryWhen(Retry.fixedDelay(3, ofSeconds(5))`
`49`	`49`	`.filter(throwable -> throwable instanceof WebClientResponseException responseException &&`
`50`	`50`	`responseException.getStatusCode().is5xxServerError())`
`51`		`- .onRetryExhaustedThrow(((retryBackoffSpec, lastSignal) ->`
	`51`	`+ .onRetryExhaustedThrow(((_, lastSignal) ->`
`52`	`52`	`new RuntimeException("Retries exhausted: %s".formatted(lastSignal.failure().getMessage())))))`
`53`	`53`	`.onErrorResume(throwable ->`
`54`		`- SkattekortResponse.of(WebClientError.describe(throwable)));`
	`54`	`+ SkattekortResponse.of(WebClientError.describe(throwable)));`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public boolean isNonEmpty() {`
`182`	`182`	`try {`
`183`	`183`	`var object = method.invoke(this);`
`184`	`184`	`return nonNull(object) && (!(object instanceof List) \|\| !((List<?>) object).isEmpty());`
`185`		`- } catch (IllegalAccessException \| InvocationTargetException e) {`
	`185`	`+ } catch (IllegalAccessException \| InvocationTargetException _) {`
`186`	`186`	`return true;`
`187`	`187`	`}`
`188`	`188`	`});`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private static Map<String, Integer> createLinkReferanser(List<Object[]> opplysni`
`48`	`48`
`49`	`49`	`return IntStream.range(0, opplysninger.size()).boxed()`
`50`	`50`	`.collect(Collectors.toMap(row -> (String) opplysninger.get(row)[indekskolonne], row -> row,`
`51`		`- (row1, row2) -> row1));`
	`51`	`+ (row1, _) -> row1));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@SuppressWarnings("all")`