Skip to content

Commit 8543456

Browse files
committed
Fix formattering av feilmelding
1 parent 3a0aa43 commit 8543456

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Mono<BestillingProgress> gjenopprett(RsDollyUtvidetBestilling bestilling,
4747
if (arbeidssokerregisteretResponse.getStatus().is2xxSuccessful()) {
4848
return "OK";
4949
} else {
50-
return "FEIL=" + ErrorStatusDecoder.encodeStatus(arbeidssokerregisteretResponse.getFeilmelding());
50+
return "FEIL= " + ErrorStatusDecoder.encodeStatus(arbeidssokerregisteretResponse.getFeilmelding());
5151
}
5252
}))
5353
.flatMap(status -> oppdaterStatus(progress, status));

libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/web/WebClientError.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.util.function.Consumer;
2222
import java.util.function.Predicate;
2323

24+
import static io.micrometer.common.util.StringUtils.isNotBlank;
25+
2426
/**
2527
* Convenience class for handling error situations when using {@link WebClient} instances.
2628
*/
@@ -146,7 +148,9 @@ private Description(Throwable throwable) {
146148
private static String resolveMessage(Throwable throwable) {
147149
switch (throwable) {
148150
case WebClientResponseException e -> {
149-
return e.getResponseBodyAsString(StandardCharsets.UTF_8);
151+
return isNotBlank(e.getResponseBodyAsString(StandardCharsets.UTF_8)) ?
152+
e.getResponseBodyAsString(StandardCharsets.UTF_8) :
153+
e.getStatusCode().value() + " " + e.getStatusText();
150154
}
151155
case WebClientRequestException e -> {
152156
switch (e.getCause()) {

0 commit comments

Comments
 (0)