Merge pull request #2 from ks-no/fiks-io

Fiks io
ks-no · May 6, 2019 · 96e0736 · 96e0736
2 parents dce9c84 + b7dfcd6
commit 96e0736
Show file tree

Hide file tree

Showing 14 changed files with 297 additions and 672 deletions.
diff --git a/effective-pom.xml b/effective-pom.xml
diff --git a/pom.xml b/pom.xml
@@ -5,63 +5,110 @@
   <parent>
     <groupId>no.ks.fiks.pom</groupId>
     <artifactId>fiks-ekstern-super-pom</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.8</version>
   </parent>
   <groupId>no.ks.fiks</groupId>
-  <artifactId>svarinn2-send-klient</artifactId>
+  <artifactId>fiks-io-send-klient</artifactId>
   <version>${revision}${changelist}</version>
-  <name>Svarinn2 send-klient</name>
-  <description>Klient for å sende meldinger til SvarInn</description>
-  <url>https://github.com/ks-no/fiks-svarinn2</url>
+  <name>FIKS IO send-klient</name>
+  <description>Klient for å sende meldinger til FIKS IO</description>
+  <url>https://github.com/ks-no/fiks-io</url>
   <scm>
-    <connection>scm:git:[email protected]:ks-no/fiks-svarinn2-send-klient.git</connection>
-    <developerConnection>scm:git:[email protected]:ks-no/fiks-svarinn2-send-klient.git</developerConnection>
-    <url>https://github.com/ks-no/fiks-svarinn2-send-klient</url>
+    <connection>scm:git:[email protected]:ks-no/fiks-io-send-klient.git</connection>
+    <developerConnection>scm:git:[email protected]:ks-no/fiks-io-send-klient.git</developerConnection>
+    <url>https://github.com/ks-no/fiks-io-send-klient</url>
   </scm>
   <properties>
-    <revision>1.0.6</revision>
+    <revision>1.1.0</revision>
     <changelist>-SNAPSHOT</changelist>
+    <commons-io.version>2.6</commons-io.version>
+    <jackson.version>2.9.8</jackson.version>
+    <jetty-client.version>9.4.18.v20190429</jetty-client.version>
+    <junit-jupiter.version>5.4.2</junit-jupiter.version>
+    <junit-platform-commons.version>1.4.2</junit-platform-commons.version>
+    <lombok.version>1.16.18</lombok.version>
+    <maskinporten-client.version>1.0.11</maskinporten-client.version>
+    <mockito.version>2.24.5</mockito.version>
+    <validation-api.version>2.0.1.Final</validation-api.version>
+    <vavr.version>0.10.0</vavr.version>
+    <logback-classic.version>1.2.3</logback-classic.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.16.18</version>
+      <version>${lombok.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <version>2.0.1.Final</version>
+      <version>${validation-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.vavr</groupId>
       <artifactId>vavr</artifactId>
-      <version>0.10.0</version>
+      <version>${vavr.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.13.v20181111</version>
+      <version>${jetty-client.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.8</version>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.8</version>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.6</version>
+      <version>${commons-io.version}</version>
     </dependency>
     <dependency>
       <groupId>no.ks.fiks</groupId>
       <artifactId>maskinporten-client</artifactId>
-      <version>1.0.8</version>
+      <version>${maskinporten-client.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+      <version>${junit-platform-commons.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-classic.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

diff --git a/...arinn2/klient/AuthenticationStrategy.java → ...iks/io/klient/AuthenticationStrategy.java b/...arinn2/klient/AuthenticationStrategy.java → ...iks/io/klient/AuthenticationStrategy.java
@@ -1,4 +1,4 @@
-package no.ks.fiks.svarinn2.klient;
+package no.ks.fiks.io.klient;
 
 import org.eclipse.jetty.client.api.Request;
 

diff --git a/...svarinn2/klient/SvarInnHttpException.java → ...s/fiks/io/klient/FiksIOHttpException.java b/...svarinn2/klient/SvarInnHttpException.java → ...s/fiks/io/klient/FiksIOHttpException.java
@@ -1,11 +1,11 @@
-package no.ks.fiks.svarinn2.klient;
+package no.ks.fiks.io.klient;
 
-public class SvarInnHttpException extends RuntimeException {
+public class FiksIOHttpException extends RuntimeException {
 
     private final int status;
     private final String response;
 
-    SvarInnHttpException(String message, int status, String response) {
+    FiksIOHttpException(String message, int status, String response) {
         super(message);
         this.status = status;
         this.response = response;

diff --git a/...arinn2/klient/SvarInnUtsendingKlient.java → ...fiks/io/klient/FiksIOUtsendingKlient.java b/...arinn2/klient/SvarInnUtsendingKlient.java → ...fiks/io/klient/FiksIOUtsendingKlient.java
@@ -1,19 +1,17 @@
-package no.ks.fiks.svarinn2.klient;
+package no.ks.fiks.io.klient;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.vavr.control.Option;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.client.util.InputStreamContentProvider;
 import org.eclipse.jetty.client.util.InputStreamResponseListener;
 import org.eclipse.jetty.client.util.MultiPartContentProvider;
 import org.eclipse.jetty.client.util.StringContentProvider;
-import org.eclipse.jetty.http.HttpMethod;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -29,34 +27,26 @@
 import static org.eclipse.jetty.http.HttpStatus.isServerError;
 
 @Slf4j
-public class SvarInnUtsendingKlient {
+public class FiksIOUtsendingKlient {
 
-    private final HttpClient client = new HttpClient();
-    private final String svarInnScheme;
-    private final String svarInnHost;
-    private final Integer svarInnPort;
+    private final RequestFactory requestFactory;
     private final AuthenticationStrategy authenticationStrategy;
     private Function<Request, Request> requestInterceptor;
 
-    private final ObjectMapper objectMapper = new ObjectMapper();
-    private static final String BASE_PATH = "/svarinn2/api/v1/";
+    private final ObjectMapper objectMapper;
 
-    public SvarInnUtsendingKlient(@NonNull String svarInnScheme, @NonNull String svarInnHost, @NonNull Integer svarInnPort, @NonNull AuthenticationStrategy authenticationStrategy, @NonNull Function<Request, Request> requestInterceptor) {
-        this.svarInnScheme = svarInnScheme;
-        this.svarInnHost = svarInnHost;
-        this.svarInnPort = svarInnPort;
+    FiksIOUtsendingKlient(@NonNull final RequestFactory requestFactory,
+                          @NonNull AuthenticationStrategy authenticationStrategy,
+                          @NonNull Function<Request, Request> requestInterceptor,
+                          @NonNull final ObjectMapper objectMapper) {
+        this.requestFactory = requestFactory;
         this.authenticationStrategy = authenticationStrategy;
         this.requestInterceptor = requestInterceptor;
-
-        try {
-            this.client.start();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+        this.objectMapper = objectMapper;
     }
 
-    public SvarInnUtsendingKlient(@NonNull String svarInnScheme, @NonNull String svarInnHost, @NonNull Integer svarInnPort, @NonNull AuthenticationStrategy authenticationStrategy) {
-        this(svarInnScheme, svarInnHost, svarInnPort, authenticationStrategy, r -> r);
+    public static FiksIOUtsendingKlientBuilder builder() {
+        return new FiksIOUtsendingKlientBuilder();
     }
 
     public SendtMeldingApiModel send(@NonNull MeldingSpesifikasjonApiModel metadata, @NonNull Option<InputStream> data) {
@@ -68,11 +58,7 @@ public SendtMeldingApiModel send(@NonNull MeldingSpesifikasjonApiModel metadata,
         contentProvider.close();
 
         InputStreamResponseListener listener = new InputStreamResponseListener();
-        Request request = client.newRequest(svarInnHost, svarInnPort)
-                .scheme(svarInnScheme)
-                .method(HttpMethod.POST)
-                .path(BASE_PATH + "send")
-                .content(contentProvider);
+        final Request request = requestFactory.createSendToFiksIORequest(contentProvider);
 
         authenticationStrategy.setAuthenticationHeaders(request);
 
@@ -83,11 +69,11 @@ public SendtMeldingApiModel send(@NonNull MeldingSpesifikasjonApiModel metadata,
             if (isClientError(response.getStatus()) || isServerError(response.getStatus())) {
                 int status = response.getStatus();
                 String content = IOUtils.toString(listener.getInputStream(), StandardCharsets.UTF_8);
-                throw new SvarInnHttpException(String.format("HTTP-feil under sending av melding (%d): %s", status, content), status, content);
+                throw new FiksIOHttpException(String.format("HTTP-feil under sending av melding (%d): %s", status, content), status, content);
             }
             return objectMapper.readValue(listener.getInputStream(), SendtMeldingApiModel.class);
         } catch (InterruptedException | TimeoutException | ExecutionException | IOException e) {
-            throw new RuntimeException("Feil under invokering av svarinn api", e);
+            throw new RuntimeException("Feil under invokering av FIKS IO api", e);
         }
     }
 

diff --git a/src/main/java/no/ks/fiks/io/klient/FiksIOUtsendingKlientBuilder.java b/src/main/java/no/ks/fiks/io/klient/FiksIOUtsendingKlientBuilder.java
@@ -0,0 +1,90 @@
+package no.ks.fiks.io.klient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.NonNull;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.api.Request;
+
+import java.util.function.Function;
+
+/**
+ * Builder that must be used to create
+ */
+public class FiksIOUtsendingKlientBuilder {
+
+    private HttpClient httpClient = new HttpClient();
+
+    private String scheme = "https";
+
+    private String hostName;
+
+    private Integer portNumber;
+
+    private AuthenticationStrategy authenticationStrategy;
+
+    private Function<Request, Request> requestInterceptor;
+
+    private ObjectMapper objectMapper = new ObjectMapper().findAndRegisterModules();
+
+    public FiksIOUtsendingKlientBuilder withHttpClient(@NonNull final HttpClient httpClient) {
+        this.httpClient = httpClient;
+        return this;
+    }
+
+    public FiksIOUtsendingKlientBuilder withScheme(@NonNull final String scheme) {
+        this.scheme = scheme;
+        return this;
+    }
+
+    public FiksIOUtsendingKlientBuilder withHostName(@NonNull final String hostName) {
+        this.hostName = hostName;
+        return this;
+    }
+
+    public FiksIOUtsendingKlientBuilder withPortNumber(@NonNull final Integer portNumber) {
+        this.portNumber = portNumber;
+        return this;
+    }
+
+    public FiksIOUtsendingKlientBuilder withAuthenticationStrategy(@NonNull final AuthenticationStrategy authenticationStrategy) {
+        this.authenticationStrategy = authenticationStrategy;
+        return this;
+    }
+
+    public FiksIOUtsendingKlientBuilder withRequestInterceptor(Function<Request, Request> requestInterceptor) {
+        this.requestInterceptor = requestInterceptor;
+        return this;
+    }
+
+    public FiksIOUtsendingKlientBuilder withObjectMapper(final ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+        return this;
+    }
+
+    public FiksIOUtsendingKlient build() {
+        objectMapper = new ObjectMapper();
+        return new FiksIOUtsendingKlient(
+                createRequestFactory(),
+                authenticationStrategy,
+                getOrCreateRequestInterceptor(),
+                getOrCreateObjectMapper()
+        );
+    }
+
+    private RequestFactory createRequestFactory() {
+        return RequestFactoryImpl.builder()
+                                 .client(httpClient)
+                                 .scheme(scheme)
+                                 .hostName(hostName)
+                                 .portNumber(portNumber)
+                                 .build();
+    }
+
+    private Function<Request, Request> getOrCreateRequestInterceptor() {
+        return requestInterceptor == null ? request -> request : requestInterceptor;
+    }
+
+    private ObjectMapper getOrCreateObjectMapper() {
+        return objectMapper == null ? new ObjectMapper().findAndRegisterModules() : objectMapper;
+    }
+}
diff --git a/...nt/IntegrasjonAuthenticationStrategy.java → ...nt/IntegrasjonAuthenticationStrategy.java b/...nt/IntegrasjonAuthenticationStrategy.java → ...nt/IntegrasjonAuthenticationStrategy.java
@@ -1,4 +1,4 @@
-package no.ks.fiks.svarinn2.klient;
+package no.ks.fiks.io.klient;
 
 import no.ks.fiks.maskinporten.Maskinportenklient;
 import org.eclipse.jetty.client.api.Request;
@@ -8,6 +8,10 @@
 
 public class IntegrasjonAuthenticationStrategy implements AuthenticationStrategy {
 
+    static final String INTEGRASJON_ID = "IntegrasjonId";
+
+    static final String INTEGRASJON_PASSWORD = "IntegrasjonPassord";
+
     private final Maskinportenklient maskinportenklient;
     private final UUID integrasjonId;
     private final String integrasjonPassord;
@@ -21,8 +25,8 @@ public IntegrasjonAuthenticationStrategy(Maskinportenklient maskinportenklient,
     @Override
     public void setAuthenticationHeaders(Request request) {
         request.header(HttpHeader.AUTHORIZATION, "Bearer " + getAccessToken())
-                .header("IntegrasjonId", integrasjonId.toString())
-                .header("IntegrasjonPassord", integrasjonPassord);
+                .header(INTEGRASJON_ID, integrasjonId.toString())
+                .header(INTEGRASJON_PASSWORD, integrasjonPassord);
     }
 
     private String getAccessToken() {

diff --git a/.../klient/MeldingSpesifikasjonApiModel.java → .../klient/MeldingSpesifikasjonApiModel.java b/.../klient/MeldingSpesifikasjonApiModel.java → .../klient/MeldingSpesifikasjonApiModel.java
@@ -1,4 +1,4 @@
-package no.ks.fiks.svarinn2.klient;
+package no.ks.fiks.io.klient;
 
 import lombok.Builder;
 import lombok.Value;

diff --git a/src/main/java/no/ks/fiks/io/klient/RequestFactory.java b/src/main/java/no/ks/fiks/io/klient/RequestFactory.java
@@ -0,0 +1,8 @@
+package no.ks.fiks.io.klient;
+
+import org.eclipse.jetty.client.api.ContentProvider;
+import org.eclipse.jetty.client.api.Request;
+
+public interface RequestFactory {
+    Request createSendToFiksIORequest(ContentProvider contentProvider);
+}