Fjernet boilerplate fra synt-sykemelding-api sin bruk av ServerProper…

…ties.
navikt · Oct 26, 2023 · b7520a4 · b7520a4
1 parent e84af9b
commit b7520a4
Show file tree

Hide file tree

Showing 19 changed files with 95 additions and 129 deletions.
diff --git a/...ykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/Consumers.java b/...ykemelding-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/config/Consumers.java
@@ -0,0 +1,34 @@
+package no.nav.testnav.apps.syntsykemeldingapi.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}.
+ * <br/><br/>
+ * Husk at Spring Boot bruker <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.external-config.typesafe-configuration-properties.relaxed-binding">relaxed binding</a>
+ * mellom configuration properties og field names.
+ *
+ * @see ServerProperties
+ */
+@Configuration
+@ConfigurationProperties(prefix = "consumers")
+@NoArgsConstructor(access = PACKAGE)
+@Getter
+@Setter(PACKAGE)
+public class Consumers {
+
+    private ServerProperties testnavArbeidsforholdService;
+    private ServerProperties testnavHelsepersonellService;
+    private ServerProperties testnavOrganisasjonService;
+    private ServerProperties testnavPdlProxy;
+    private ServerProperties sykemeldingApi;
+    private ServerProperties syntSykemelding;
+
+}
diff --git a/...v/testnav/apps/syntsykemeldingapi/config/credentials/ArbeidsforholdServiceProperties.java b/...v/testnav/apps/syntsykemeldingapi/config/credentials/ArbeidsforholdServiceProperties.java
diff --git a/...v/testnav/apps/syntsykemeldingapi/config/credentials/HelsepersonellServiceProperties.java b/...v/testnav/apps/syntsykemeldingapi/config/credentials/HelsepersonellServiceProperties.java
diff --git a/...nav/testnav/apps/syntsykemeldingapi/config/credentials/OrganisasjonServiceProperties.java b/...nav/testnav/apps/syntsykemeldingapi/config/credentials/OrganisasjonServiceProperties.java
diff --git a/...in/java/no/nav/testnav/apps/syntsykemeldingapi/config/credentials/PdlProxyProperties.java b/...in/java/no/nav/testnav/apps/syntsykemeldingapi/config/credentials/PdlProxyProperties.java
diff --git a/...java/no/nav/testnav/apps/syntsykemeldingapi/config/credentials/SykemeldingProperties.java b/...java/no/nav/testnav/apps/syntsykemeldingapi/config/credentials/SykemeldingProperties.java
diff --git a/.../no/nav/testnav/apps/syntsykemeldingapi/config/credentials/SyntSykemeldingProperties.java b/.../no/nav/testnav/apps/syntsykemeldingapi/config/credentials/SyntSykemeldingProperties.java
diff --git a/...src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumer.java b/...src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumer.java
@@ -2,9 +2,10 @@
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.ArbeidsforholdServiceProperties;
+import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.GetArbeidsforholdCommand;
 import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v1.ArbeidsforholdDTO;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Component;
 
@@ -15,24 +16,23 @@
 public class ArbeidsforholdConsumer {
     private final TokenExchange tokenExchange;
     private final WebClient webClient;
-    private final ArbeidsforholdServiceProperties serviceProperties;
+    private final ServerProperties serverProperties;
 
     public ArbeidsforholdConsumer(
             TokenExchange tokenExchange,
-            ArbeidsforholdServiceProperties serviceProperties) {
-
+            Consumers consumers) {
         this.tokenExchange = tokenExchange;
-        this.serviceProperties = serviceProperties;
+        serverProperties = consumers.getTestnavArbeidsforholdService();
         this.webClient = WebClient
                 .builder()
-                .baseUrl(serviceProperties.getUrl())
+                .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
     @SneakyThrows
     public ArbeidsforholdDTO getArbeidsforhold(String ident, String orgnummer, String arbeidsforholdId) {
         log.info("Henter arbeidsforhold for {} i org {} med id {}", ident, orgnummer, arbeidsforholdId);
-        var response = tokenExchange.exchange(serviceProperties)
+        var response = tokenExchange.exchange(serverProperties)
                 .flatMap(accessToken -> new GetArbeidsforholdCommand(
                         webClient,
                         accessToken.getTokenValue(),

diff --git a/...src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumer.java b/...src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/HelsepersonellConsumer.java
@@ -2,10 +2,11 @@
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.HelsepersonellServiceProperties;
+import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.GetHelsepersonellCommand;
 import no.nav.testnav.apps.syntsykemeldingapi.domain.HelsepersonellListe;
 import no.nav.testnav.apps.syntsykemeldingapi.exception.HelsepersonellNotFoundException;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Component;
 
@@ -19,24 +20,23 @@
 public class HelsepersonellConsumer {
     private final TokenExchange tokenExchange;
     private final WebClient webClient;
-    private final HelsepersonellServiceProperties serviceProperties;
+    private final ServerProperties serverProperties;
 
     public HelsepersonellConsumer(
             TokenExchange tokenExchange,
-            HelsepersonellServiceProperties serviceProperties) {
-
+            Consumers consumers) {
         this.tokenExchange = tokenExchange;
-        this.serviceProperties = serviceProperties;
+        serverProperties = consumers.getTestnavHelsepersonellService();
         this.webClient = WebClient
                 .builder()
-                .baseUrl(serviceProperties.getUrl())
+                .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
     @SneakyThrows
     public HelsepersonellListe hentHelsepersonell() {
         log.info("Henter helsepersonell...");
-        var response = tokenExchange.exchange(serviceProperties)
+        var response = tokenExchange.exchange(serverProperties)
                 .flatMap(accessToken -> new GetHelsepersonellCommand(webClient, accessToken.getTokenValue()).call())
                 .block();
 

diff --git a/...i/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumer.java b/...i/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/OrganisasjonConsumer.java
@@ -1,34 +1,34 @@
 package no.nav.testnav.apps.syntsykemeldingapi.consumer;
 
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.OrganisasjonServiceProperties;
+import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.GetOrganisasjonCommand;
 import no.nav.testnav.libs.dto.organisasjon.v1.OrganisasjonDTO;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Component
 public class OrganisasjonConsumer {
-    private final OrganisasjonServiceProperties serviceProperties;
+    private final ServerProperties serverProperties;
     private final TokenExchange tokenExchange;
     private final WebClient webClient;
 
     private static final String MILJOE = "q1";
 
     public OrganisasjonConsumer(
-            OrganisasjonServiceProperties serviceProperties,
+            Consumers consumers,
             TokenExchange tokenExchange) {
-
-        this.serviceProperties = serviceProperties;
+        serverProperties = consumers.getTestnavOrganisasjonService();
         this.tokenExchange = tokenExchange;
         this.webClient = WebClient
                 .builder()
-                .baseUrl(serviceProperties.getUrl())
+                .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
     public OrganisasjonDTO getOrganisasjon(String orgnummer) {
-        return tokenExchange.exchange(serviceProperties).flatMap(accessToken ->
+        return tokenExchange.exchange(serverProperties).flatMap(accessToken ->
                         new GetOrganisasjonCommand(webClient, accessToken.getTokenValue(), orgnummer, MILJOE).call())
                 .block();
     }

diff --git a/...g-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumer.java b/...g-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/PdlProxyConsumer.java
@@ -1,7 +1,7 @@
 package no.nav.testnav.apps.syntsykemeldingapi.consumer;
 
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.PdlProxyProperties;
+import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.GetPdlPersonCommand;
 import no.nav.testnav.apps.syntsykemeldingapi.domain.pdl.PdlPerson;
 import no.nav.testnav.apps.syntsykemeldingapi.exception.PdlPersonException;
@@ -26,24 +26,25 @@
 @Component
 public class PdlProxyConsumer {
     private final TokenExchange tokenExchange;
-    private final ServerProperties serviceProperties;
+    private final ServerProperties serverProperties;
     private final WebClient webClient;
 
     private static final String SINGLE_PERSON_QUERY = "pdlperson/pdlquery.graphql";
 
     public PdlProxyConsumer(
-            PdlProxyProperties pdlProxyProperties,
+            Consumers consumers,
             TokenExchange tokenExchange) {
-
-        this.serviceProperties = pdlProxyProperties;
+        serverProperties = consumers.getTestnavPdlProxy();
         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(pdlProxyProperties.getUrl())
+                .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
@@ -53,7 +54,7 @@ public PdlPerson getPdlPerson(String ident) {
         }
         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) && !response.getErrors().isEmpty()) {

diff --git a/...pi/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumer.java b/...pi/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SykemeldingConsumer.java
@@ -1,7 +1,7 @@
 package no.nav.testnav.apps.syntsykemeldingapi.consumer;
 
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.SykemeldingProperties;
+import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.PostSykemeldingCommand;
 import no.nav.testnav.libs.dto.sykemelding.v1.SykemeldingDTO;
 import no.nav.testnav.libs.securitycore.domain.ServerProperties;
@@ -15,22 +15,22 @@
 public class SykemeldingConsumer {
 
     private final TokenExchange tokenExchange;
-    private final ServerProperties serviceProperties;
+    private final ServerProperties serverProperties;
     private final WebClient webClient;
 
     public SykemeldingConsumer(
-            SykemeldingProperties serviceProperties,
+            Consumers consumers,
             TokenExchange tokenExchange) {
-
-        this.serviceProperties = serviceProperties;
+        serverProperties = consumers.getSykemeldingApi();
         this.tokenExchange = tokenExchange;
-        this.webClient = WebClient.builder()
-                .baseUrl(serviceProperties.getUrl())
+        this.webClient = WebClient
+                .builder()
+                .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
     public void opprettSykemelding(SykemeldingDTO sykemelding) {
-        tokenExchange.exchange(serviceProperties).flatMap(accessToken ->
+        tokenExchange.exchange(serverProperties).flatMap(accessToken ->
                         new PostSykemeldingCommand(webClient, accessToken.getTokenValue(), sykemelding).call())
                 .block();
     }

diff --git a/...-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SyntElsamConsumer.java b/...-api/src/main/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/SyntElsamConsumer.java
@@ -2,7 +2,7 @@
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.SyntSykemeldingProperties;
+import no.nav.testnav.apps.syntsykemeldingapi.config.Consumers;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.command.PostSyntSykemeldingCommand;
 import no.nav.testnav.apps.syntsykemeldingapi.consumer.dto.SyntSykemeldingHistorikkDTO;
 import no.nav.testnav.apps.syntsykemeldingapi.exception.GenererSykemeldingerException;
@@ -22,22 +22,23 @@
 public class SyntElsamConsumer {
 
     private final TokenExchange tokenExchange;
-    private final ServerProperties serviceProperties;
+    private final ServerProperties serverProperties;
     private final WebClient webClient;
 
     public SyntElsamConsumer(
-            SyntSykemeldingProperties syntProperties,
+            Consumers consumers,
             TokenExchange tokenExchange) {
-
-        this.serviceProperties = syntProperties;
+        serverProperties = consumers.getSyntSykemelding();
         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(syntProperties.getUrl())
+                .baseUrl(serverProperties.getUrl())
                 .build();
     }
 
@@ -47,7 +48,7 @@ public SyntSykemeldingHistorikkDTO genererSykemeldinger(String ident, LocalDate
 
         var request = Map.of(ident, startDato.toString());
 
-        var response = tokenExchange.exchange(serviceProperties).flatMap(accessToken ->
+        var response = tokenExchange.exchange(serverProperties).flatMap(accessToken ->
                         new PostSyntSykemeldingCommand(request, accessToken.getTokenValue(), webClient).call())
                 .block();
 

diff --git a/...test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java b/...test/java/no/nav/testnav/apps/syntsykemeldingapi/consumer/ArbeidsforholdConsumerTest.java
@@ -3,9 +3,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.client.WireMock;
-import no.nav.testnav.apps.syntsykemeldingapi.config.credentials.ArbeidsforholdServiceProperties;
 import no.nav.testnav.libs.dto.oppsummeringsdokumentservice.v1.ArbeidsforholdDTO;
 import no.nav.testnav.libs.securitycore.domain.AccessToken;
+import no.nav.testnav.libs.securitycore.domain.ServerProperties;
 import no.nav.testnav.libs.servletsecurity.exchange.TokenExchange;
 import org.junit.Before;
 import org.junit.Test;
@@ -58,7 +58,7 @@ public class ArbeidsforholdConsumerTest {
     @Before
     public void before() {
         WireMock.reset();
-        when(tokenService.exchange(ArgumentMatchers.any(ArbeidsforholdServiceProperties.class))).thenReturn(Mono.just(new AccessToken("token")));
+        when(tokenService.exchange(ArgumentMatchers.any(ServerProperties.class))).thenReturn(Mono.just(new AccessToken("token")));
         arbeidsforholdResponse = getTestArbeidsforholdDTO(arbeidsforholdId, orgnr);
     }