Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 92ffefd

Browse files
rfc3092rfc3092
committedMar 13, 2025··
Changes following merge from master.
1 parent 12b86a8 commit 92ffefd

20 files changed

+80
-120
lines changed
 

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ public class ArenaForvalterConsumer {
3434
private final TokenExchange tokenExchange;
3535
private final ServerProperties serverProperties;
3636

37-
private static final String MOTTA_DAGPENGESOKNAD_PATH = "/api/v1/mottadagpengesoknad";
38-
private static final String MOTTA_DAGPENGEVEDTAK_PATH = "/api/v1/mottadagpengevedtak";
39-
private static final String DAGPENGEVEDTAK_PATH = "/api/v1/dagpenger";
40-
4137
public ArenaForvalterConsumer(
4238
Consumers consumers,
4339
TokenExchange tokenExchange,
@@ -54,7 +50,7 @@ public ArenaForvalterConsumer(
5450
public NyeBrukereResponse sendBrukereTilArenaForvalter(List<NyBruker> nyeBrukere) {
5551

5652
return tokenExchange.exchange(serverProperties)
57-
.flatMap(accessToken -> new PostArenaBrukerCommand(nyeBrukere, accessToken.getTokenValue(), webClient).call())
53+
.flatMap(accessToken -> new PostArenaBrukerCommand(webClient, nyeBrukere, accessToken.getTokenValue()).call())
5854
.block();
5955
}
6056

@@ -104,7 +100,7 @@ public Map<String, List<NyttVedtakResponse>> opprettRettighet(List<RettighetRequ
104100
public NyttVedtakResponse finnTiltak(FinnTiltakRequest rettighet) {
105101
try {
106102
return tokenExchange.exchange(serverProperties)
107-
.flatMap(accessToken -> new PostFinnTiltakCommand(rettighet, accessToken.getTokenValue(), webClient).call())
103+
.flatMap(accessToken -> new PostFinnTiltakCommand(webClient, accessToken.getTokenValue(), rettighet).call())
108104
.block();
109105
} catch (Exception e) {
110106
log.error("Klarte ikke hente tiltak for ident {} i miljø {}", rettighet.getPersonident(), rettighet.getMiljoe(), e);
@@ -202,17 +198,17 @@ private List<Arbeidsoeker> gaaGjennomSider(
202198

203199
public DagpengerResponseDTO opprettMottaDagpengerSoknad(DagpengerRequestDTO soknad) {
204200
log.info("Sender inn motta dagpengesoknad til Arena-forvalteren");
205-
return opprettDagpenger(soknad, MOTTA_DAGPENGESOKNAD_PATH);
201+
return opprettDagpenger(soknad, "/api/v1/mottadagpengesoknad");
206202
}
207203

208204
public DagpengerResponseDTO opprettMottaDagpengerVedtak(DagpengerRequestDTO vedtak) {
209205
log.info("Sender inn motta dagpengevedtak til Arena-forvalteren");
210-
return opprettDagpenger(vedtak, MOTTA_DAGPENGEVEDTAK_PATH);
206+
return opprettDagpenger(vedtak, "/api/v1/mottadagpengevedtak");
211207
}
212208

213209
public DagpengerResponseDTO opprettDagpengerVedtak(DagpengerRequestDTO vedtak) {
214210
log.info("Sender inn dagpengevedtak til Arena-forvalteren");
215-
return opprettDagpenger(vedtak, DAGPENGEVEDTAK_PATH);
211+
return opprettDagpenger(vedtak, "/api/v1/dagpenger");
216212
}
217213

218214
private DagpengerResponseDTO opprettDagpenger(DagpengerRequestDTO request, String path) {

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/GetArenaBrukereCommand.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

3-
import lombok.AllArgsConstructor;
3+
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
5-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
5+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
66
import org.springframework.util.MultiValueMap;
77
import org.springframework.web.reactive.function.client.WebClient;
88
import reactor.core.publisher.Mono;
99

1010
import java.util.concurrent.Callable;
1111

12-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.AUTHORIZATION;
13-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CALL_ID;
14-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CONSUMER_ID;
15-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CALL_ID;
16-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CONSUMER_ID;
12+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.*;
1713

18-
@AllArgsConstructor
14+
@RequiredArgsConstructor
1915
public class GetArenaBrukereCommand implements Callable<Mono<NyeBrukereResponse>> {
2016

2117
private final MultiValueMap<String, String> queryParams;
@@ -37,4 +33,5 @@ public Mono<NyeBrukereResponse> call() {
3733
.bodyToMono(NyeBrukereResponse.class)
3834
.doOnError(WebClientFilter::logErrorMessage);
3935
}
36+
4037
}

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostArenaBrukerCommand.java

+13-20
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

3+
import lombok.RequiredArgsConstructor;
34
import lombok.extern.slf4j.Slf4j;
45
import no.nav.testnav.libs.dto.arena.testnorge.brukere.NyBruker;
56
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyeBrukereResponse;
6-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
78
import org.springframework.core.ParameterizedTypeReference;
89
import org.springframework.http.HttpHeaders;
910
import org.springframework.http.MediaType;
@@ -16,46 +17,38 @@
1617
import java.util.Map;
1718
import java.util.concurrent.Callable;
1819

19-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.AUTHORIZATION;
20-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CALL_ID;
21-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CONSUMER_ID;
22-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CALL_ID;
23-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CONSUMER_ID;
24-
20+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.*;
2521
import static no.nav.testnav.apps.syntvedtakshistorikkservice.service.util.ServiceUtils.EIER;
2622

23+
@RequiredArgsConstructor
2724
@Slf4j
2825
public class PostArenaBrukerCommand implements Callable<Mono<NyeBrukereResponse>> {
2926

3027
private final WebClient webClient;
31-
private final Map<String, List<NyBruker>> nyeBrukere;
28+
private final List<NyBruker> nyeBrukere;
3229
private final String token;
3330

3431
private static final ParameterizedTypeReference<Map<String, List<NyBruker>>> REQUEST_TYPE = new ParameterizedTypeReference<>() {
3532
};
3633

37-
public PostArenaBrukerCommand(List<NyBruker> nyeBrukere, String token, WebClient webClient) {
38-
this.webClient = webClient;
39-
this.nyeBrukere = Collections.singletonMap("nyeBrukere", nyeBrukere);
40-
this.token = token;
41-
}
42-
4334
@Override
4435
public Mono<NyeBrukereResponse> call() {
4536
log.info("Sender inn ny(e) bruker(e) til Arena-forvalteren.");
4637
return webClient.post()
47-
.uri(builder ->
48-
builder.path("/api/v1/bruker")
49-
.queryParam("eier", EIER)
50-
.build()
51-
)
38+
.uri(builder -> builder
39+
.path("/api/v1/bruker")
40+
.queryParam("eier", EIER)
41+
.build())
5242
.header(CALL_ID, NAV_CALL_ID)
5343
.header(CONSUMER_ID, NAV_CONSUMER_ID)
5444
.header(AUTHORIZATION, "Bearer " + token)
5545
.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
56-
.body(BodyInserters.fromPublisher(Mono.just(nyeBrukere), REQUEST_TYPE))
46+
.body(BodyInserters.fromPublisher(
47+
Mono.just(Collections.singletonMap("nyeBrukere", nyeBrukere)),
48+
REQUEST_TYPE))
5749
.retrieve()
5850
.bodyToMono(NyeBrukereResponse.class)
5951
.doOnError(WebClientFilter::logErrorMessage);
6052
}
53+
6154
}

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostDagpengerCommand.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

3-
import lombok.AllArgsConstructor;
3+
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerRequestDTO;
55
import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengerResponseDTO;
6-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
6+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
77
import org.springframework.http.HttpHeaders;
88
import org.springframework.http.MediaType;
99
import org.springframework.web.reactive.function.BodyInserters;
@@ -14,7 +14,7 @@
1414

1515
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.*;
1616

17-
@AllArgsConstructor
17+
@RequiredArgsConstructor
1818
public class PostDagpengerCommand implements Callable<Mono<DagpengerResponseDTO>> {
1919

2020
private final DagpengerRequestDTO request;
@@ -35,4 +35,5 @@ public Mono<DagpengerResponseDTO> call() {
3535
.bodyToMono(DagpengerResponseDTO.class)
3636
.doOnError(WebClientFilter::logErrorMessage);
3737
}
38+
3839
}

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostEndreInnsatsbehovCommand.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

3-
import lombok.AllArgsConstructor;
3+
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.EndreInnsatsbehovRequest;
55
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.arena.EndreInnsatsbehovResponse;
6-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
6+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
77
import org.springframework.http.HttpHeaders;
88
import org.springframework.http.MediaType;
99
import org.springframework.web.reactive.function.BodyInserters;
@@ -12,13 +12,9 @@
1212

1313
import java.util.concurrent.Callable;
1414

15-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.AUTHORIZATION;
16-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CALL_ID;
17-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CONSUMER_ID;
18-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CALL_ID;
19-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CONSUMER_ID;
15+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.*;
2016

21-
@AllArgsConstructor
17+
@RequiredArgsConstructor
2218
public class PostEndreInnsatsbehovCommand implements Callable<Mono<EndreInnsatsbehovResponse>> {
2319

2420
private final EndreInnsatsbehovRequest request;
@@ -41,4 +37,5 @@ public Mono<EndreInnsatsbehovResponse> call() {
4137
.bodyToMono(EndreInnsatsbehovResponse.class)
4238
.doOnError(WebClientFilter::logErrorMessage);
4339
}
40+
4441
}

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostFinnTiltakCommand.java

+10-25
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

3+
import lombok.RequiredArgsConstructor;
34
import lombok.extern.slf4j.Slf4j;
45
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.FinnTiltakRequest;
56
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
6-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
7+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
78
import org.springframework.http.HttpHeaders;
89
import org.springframework.http.MediaType;
910
import org.springframework.web.reactive.function.BodyInserters;
@@ -12,38 +13,22 @@
1213

1314
import java.util.concurrent.Callable;
1415

15-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.AUTHORIZATION;
16-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CALL_ID;
17-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CONSUMER_ID;
18-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CALL_ID;
19-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CONSUMER_ID;
20-
16+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.*;
2117

18+
@RequiredArgsConstructor
2219
@Slf4j
2320
public class PostFinnTiltakCommand implements Callable<Mono<NyttVedtakResponse>> {
2421

25-
private final String miljoe;
26-
private final String ident;
27-
private final String token;
2822
private final WebClient webClient;
23+
private final String token;
2924
private final FinnTiltakRequest rettighet;
3025

31-
public PostFinnTiltakCommand(FinnTiltakRequest rettighet, String token, WebClient webClient) {
32-
this.webClient = webClient;
33-
this.miljoe = rettighet.getMiljoe();
34-
this.ident = rettighet.getPersonident();
35-
this.rettighet = rettighet;
36-
this.token = token;
37-
}
38-
3926
@Override
4027
public Mono<NyttVedtakResponse> call() {
41-
log.info("Henter tiltak for ident {} i miljø {}", ident, miljoe);
42-
return webClient.post()
43-
.uri(builder ->
44-
builder.path("/api/v1/finntiltak")
45-
.build()
46-
)
28+
log.info("Henter tiltak for ident {} i miljø {}", rettighet.getPersonident(), rettighet.getMiljoe());
29+
return webClient
30+
.post()
31+
.uri(builder -> builder.path("/api/v1/finntiltak").build())
4732
.header(CALL_ID, NAV_CALL_ID)
4833
.header(CONSUMER_ID, NAV_CONSUMER_ID)
4934
.header(AUTHORIZATION, "Bearer " + token)
@@ -52,7 +37,7 @@ public Mono<NyttVedtakResponse> call() {
5237
.retrieve()
5338
.bodyToMono(NyttVedtakResponse.class)
5439
.doOnError(WebClientFilter::logErrorMessage);
55-
5640
}
41+
5742
}
5843

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/PostRettighetCommand.java

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena;
22

3-
import lombok.AllArgsConstructor;
3+
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetRequest;
55
import no.nav.testnav.libs.dto.arena.testnorge.vedtak.NyttVedtakResponse;
6-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
6+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
77
import org.springframework.http.HttpHeaders;
88
import org.springframework.http.MediaType;
99
import org.springframework.web.reactive.function.BodyInserters;
@@ -12,13 +12,9 @@
1212

1313
import java.util.concurrent.Callable;
1414

15-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.AUTHORIZATION;
16-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CALL_ID;
17-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.CONSUMER_ID;
18-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CALL_ID;
19-
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.NAV_CONSUMER_ID;
15+
import static no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers.*;
2016

21-
@AllArgsConstructor
17+
@RequiredArgsConstructor
2218
public class PostRettighetCommand implements Callable<Mono<NyttVedtakResponse>> {
2319

2420
private final RettighetRequest rettighet;
@@ -27,11 +23,9 @@ public class PostRettighetCommand implements Callable<Mono<NyttVedtakResponse>>
2723

2824
@Override
2925
public Mono<NyttVedtakResponse> call() {
30-
return webClient.post()
31-
.uri(builder ->
32-
builder.path(rettighet.getArenaForvalterUrlPath())
33-
.build()
34-
)
26+
return webClient
27+
.post()
28+
.uri(builder -> builder.path(rettighet.getArenaForvalterUrlPath()).build())
3529
.header(CALL_ID, NAV_CALL_ID)
3630
.header(CONSUMER_ID, NAV_CONSUMER_ID)
3731
.header(AUTHORIZATION, "Bearer " + token)
@@ -40,6 +34,6 @@ public Mono<NyttVedtakResponse> call() {
4034
.retrieve()
4135
.bodyToMono(NyttVedtakResponse.class)
4236
.doOnError(WebClientFilter::logErrorMessage);
43-
4437
}
38+
4539
}

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/arena/SlettArenaBrukerCommand.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import lombok.extern.slf4j.Slf4j;
66
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.util.Headers;
77
import no.nav.testnav.libs.reactivecore.web.WebClientError;
8-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
8+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
99
import org.springframework.http.ResponseEntity;
1010
import org.springframework.web.reactive.function.client.WebClient;
1111
import reactor.core.publisher.Mono;
@@ -28,12 +28,11 @@ public Mono<ResponseEntity<JsonNode>> call() {
2828
log.info("Sletter ident {} fra Arena Forvalter i miljø {}.", personident, miljoe);
2929
return webClient
3030
.delete()
31-
.uri(builder ->
32-
builder.path("/api/v1/bruker")
33-
.queryParam("miljoe", miljoe)
34-
.queryParam("personident", personident)
35-
.build()
36-
)
31+
.uri(builder -> builder
32+
.path("/api/v1/bruker")
33+
.queryParam("miljoe", miljoe)
34+
.queryParam("personident", personident)
35+
.build())
3736
.header(AUTHORIZATION, "Bearer " + token)
3837
.header(Headers.CALL_ID, Headers.NAV_CALL_ID)
3938
.header(Headers.CONSUMER_ID, Headers.NAV_CONSUMER_ID)

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/fastedata/GetOrganisasjonerCommand.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import lombok.RequiredArgsConstructor;
44
import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.fastedata.Organisasjon;
5-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
65
import no.nav.testnav.libs.reactivecore.web.WebClientError;
6+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
77
import org.springframework.core.ParameterizedTypeReference;
88
import org.springframework.web.reactive.function.client.WebClient;
99
import reactor.core.publisher.Mono;

‎apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/command/inntektstub/DeleteInntekterCommand.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.inntektstub;
22

3-
import lombok.AllArgsConstructor;
4-
import no.nav.testnav.libs.reactivecore.utils.WebClientFilter;
3+
import lombok.RequiredArgsConstructor;
4+
import no.nav.testnav.libs.reactivecore.web.WebClientFilter;
55
import org.springframework.http.HttpHeaders;
66
import org.springframework.web.reactive.function.client.WebClient;
77
import reactor.core.publisher.Mono;
88

99
import java.util.List;
1010
import java.util.concurrent.Callable;
1111

12-
@AllArgsConstructor
12+
@RequiredArgsConstructor
1313
public class DeleteInntekterCommand implements Callable<Mono<Void>> {
1414

1515
private final List<String> identer;
1616
private final String token;
1717
private final WebClient webClient;
1818

19-
2019
@Override
2120
public Mono<Void> call() {
22-
return webClient.delete()
21+
return webClient
22+
.delete()
2323
.uri(uriBuilder -> uriBuilder
2424
.path("/api/v2/personer")
2525
.queryParam("norske-identer", identer)

0 commit comments

Comments
 (0)
Please sign in to comment.