Skip to content

Commit 38b5bf5

Browse files
authored
Bugfix/gjenopprett gruppe backpressure (#3961)
1 parent 304ff37 commit 38b5bf5

File tree

124 files changed

+657
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+657
-488
lines changed

apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ public static void main(String[] args) {
1212
.initializers(new NaisEnvironmentApplicationContextInitializer())
1313
.run(args);
1414
}
15-
}
15+
}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/ConsumerStatus.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public abstract class ConsumerStatus {
2727
public Mono<Map<String, TestnavStatusResponse>> checkStatus(WebClient webClient) {
2828

2929
return checkConsumerStatus(
30-
serviceUrl() + LIVENESS_ENDPOINT,
31-
serviceUrl() + READINESS_ENDPOINT,
32-
webClient)
30+
serviceUrl() + LIVENESS_ENDPOINT,
31+
serviceUrl() + READINESS_ENDPOINT,
32+
webClient)
3333
.map(consumerResponce -> Map.of(consumerName(), consumerResponce))
3434
.flatMap(consumerStatus ->
3535
webClient

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdGetCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public Mono<ArbeidsforholdRespons> call() {
5050
.miljoe(miljoe)
5151
.build())
5252
.doOnError(WebClientError.logTo(log))
53+
.retryWhen(WebClientError.is5xxException())
5354
.onErrorResume(error -> Mono.just(ArbeidsforholdRespons.builder()
5455
.miljoe(miljoe)
5556
.error(error)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdPostCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public Flux<ArbeidsforholdRespons> call() {
4141
.miljoe(miljoe)
4242
.build())
4343
.doOnError(WebClientError.logTo(log))
44+
.retryWhen(WebClientError.is5xxException())
4445
.onErrorResume(error -> Flux.just(ArbeidsforholdRespons.builder()
4546
.miljoe(miljoe)
4647
.error(error)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/aareg/command/ArbeidsforholdPutCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public Flux<ArbeidsforholdRespons> call() {
4646
.miljoe(miljoe)
4747
.build())
4848
.doOnError(WebClientError.logTo(log))
49+
.retryWhen(WebClientError.is5xxException())
4950
.onErrorResume(error -> Flux.just(ArbeidsforholdRespons.builder()
5051
.miljoe(miljoe)
5152
.error(error)

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenDeleteCVCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
4242
throwable -> !(throwable instanceof WebClientResponseException.NotFound),
4343
WebClientError.logTo(log))
4444

45+
.retryWhen(WebClientError.is5xxException())
4546
.onErrorResume(WebClientResponseException.NotFound.class::isInstance, throwable -> Mono.empty());
4647
}
4748

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenGodtaHjemmelCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
4444
.build())
4545
.doOnError(WebClientError.logTo(log))
4646

47+
.retryWhen(WebClientError.is5xxException())
4748
.onErrorResume(throwable -> ArbeidsplassenCVStatusDTO.of(WebClientError.describe(throwable), uuid));
4849
}
4950
}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenGodtaVilkaarCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
4444
.build())
4545
.doOnError(WebClientError.logTo(log))
4646

47+
.retryWhen(WebClientError.is5xxException())
4748
.onErrorResume(throwable -> ArbeidsplassenCVStatusDTO.of(WebClientError.describe(throwable), uuid));
4849
}
4950
}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenPostPersonCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
4343
.uuid(uuid)
4444
.build())
4545
.doOnError(WebClientError.logTo(log))
46-
46+
.retryWhen(WebClientError.is5xxException())
4747
.onErrorResume(throwable -> ArbeidsplassenCVStatusDTO.of(WebClientError.describe(throwable), uuid));
4848
}
4949

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arbeidsplassencv/command/ArbeidsplassenPutCVCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
4848
.build())
4949
.doOnError(WebClientError.logTo(log))
5050

51+
.retryWhen(WebClientError.is5xxException())
5152
.onErrorResume(throwable -> ArbeidsplassenCVStatusDTO.of(WebClientError.describe(throwable), uuid));
5253
}
5354

0 commit comments

Comments
 (0)