Skip to content

Commit 63d6a4b

Browse files
rfc3092rfc3092
committed
Removed unused imports.
1 parent 91692de commit 63d6a4b

File tree

234 files changed

+580
-607
lines changed

Some content is hidden

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

234 files changed

+580
-607
lines changed

‎apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/consumer/command/PdlAdresseSoekCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import no.nav.testnav.apps.adresseservice.exception.BadRequestException;
88
import no.nav.testnav.apps.adresseservice.exception.NotFoundException;
99
import no.nav.testnav.libs.reactivecore.web.WebClientError;
10+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
1011
import org.springframework.http.HttpHeaders;
1112
import org.springframework.http.MediaType;
1213
import org.springframework.web.reactive.function.BodyInserters;
@@ -33,7 +34,7 @@ public Mono<PdlAdresseResponse> call() {
3334
.uri(builder -> builder.path("/pdl-api/graphql").build())
3435
.body(BodyInserters.fromValue(query))
3536
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
36-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
37+
.headers(WebClientHeader.bearer(token))
3738
.header(TEMA, TemaGrunnlag.GEN.name())
3839
.retrieve()
3940
.bodyToMono(PdlAdresseResponse.class)

‎apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/CreateAccessListeMemberCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
77
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonCreateDTO;
88
import no.nav.testnav.libs.reactivecore.web.WebClientError;
9+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
910
import org.springframework.http.HttpHeaders;
1011
import org.springframework.http.MediaType;
1112
import org.springframework.web.reactive.function.client.WebClient;
@@ -34,7 +35,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
3435
.uri(builder -> builder.path(ALTINN_URL)
3536
.build(altinnConfig.getOwner(), altinnConfig.getIdentifier()))
3637
.bodyValue(organisasjon)
37-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
38+
.headers(WebClientHeader.bearer(token))
3839
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
3940
.retrieve()
4041
.bodyToMono(AltinnAccessListResponseDTO.class)

‎apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/DeleteAccessListMemberCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
77
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.OrganisasjonDeleteDTO;
88
import no.nav.testnav.libs.reactivecore.web.WebClientError;
9+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
910
import org.springframework.http.HttpHeaders;
1011
import org.springframework.http.HttpMethod;
1112
import org.springframework.http.MediaType;
@@ -37,7 +38,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
3738
.uri(builder -> builder.path(ALTINN_URL)
3839
.build(altinnConfig.getOwner(), altinnConfig.getIdentifier())
3940
)
40-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
41+
.headers(WebClientHeader.bearer(token))
4142
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
4243
.bodyValue(identifiers)
4344
.retrieve()

‎apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAccessListMembersCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import no.nav.testnav.altinn3tilgangservice.config.AltinnConfig;
66
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAccessListResponseDTO;
77
import no.nav.testnav.libs.reactivecore.web.WebClientError;
8+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
89
import org.springframework.http.HttpHeaders;
910
import org.springframework.http.MediaType;
1011
import org.springframework.web.reactive.function.client.WebClient;
@@ -29,7 +30,7 @@ public Mono<AltinnAccessListResponseDTO> call() {
2930
.get()
3031
.uri(builder -> builder.path(ALTINN_URL)
3132
.build(altinnConfig.getOwner(), altinnConfig.getIdentifier()))
32-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
33+
.headers(WebClientHeader.bearer(token))
3334
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
3435
.retrieve()
3536
.bodyToMono(AltinnAccessListResponseDTO.class)

‎apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetAuthorizedPartiesCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AltinnAuthorizedPartiesRequestDTO;
66
import no.nav.testnav.altinn3tilgangservice.consumer.altinn.dto.AuthorizedPartyDTO;
77
import no.nav.testnav.libs.reactivecore.web.WebClientError;
8+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
89
import org.springframework.http.HttpHeaders;
910
import org.springframework.http.MediaType;
1011
import org.springframework.web.reactive.function.client.WebClient;
@@ -30,7 +31,7 @@ public Mono<AuthorizedPartyDTO[]> call() {
3031
.post()
3132
.uri(builder -> builder.path(ALTINN_URL)
3233
.build())
33-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
34+
.headers(WebClientHeader.bearer(token))
3435
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
3536
.bodyValue(request)
3637
.retrieve()

‎apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/consumer/altinn/command/GetExchangeTokenCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.testnav.libs.reactivecore.web.WebClientError;
6+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
67
import org.springframework.http.HttpHeaders;
78
import org.springframework.http.MediaType;
89
import org.springframework.web.reactive.function.client.WebClient;
@@ -27,7 +28,7 @@ public Mono<String> call() {
2728
.uri(builder -> builder.path(ALTINN_URL)
2829
.build()
2930
)
30-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
31+
.headers(WebClientHeader.bearer(token))
3132
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
3233
.retrieve()
3334
.bodyToMono(String.class)

‎apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/command/GetAktiveBestillingerCommand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.testnav.libs.reactivecore.web.WebClientError;
6-
import org.springframework.http.HttpHeaders;
6+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
77
import org.springframework.web.reactive.function.client.WebClient;
88
import org.springframework.web.reactive.function.client.WebClientResponseException;
99
import reactor.core.publisher.Flux;
@@ -28,7 +28,7 @@ public Flux<Object> call() {
2828
.path("/api/v1/bestilling/gruppe/{gruppeId}/ikkeferdig")
2929
.build(gruppeId)
3030
)
31-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
31+
.headers(WebClientHeader.bearer(token))
3232
.retrieve()
3333
.bodyToFlux(Object.class)
3434
.onErrorResume(throwable -> throwable instanceof WebClientResponseException.NotFound,

‎apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/command/PostBestillingCommand.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.registre.testnorge.batchbestillingservice.request.RsDollyBestillingRequest;
66
import no.nav.testnav.libs.reactivecore.web.WebClientError;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
78
import org.springframework.web.reactive.function.client.WebClient;
89
import org.springframework.web.reactive.function.client.WebClientResponseException;
910
import reactor.core.Disposable;
1011
import reactor.core.publisher.Mono;
1112

1213
import java.util.concurrent.Callable;
1314

14-
import static org.springframework.http.HttpHeaders.AUTHORIZATION;
15-
1615
@Slf4j
1716
@RequiredArgsConstructor
1817
public class PostBestillingCommand implements Callable<Disposable> {
@@ -28,7 +27,7 @@ public Disposable call() {
2827
return webClient.post()
2928
.uri(builder -> builder
3029
.path("/api/v1/gruppe/{gruppeId}/bestilling").build(gruppeId))
31-
.header(AUTHORIZATION, "Bearer " + token)
30+
.headers(WebClientHeader.bearer(token))
3231
.bodyValue(request)
3332
.retrieve()
3433
.toBodilessEntity()

‎apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/consumer/command/GetBrukertilgangCommand.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import no.nav.testnav.apps.brukerservice.consumer.dto.AltinnBrukerRequest;
66
import no.nav.testnav.libs.dto.altinn3.v1.OrganisasjonDTO;
77
import no.nav.testnav.libs.reactivecore.web.WebClientError;
8-
import org.springframework.http.HttpHeaders;
8+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
99
import org.springframework.web.reactive.function.client.WebClient;
1010
import org.springframework.web.reactive.function.client.WebClientResponseException;
1111
import reactor.core.publisher.Flux;
@@ -24,7 +24,7 @@ public class GetBrukertilgangCommand implements Callable<Flux<OrganisasjonDTO>>
2424
public Flux<OrganisasjonDTO> call() {
2525
return webClient.post()
2626
.uri(builder -> builder.path("/api/v1/brukertilgang").build())
27-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
27+
.headers(WebClientHeader.bearer(token))
2828
.bodyValue(new AltinnBrukerRequest(ident))
2929
.retrieve()
3030
.bodyToFlux(OrganisasjonDTO.class)

‎apps/bruker-service/src/test/java/no/nav/testnav/apps/brukerservice/integrationtest/BrukerServiceIntegrationTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import no.nav.testnav.apps.brukerservice.dto.BrukerDTO;
66
import no.nav.testnav.integrationtest.client.TokendingsClient;
7-
import no.nav.testnav.libs.securitycore.config.UserConstant;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
88
import no.nav.testnav.libs.securitycore.domain.AccessToken;
99
import okhttp3.mockwebserver.MockResponse;
1010
import okhttp3.mockwebserver.MockWebServer;
@@ -76,7 +76,7 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
7676
var bruker = webClient
7777
.post()
7878
.uri("/api/v1/brukere")
79-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
79+
.headers(WebClientHeader.bearer(token.getTokenValue()))
8080
.body(BodyInserters.fromValue(expected))
8181
.retrieve()
8282
.bodyToMono(BrukerDTO.class)
@@ -96,7 +96,7 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
9696
// Login user
9797
var userJwt = webClient.post()
9898
.uri(builder -> builder.path("/api/v1/brukere/{id}/token").build(bruker.id()))
99-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
99+
.headers(WebClientHeader.bearer(token.getTokenValue()))
100100
.retrieve()
101101
.bodyToMono(String.class)
102102
.block();
@@ -109,8 +109,8 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
109109
// Change username
110110
webClient.patch()
111111
.uri(builder -> builder.path("/api/v1/brukere/{id}/brukernavn").build(bruker.id()))
112-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
113-
.header(UserConstant.USER_HEADER_JWT, userJwt)
112+
.headers(WebClientHeader.bearer(token.getTokenValue()))
113+
.headers(WebClientHeader.jwt(userJwt))
114114
.body(BodyInserters.fromValue(
115115
"new-username"
116116
))
@@ -126,8 +126,8 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
126126
// Get updated user
127127
var updatedUser = webClient.get()
128128
.uri(builder -> builder.path("/api/v1/brukere/{id}").build(bruker.id()))
129-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
130-
.header(UserConstant.USER_HEADER_JWT, userJwt)
129+
.headers(WebClientHeader.bearer(token.getTokenValue()))
130+
.headers(WebClientHeader.jwt(userJwt))
131131
.retrieve()
132132
.bodyToMono(BrukerDTO.class)
133133
.block();
@@ -145,8 +145,8 @@ void should_create_new_user_login_change_username_and_then_delete_user() throws
145145
// Delete user
146146
webClient.delete()
147147
.uri(builder -> builder.path("/api/v1/brukere/{id}").build(bruker.id()))
148-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token.getTokenValue())
149-
.header(UserConstant.USER_HEADER_JWT, userJwt)
148+
.headers(WebClientHeader.bearer(token.getTokenValue()))
149+
.headers(WebClientHeader.jwt(userJwt))
150150
.retrieve()
151151
.bodyToMono(String.class)
152152
.block();

‎apps/budpro-service/src/main/java/no/nav/dolly/budpro/test/SelfCheckCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public Mono<DummyDTO> call() {
3030
.path("/failure/get")
3131
.queryParam("httpStatus", "402")
3232
.build())
33-
//.headers(WebClientHeaders.bearer(token))
33+
//.headers(WebClientHeader.bearer(token))
3434
.retrieve()
3535
.bodyToMono(DummyDTO.class)
3636
.retryWhen(WebClientError.is(HttpClientErrorException.class::isInstance))

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import no.nav.dolly.util.CallIdUtil;
77
import no.nav.testnav.libs.dto.aareg.v1.Arbeidsforhold;
88
import no.nav.testnav.libs.reactivecore.web.WebClientError;
9-
import no.nav.testnav.libs.securitycore.config.UserConstant;
10-
import org.springframework.http.HttpHeaders;
9+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
1110
import org.springframework.web.reactive.function.client.WebClient;
1211
import reactor.core.publisher.Mono;
1312

@@ -44,8 +43,8 @@ public Mono<ArbeidsforholdRespons> call() {
4443
.build(miljoe))
4544
.header(HEADER_NAV_CALL_ID, CallIdUtil.generateCallId())
4645
.header(HEADER_NAV_PERSON_IDENT, ident)
47-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
48-
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
46+
.headers(WebClientHeader.bearer(token))
47+
.headers(WebClientHeader.jwt(getUserJwt()))
4948
.retrieve()
5049
.bodyToMono(Arbeidsforhold[].class)
5150
.map(arbeidsforhold1 -> ArbeidsforholdRespons.builder()

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import no.nav.dolly.util.CallIdUtil;
77
import no.nav.testnav.libs.dto.aareg.v1.Arbeidsforhold;
88
import no.nav.testnav.libs.reactivecore.web.WebClientError;
9-
import no.nav.testnav.libs.securitycore.config.UserConstant;
10-
import org.springframework.http.HttpHeaders;
9+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
1110
import org.springframework.web.reactive.function.BodyInserters;
1211
import org.springframework.web.reactive.function.client.WebClient;
1312
import reactor.core.publisher.Flux;
@@ -34,8 +33,8 @@ public Flux<ArbeidsforholdRespons> call() {
3433
.uri(uriBuilder -> uriBuilder.path(AAREGDATA_URL)
3534
.build(miljoe))
3635
.header(HEADER_NAV_ARBEIDSFORHOLD, CallIdUtil.generateCallId())
37-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
38-
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
36+
.headers(WebClientHeader.bearer(token))
37+
.headers(WebClientHeader.jwt(getUserJwt()))
3938
.body(BodyInserters.fromValue(arbeidsforhold))
4039
.retrieve()
4140
.bodyToFlux(Arbeidsforhold.class)

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import no.nav.dolly.util.CallIdUtil;
77
import no.nav.testnav.libs.dto.aareg.v1.Arbeidsforhold;
88
import no.nav.testnav.libs.reactivecore.web.WebClientError;
9-
import no.nav.testnav.libs.securitycore.config.UserConstant;
10-
import org.springframework.http.HttpHeaders;
9+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
1110
import org.springframework.web.reactive.function.BodyInserters;
1211
import org.springframework.web.reactive.function.client.WebClient;
1312
import reactor.core.publisher.Flux;
@@ -37,8 +36,8 @@ public Flux<ArbeidsforholdRespons> call() {
3736
.header(NAV_ARBEIDSFORHOLD_PERIODE, arbeidsforhold.getNavArbeidsforholdPeriode().toString())
3837
.header(HEADER_NAV_ARBEIDSFORHOLD, CallIdUtil.generateCallId())
3938
.header(HEADER_NAV_CONSUMER_ID, CONSUMER)
40-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
41-
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
39+
.headers(WebClientHeader.bearer(token))
40+
.headers(WebClientHeader.jwt(getUserJwt()))
4241
.body(BodyInserters.fromValue(arbeidsforhold))
4342
.retrieve()
4443
.bodyToFlux(Arbeidsforhold.class)

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.dolly.bestilling.arbeidsplassencv.dto.ArbeidsplassenCVStatusDTO;
66
import no.nav.testnav.libs.reactivecore.web.WebClientError;
7-
import no.nav.testnav.libs.securitycore.config.UserConstant;
8-
import org.springframework.http.HttpHeaders;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
98
import org.springframework.http.HttpStatus;
109
import org.springframework.web.reactive.function.client.WebClient;
1110
import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -35,8 +34,8 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
3534
.path(ARBEIDSPLASSEN_SAMTYKKE_URL)
3635
.build())
3736
.header(FNR, ident)
38-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
39-
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
37+
.headers(WebClientHeader.bearer(token))
38+
.headers(WebClientHeader.jwt(getUserJwt()))
4039
.retrieve()
4140
.toBodilessEntity()
4241
.map(status -> ArbeidsplassenCVStatusDTO.builder()

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.dolly.bestilling.arbeidsplassencv.dto.ArbeidsplassenCVStatusDTO;
66
import no.nav.testnav.libs.reactivecore.web.WebClientError;
7-
import no.nav.testnav.libs.securitycore.config.UserConstant;
8-
import org.springframework.http.HttpHeaders;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
98
import org.springframework.http.HttpStatus;
109
import org.springframework.web.reactive.function.client.WebClient;
1110
import reactor.core.publisher.Mono;
@@ -37,8 +36,8 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
3736
.build())
3837
.header(FNR, ident)
3938
.header(ARBEIDSPLASSEN_CALL_ID, uuid)
40-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
41-
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
39+
.headers(WebClientHeader.bearer(token))
40+
.headers(WebClientHeader.jwt(getUserJwt()))
4241
.retrieve()
4342
.toBodilessEntity()
4443
.map(response -> ArbeidsplassenCVStatusDTO.builder()

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
import lombok.extern.slf4j.Slf4j;
55
import no.nav.dolly.bestilling.arbeidsplassencv.dto.ArbeidsplassenCVStatusDTO;
66
import no.nav.testnav.libs.reactivecore.web.WebClientError;
7-
import no.nav.testnav.libs.securitycore.config.UserConstant;
8-
import org.springframework.http.HttpHeaders;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientHeader;
98
import org.springframework.http.HttpStatus;
109
import org.springframework.web.reactive.function.client.WebClient;
1110
import reactor.core.publisher.Mono;
@@ -37,8 +36,8 @@ public Mono<ArbeidsplassenCVStatusDTO> call() {
3736
.build())
3837
.header(FNR, ident)
3938
.header(ARBEIDSPLASSEN_CALL_ID, uuid)
40-
.header(HttpHeaders.AUTHORIZATION, "Bearer " + token)
41-
.header(UserConstant.USER_HEADER_JWT, getUserJwt())
39+
.headers(WebClientHeader.bearer(token))
40+
.headers(WebClientHeader.jwt(getUserJwt()))
4241
.retrieve()
4342
.toBodilessEntity()
4443
.map(response -> ArbeidsplassenCVStatusDTO.builder()

0 commit comments

Comments
 (0)