Skip to content

Commit 7064682

Browse files
committed
Refactor InntektsmeldingClient error logging, update body handling in #deploy-test-dolly-backend OpprettInntektsmeldingCommand, and extend SecurityConfig profile support
1 parent 2afaacf commit 7064682

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private String toJson(Object object) {
157157
try {
158158
return objectMapper.writeValueAsString(object);
159159
} catch (JsonProcessingException e) {
160-
log.error("Feilet å konvertere domument fra inntektsmelding", e);
160+
log.error("Feilet å konvertere dokument fra inntektsmelding", e);
161161
}
162162
return null;
163163
}

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/inntektsmelding/command/OpprettInntektsmeldingCommand.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
import no.nav.testnav.libs.reactivecore.web.WebClientError;
88
import no.nav.testnav.libs.securitycore.config.UserConstant;
99
import org.springframework.http.HttpHeaders;
10-
import org.springframework.web.reactive.function.BodyInserters;
1110
import org.springframework.web.reactive.function.client.WebClient;
1211
import reactor.core.publisher.Flux;
13-
import reactor.core.publisher.Mono;
1412

1513
import java.util.concurrent.Callable;
1614

@@ -33,7 +31,7 @@ public Flux<InntektsmeldingResponse> call() {
3331
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
3432
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
3533
.header("Nav-Call-Id", callId)
36-
.body(BodyInserters.fromPublisher(Mono.just(request), InntektsmeldingRequest.class))
34+
.bodyValue(request)
3735
.retrieve()
3836
.bodyToFlux(InntektsmeldingResponse.class)
3937
.doOnError(WebClientError.logTo(log))

apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@EnableWebSecurity
1414
@Configuration
15-
@Profile({ "prod", "dev" })
15+
@Profile({ "prod", "dev", "local" })
1616
public class SecurityConfig {
1717

1818
@Bean

0 commit comments

Comments
 (0)