diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/Consumers.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/Consumers.java new file mode 100644 index 00000000000..4cfc1d14e2c --- /dev/null +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/config/Consumers.java @@ -0,0 +1,36 @@ +package no.nav.testnav.apps.syntvedtakshistorikkservice.config; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +import static lombok.AccessLevel.PACKAGE; + +/** + * Samler alle placeholders for ulike {@code consumers.*}-konfigurasjon her, dvs. subklasser av {@code ServerProperties}. + *

+ * Husk at Spring Boot bruker relaxed binding + * mellom configuration properties og field names. + * + * @see ServerProperties + */ +@Configuration +@ConfigurationProperties(prefix = "consumers") +@NoArgsConstructor(access = PACKAGE) +@Getter +@Setter(PACKAGE) +public class Consumers { + + private ServerProperties testnavArenaForvalterenProxy; + private ServerProperties testnavInntektstubProxy; + private ServerProperties testnavOrganisasjonFasteDataService; + private ServerProperties pdlApiProxy; + private ServerProperties testnavPensjonTestdataFacadeProxy; + private ServerProperties testnavPersonSearchService; + private ServerProperties syntDagpenger; + private ServerProperties syntVedtakshistorikk; + +} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java index af1b2330dbb..ebf6163dd63 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumer.java @@ -1,6 +1,7 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.GetArenaBrukereCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.PostArenaBrukerCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.PostDagpengerCommand; @@ -8,7 +9,6 @@ import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.PostFinnTiltakCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.PostRettighetCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.arena.SlettArenaBrukerCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.ArenaForvalterenProxyProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.EndreInnsatsbehovRequest; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.FinnTiltakRequest; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.RettighetRequest; @@ -42,19 +42,19 @@ public class ArenaForvalterConsumer { private final WebClient webClient; private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; private static final String MOTTA_DAGPENGESOKNAD_PATH = "/api/v1/mottadagpengesoknad"; private static final String MOTTA_DAGPENGEVEDTAK_PATH = "/api/v1/mottadagpengevedtak"; private static final String DAGPENGEVEDTAK_PATH = "/api/v1/dagpenger"; public ArenaForvalterConsumer( - ArenaForvalterenProxyProperties serviceProperties, + Consumers consumers, TokenExchange tokenExchange) { - - this.serviceProperties = serviceProperties; - this.webClient = WebClient.builder() - .baseUrl(serviceProperties.getUrl()) + serverProperties = consumers.getTestnavArenaForvalterenProxy(); + this.webClient = WebClient + .builder() + .baseUrl(serverProperties.getUrl()) .build(); this.tokenExchange = tokenExchange; } @@ -63,7 +63,7 @@ public NyeBrukereResponse sendBrukereTilArenaForvalter( List nyeBrukere ) { try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PostArenaBrukerCommand(nyeBrukere, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -74,7 +74,7 @@ public NyeBrukereResponse sendBrukereTilArenaForvalter( public void slettBrukerIArenaForvalteren(String ident, String miljoe) { try { - var response = tokenExchange.exchange(serviceProperties) + var response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new SlettArenaBrukerCommand(ident, miljoe, accessToken.getTokenValue(), webClient).call()) .block(); @@ -92,7 +92,7 @@ public Map> opprettRettighet(List new PostRettighetCommand(rettighet, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -117,7 +117,7 @@ public Map> opprettRettighet(List new PostFinnTiltakCommand(rettighet, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -129,7 +129,7 @@ public NyttVedtakResponse finnTiltak(FinnTiltakRequest rettighet) { public void endreInnsatsbehovForBruker(EndreInnsatsbehovRequest endreRequest) { EndreInnsatsbehovResponse response = null; try { - response = tokenExchange.exchange(serviceProperties) + response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PostEndreInnsatsbehovCommand(endreRequest, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -150,7 +150,7 @@ public List hentArbeidsoekere( var queryParams = getQueryParams(personident, eier, miljoe, null); NyeBrukereResponse response = null; try { - response = tokenExchange.exchange(serviceProperties) + response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new GetArenaBrukereCommand(queryParams, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -199,7 +199,7 @@ private List gaaGjennomSider( var queryParams = getQueryParams(personident, eier, miljoe, page + ""); NyeBrukereResponse response = null; try { - response = tokenExchange.exchange(serviceProperties) + response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new GetArenaBrukereCommand(queryParams, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -231,7 +231,7 @@ public DagpengerResponseDTO opprettDagpengerVedtak(DagpengerRequestDTO vedtak) { private DagpengerResponseDTO opprettDagpenger(DagpengerRequestDTO request, String path) { try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PostDagpengerCommand( request, path, accessToken.getTokenValue(), webClient).call()) .block(); diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/InntektstubConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/InntektstubConsumer.java index 6905a462ce4..7af751749ac 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/InntektstubConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/InntektstubConsumer.java @@ -1,9 +1,9 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.inntektstub.DeleteInntekterCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.inntektstub.PostInntekterCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.InntektstubProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.domain.inntektstub.Inntektsinformasjon; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -21,21 +21,24 @@ public class InntektstubConsumer { private final WebClient webClient; private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; public InntektstubConsumer( - InntektstubProperties serviceProperties, + Consumers consumers, TokenExchange tokenExchange ) { - this.serviceProperties = serviceProperties; - this.webClient = WebClient.builder().baseUrl(serviceProperties.getUrl()).build(); + serverProperties = consumers.getTestnavInntektstubProxy(); + this.webClient = WebClient + .builder() + .baseUrl(serverProperties.getUrl()) + .build(); this.tokenExchange = tokenExchange; } public List postInntekter(List inntektsinformasjon) { try { log.info("Oppretter inntekt i inntektstub for ident"); - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PostInntekterCommand(inntektsinformasjon, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -47,7 +50,7 @@ public List postInntekter(List inntekt public void deleteInntekter(List identer) { try { log.info("Sletter ident(er) fra Inntektstub"); - tokenExchange.exchange(serviceProperties) + tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new DeleteInntekterCommand(identer, accessToken.getTokenValue(), webClient).call()) .subscribe(response -> log.info("Slettet identer fra Inntektstub")); } catch (Exception e) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/OrgFasteDataServiceConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/OrgFasteDataServiceConsumer.java index 0a8c1749545..396e5f80bcf 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/OrgFasteDataServiceConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/OrgFasteDataServiceConsumer.java @@ -1,8 +1,8 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.fastedata.GetOrganisasjonerCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.OrgFasteDataServiceProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.fastedata.Organisasjon; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -18,20 +18,23 @@ public class OrgFasteDataServiceConsumer { private final WebClient webClient; private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; public OrgFasteDataServiceConsumer( - OrgFasteDataServiceProperties serviceProperties, + Consumers consumers, TokenExchange tokenExchange ) { - this.serviceProperties = serviceProperties; - this.webClient = WebClient.builder().baseUrl(serviceProperties.getUrl()).build(); + serverProperties = consumers.getTestnavOrganisasjonFasteDataService(); + this.webClient = WebClient + .builder() + .baseUrl(serverProperties.getUrl()) + .build(); this.tokenExchange = tokenExchange; } public List getOrganisasjoner() { try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new GetOrganisasjonerCommand(accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlProxyConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlProxyConsumer.java index 51b1af17747..317d5aa4fc6 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlProxyConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlProxyConsumer.java @@ -1,11 +1,11 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.pdl.GetPdlPersonCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.pdl.GetPdlPersonerCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.pdl.TagsOpprettingCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.pdl.TagsSlettingCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.PdlProxyProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.pdl.PdlPerson; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.pdl.PdlPersonBolk; import no.nav.testnav.apps.syntvedtakshistorikkservice.domain.FilLaster; @@ -33,18 +33,18 @@ public class PdlProxyConsumer { private final WebClient webClient; private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; private static final String SINGLE_PERSON_QUERY = "pdlperson/pdlquery.graphql"; private static final String BOLK_PERSON_QUERY = "pdlperson/pdlbolkquery.graphql"; public PdlProxyConsumer( - PdlProxyProperties serviceProperties, + Consumers consumers, TokenExchange tokenExchange) { - - this.serviceProperties = serviceProperties; - this.webClient = WebClient.builder() - .baseUrl(serviceProperties.getUrl()) + serverProperties = consumers.getPdlApiProxy(); + this.webClient = WebClient + .builder() + .baseUrl(serverProperties.getUrl()) .build(); this.tokenExchange = tokenExchange; } @@ -53,7 +53,7 @@ public PdlPerson getPdlPerson(String ident) { if (isNullOrEmpty(ident)) return null; try { var query = getQueryFromFile(SINGLE_PERSON_QUERY); - var response = tokenExchange.exchange(serviceProperties) + var response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new GetPdlPersonCommand(ident, query, accessToken.getTokenValue(), webClient).call()) .block(); if (nonNull(response) && nonNull(response.getErrors()) && !response.getErrors().isEmpty()) { @@ -72,7 +72,7 @@ public PdlPersonBolk getPdlPersoner(List identer) { if (isNull(identer) || identer.isEmpty()) return null; try { var query = getQueryFromFile(BOLK_PERSON_QUERY); - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new GetPdlPersonerCommand(identer, query, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { @@ -95,7 +95,7 @@ private static String getQueryFromFile(String file) { public boolean createTags(List identer, List tags) { try { if (isNull(identer) || identer.isEmpty()) return false; - var response = tokenExchange.exchange(serviceProperties) + var response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new TagsOpprettingCommand(webClient, identer, tags, accessToken.getTokenValue()).call()) .block(); @@ -114,7 +114,7 @@ public boolean createTags(List identer, List tags) { public boolean deleteTags(List identer, List tags){ try { if (isNull(identer) || identer.isEmpty()) return false; - var response = tokenExchange.exchange(serviceProperties) + var response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new TagsSlettingCommand(webClient, identer, tags, accessToken.getTokenValue()).call()) .block(); if (isNull(response) || !response.getStatusCode().is2xxSuccessful()) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumer.java index fed8be05462..71b796916a7 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumer.java @@ -1,9 +1,9 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.pensjon.PostPensjonTestdataInntektCommand; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.pensjon.PostPensjonTestdataPersonCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.PensjonTestdataFacadeProxyProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.pensjon.PensjonTestdataInntekt; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.pensjon.PensjonTestdataPerson; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.pensjon.PensjonTestdataResponse; @@ -21,15 +21,15 @@ public class PensjonTestdataFacadeConsumer { private final WebClient webClient; private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; public PensjonTestdataFacadeConsumer( - PensjonTestdataFacadeProxyProperties serviceProperties, + Consumers consumers, TokenExchange tokenExchange) { - - this.serviceProperties = serviceProperties; - this.webClient = WebClient.builder() - .baseUrl(serviceProperties.getUrl()) + serverProperties = consumers.getTestnavPensjonTestdataFacadeProxy(); + this.webClient = WebClient + .builder() + .baseUrl(serverProperties.getUrl()) .build(); this.tokenExchange = tokenExchange; } @@ -38,7 +38,7 @@ public PensjonTestdataResponse opprettPerson( PensjonTestdataPerson person ) { try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PostPensjonTestdataPersonCommand(webClient, person, accessToken.getTokenValue()).call()) .block(); } catch (Exception e) { @@ -51,7 +51,7 @@ public PensjonTestdataResponse opprettInntekt( PensjonTestdataInntekt inntekt ) { try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PostPensjonTestdataInntektCommand(webClient, inntekt, accessToken.getTokenValue()).call()) .block(); } catch (Exception e) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumer.java index b222bf4cf9e..73b1f62f91c 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumer.java @@ -1,8 +1,8 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.search.PersonSearchCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.PersonSearchProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.search.PersonSearchResponse; import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch; import no.nav.testnav.libs.securitycore.domain.ServerProperties; @@ -16,22 +16,22 @@ public class PersonSearchConsumer { private final WebClient webClient; private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; public PersonSearchConsumer( - PersonSearchProperties serviceProperties, + Consumers consumers, TokenExchange tokenExchange) { - - this.serviceProperties = serviceProperties; - this.webClient = WebClient.builder() - .baseUrl(serviceProperties.getUrl()) + serverProperties = consumers.getTestnavPersonSearchService(); + this.webClient = WebClient + .builder() + .baseUrl(serverProperties.getUrl()) .build(); this.tokenExchange = tokenExchange; } public PersonSearchResponse search(PersonSearch request) { try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new PersonSearchCommand(request, accessToken.getTokenValue(), webClient).call()) .block(); } catch (Exception e) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntDagpengerConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntDagpengerConsumer.java index 0aa0392d494..47f801aafd2 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntDagpengerConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntDagpengerConsumer.java @@ -1,8 +1,8 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.synt.HentDagpengevedtakCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.SyntDagpengerProperties; import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.DagpengevedtakDTO; import no.nav.testnav.libs.dto.syntvedtakshistorikkservice.v1.dagpenger.Dagpengerettighet; import no.nav.testnav.libs.securitycore.domain.ServerProperties; @@ -21,22 +21,24 @@ public class SyntDagpengerConsumer { private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; private final WebClient webClient; public SyntDagpengerConsumer( - SyntDagpengerProperties properties, + Consumers consumers, TokenExchange tokenExchange ) { - this.serviceProperties = properties; + serverProperties = consumers.getSyntDagpenger(); this.tokenExchange = tokenExchange; - this.webClient = WebClient.builder() - .exchangeStrategies(ExchangeStrategies.builder() + this.webClient = WebClient + .builder() + .exchangeStrategies(ExchangeStrategies + .builder() .codecs(configurer -> configurer .defaultCodecs() .maxInMemorySize(16 * 1024 * 1024)) .build()) - .baseUrl(properties.getUrl()) + .baseUrl(serverProperties.getUrl()) .build(); } @@ -44,7 +46,7 @@ public DagpengevedtakDTO syntetiserDagpengevedtak(Dagpengerettighet rettighet, L var request = Collections.singletonList(startdato.toString()); try { - var response = tokenExchange.exchange(serviceProperties) + var response = tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new HentDagpengevedtakCommand(webClient, request, rettighet, accessToken.getTokenValue()).call()) .block(); if (nonNull(response) && !response.isEmpty()) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumer.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumer.java index 8da83e9683f..e2b7dda6bb8 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumer.java +++ b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumer.java @@ -1,8 +1,8 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; import lombok.extern.slf4j.Slf4j; +import no.nav.testnav.apps.syntvedtakshistorikkservice.config.Consumers; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.command.synt.HentVedtakshistorikkCommand; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.SyntVedtakshistorikkProperties; import no.nav.testnav.libs.domain.dto.arena.testnorge.historikk.Vedtakshistorikk; import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; @@ -26,23 +26,24 @@ public class SyntVedtakshistorikkConsumer { private static final LocalDate MINIMUM_DATE = LocalDate.of(2015, 1, 1); private final TokenExchange tokenExchange; - private final ServerProperties serviceProperties; + private final ServerProperties serverProperties; private final WebClient webClient; private final Random rand = new Random(); public SyntVedtakshistorikkConsumer( - SyntVedtakshistorikkProperties syntVedtakshistorikkProperties, + Consumers consumers, TokenExchange tokenExchange) { - - this.serviceProperties = syntVedtakshistorikkProperties; + serverProperties = consumers.getSyntVedtakshistorikk(); this.tokenExchange = tokenExchange; - this.webClient = WebClient.builder() - .exchangeStrategies(ExchangeStrategies.builder() + this.webClient = WebClient + .builder() + .exchangeStrategies(ExchangeStrategies + .builder() .codecs(configurer -> configurer .defaultCodecs() .maxInMemorySize(16 * 1024 * 1024)) .build()) - .baseUrl(syntVedtakshistorikkProperties.getUrl()) + .baseUrl(serverProperties.getUrl()) .build(); } @@ -54,7 +55,7 @@ public List syntetiserVedtakshistorikk(int antallIdenter) { oppstartsdatoer.add(dato.toString()); } try { - return tokenExchange.exchange(serviceProperties) + return tokenExchange.exchange(serverProperties) .flatMap(accessToken -> new HentVedtakshistorikkCommand(webClient, oppstartsdatoer, accessToken.getTokenValue()).call()) .block(); } catch (Exception e) { diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/ArenaForvalterenProxyProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/ArenaForvalterenProxyProperties.java deleted file mode 100644 index 050c0af079e..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/ArenaForvalterenProxyProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.testnav-arena-forvalteren-proxy") -public class ArenaForvalterenProxyProperties extends ServerProperties { -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/InntektstubProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/InntektstubProperties.java deleted file mode 100644 index d0f6b6989a2..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/InntektstubProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.testnav-inntektstub-proxy") -public class InntektstubProperties extends ServerProperties { -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/OrgFasteDataServiceProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/OrgFasteDataServiceProperties.java deleted file mode 100644 index f2fc88228eb..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/OrgFasteDataServiceProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.testnav-organisasjon-faste-data-service") -public class OrgFasteDataServiceProperties extends ServerProperties { -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PdlProxyProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PdlProxyProperties.java deleted file mode 100644 index 2fd3617624c..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PdlProxyProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.pdl-api-proxy") -public class PdlProxyProperties extends ServerProperties{ -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PensjonTestdataFacadeProxyProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PensjonTestdataFacadeProxyProperties.java deleted file mode 100644 index 97892e5d75d..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PensjonTestdataFacadeProxyProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.testnav-pensjon-testdata-facade-proxy") -public class PensjonTestdataFacadeProxyProperties extends ServerProperties { -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PersonSearchProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PersonSearchProperties.java deleted file mode 100644 index e007f194771..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/PersonSearchProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.testnav-person-search-service") -public class PersonSearchProperties extends ServerProperties{ -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/SyntDagpengerProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/SyntDagpengerProperties.java deleted file mode 100644 index f9e942ef9a2..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/SyntDagpengerProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.synt-dagpenger") -public class SyntDagpengerProperties extends ServerProperties{ -} diff --git a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/SyntVedtakshistorikkProperties.java b/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/SyntVedtakshistorikkProperties.java deleted file mode 100644 index 53bf9762180..00000000000 --- a/apps/synt-vedtakshistorikk-service/src/main/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/credential/SyntVedtakshistorikkProperties.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential; - -import no.nav.testnav.libs.securitycore.domain.ServerProperties; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "consumers.synt-vedtakshistorikk") -public class SyntVedtakshistorikkProperties extends ServerProperties { -} diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java index 4fda1a3d65b..a37b8a6e2f3 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/ArenaForvalterConsumerTest.java @@ -1,9 +1,9 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.ArenaForvalterenProxyProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.arena.rettighet.*; import no.nav.testnav.libs.domain.dto.arena.testnorge.brukere.Arbeidsoeker; import no.nav.testnav.libs.securitycore.domain.AccessToken; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.junit.jupiter.api.BeforeEach; @@ -52,7 +52,7 @@ class ArenaForvalterConsumerTest { @BeforeEach public void setup() { - when(tokenExchange.exchange(ArgumentMatchers.any(ArenaForvalterenProxyProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); + when(tokenExchange.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); } @Test diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java index 9eda49a5615..bf6f7fe9a56 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PdlConsumerTest.java @@ -1,8 +1,8 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.PdlProxyProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.response.pdl.PdlPerson; import no.nav.testnav.libs.securitycore.domain.AccessToken; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -144,6 +144,6 @@ private void stubOpprettTags() { } private void stubTokenRequest() { - when(tokenExchange.exchange(ArgumentMatchers.any(PdlProxyProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); + when(tokenExchange.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); } } diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java index 9a4e4be88aa..0469281914c 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PensjonTestdataFacadeConsumerTest.java @@ -1,9 +1,9 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.PensjonTestdataFacadeProxyProperties; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.pensjon.PensjonTestdataInntekt; import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.request.pensjon.PensjonTestdataPerson; import no.nav.testnav.libs.securitycore.domain.AccessToken; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ class PensjonTestdataFacadeConsumerTest { @BeforeEach public void setup() { - when(tokenExchange.exchange(ArgumentMatchers.any(PensjonTestdataFacadeProxyProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); + when(tokenExchange.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); } diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java index 8feb86ce2bb..6c751b0220b 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/PersonSearchConsumerTest.java @@ -1,9 +1,9 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.PersonSearchProperties; import no.nav.testnav.libs.dto.personsearchservice.v1.search.AlderSearch; import no.nav.testnav.libs.dto.personsearchservice.v1.search.PersonSearch; import no.nav.testnav.libs.securitycore.domain.AccessToken; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -56,7 +56,7 @@ class PersonSearchConsumerTest { @BeforeEach public void setup() { - when(tokenExchange.exchange(ArgumentMatchers.any(PersonSearchProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); + when(tokenExchange.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); } diff --git a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java index e61e5bdbe0f..fe0a771cac3 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java +++ b/apps/synt-vedtakshistorikk-service/src/test/java/no/nav/testnav/apps/syntvedtakshistorikkservice/consumer/SyntVedtakshistorikkConsumerTest.java @@ -1,7 +1,7 @@ package no.nav.testnav.apps.syntvedtakshistorikkservice.consumer; -import no.nav.testnav.apps.syntvedtakshistorikkservice.consumer.credential.SyntVedtakshistorikkProperties; import no.nav.testnav.libs.securitycore.domain.AccessToken; +import no.nav.testnav.libs.securitycore.domain.ServerProperties; import no.nav.testnav.libs.standalone.servletsecurity.exchange.TokenExchange; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ class SyntVedtakshistorikkConsumerTest { @BeforeEach public void setup() { - when(tokenExchange.exchange(ArgumentMatchers.any(SyntVedtakshistorikkProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); + when(tokenExchange.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token"))); } @Test