Oppgradert til meldingsprotokoll

ks-no · May 23, 2019 · 92b7f24 · 92b7f24
1 parent b76d195
commit 92b7f24
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,11 +45,11 @@
     <fiks-feign-interceptors.version>1.0.2</fiks-feign-interceptors.version>
     <spec.postfix>json</spec.postfix>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <revision>1.1.0</revision>
+    <revision>1.2.1</revision>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <java.version>1.8</java.version>
     <slf4j.version>1.7.26</slf4j.version>
-    <fiks-io-send-klient.version>1.1.2</fiks-io-send-klient.version>
+    <fiks-io-send-klient.version>1.2.0</fiks-io-send-klient.version>
     <junit-platform-commons.version>1.4.2</junit-platform-commons.version>
     <spec.name>fiksio-katalog-api-v1</spec.name>
     <guava.version>23.3-jre</guava.version>
@@ -59,7 +59,7 @@
     <rabbitmq-amqp-client.version>5.6.0</rabbitmq-amqp-client.version>
     <fiks-maskinporten-client.version>1.0.11</fiks-maskinporten-client.version>
     <feign-version>9.4.0</feign-version>
-    <fiks-io-commons.version>1.1.0</fiks-io-commons.version>
+    <fiks-io-commons.version>1.2.0</fiks-io-commons.version>
     <junit-jupiter.version>5.4.2</junit-jupiter.version>
     <logback.version>1.2.3</logback.version>
   </properties>

diff --git a/src/main/java/no/ks/fiks/io/client/KatalogHandler.java b/src/main/java/no/ks/fiks/io/client/KatalogHandler.java
@@ -31,7 +31,7 @@ public Optional<Konto> lookup(@NonNull LookupRequest request) {
                     .getIdentifikatorType()
                     .name() + "." + request.getIdentifikator()
                     .getIdentifikator(),
-                request.getMeldingType(), request.getSikkerhetsNiva()))
+                request.getMeldingsprotokoll(), request.getSikkerhetsNiva()))
                 .map(Konto::fromKatalogModel);
         } catch (FeignException e) {
             if (e.status() == 404)

diff --git a/src/main/java/no/ks/fiks/io/client/model/LookupRequest.java b/src/main/java/no/ks/fiks/io/client/model/LookupRequest.java
@@ -8,6 +8,6 @@
 @Builder
 public class LookupRequest {
     @NonNull private Identifikator identifikator;
-    @NonNull private String meldingType;
+    @NonNull private String meldingsprotokoll;
     @NonNull private Integer sikkerhetsNiva;
 }
diff --git a/src/test/java/no/ks/fiks/io/client/FiksIOHandlerTest.java b/src/test/java/no/ks/fiks/io/client/FiksIOHandlerTest.java
@@ -58,7 +58,7 @@ class Send {
         void sendEmptyPayload() {
             final UUID mottakerKontoId = UUID.randomUUID();
             final MeldingRequest meldingRequest = MeldingRequest.builder()
-                .meldingType("meldingType")
+                .meldingType("meldingsprotokoll")
                 .mottakerKontoId(new KontoId(mottakerKontoId))
                 .ttl(Duration.ofDays(5L))
                 .build();
@@ -91,7 +91,7 @@ void sendEmptyPayload() {
         void harPayload() {
             final UUID mottakerKontoId = UUID.randomUUID();
             final MeldingRequest meldingRequest = MeldingRequest.builder()
-                .meldingType("meldingType")
+                .meldingType("meldingsprotokoll")
                 .mottakerKontoId(new KontoId(mottakerKontoId))
                 .ttl(Duration.ofDays(5L))
                 .build();

diff --git a/src/test/java/no/ks/fiks/io/client/KatalogHandlerTest.java b/src/test/java/no/ks/fiks/io/client/KatalogHandlerTest.java
@@ -49,7 +49,7 @@ void lookupNotFound() {
             final Optional<Konto> melding = katalogHandler.lookup(LookupRequest.builder()
                                                                                .identifikator(new Identifikator(identifikatorType, identifikator))
                                                                                .sikkerhetsNiva(sikkerhetsNiva)
-                                                                               .meldingType(meldingType)
+                                                                               .meldingsprotokoll(meldingType)
                                                                                .build());
             assertFalse(melding.isPresent());
             verify(fiksIoKatalogApi).lookup(eq(Arrays.asList(identifikatorType.name(), identifikator)
@@ -97,7 +97,7 @@ void lookupFound() {
             final Optional<Konto> funnetKonto = katalogHandler.lookup(LookupRequest.builder()
                                                                                    .identifikator(new Identifikator(identifikatorType, identifikator))
                                                                                    .sikkerhetsNiva(sikkerhetsNiva)
-                                                                                   .meldingType(meldingType)
+                                                                                   .meldingsprotokoll(meldingType)
                                                                                    .build());
             assertTrue(funnetKonto.isPresent());
             assertEquals(funnetKonto.get(), konto);

diff --git a/src/test/java/no/ks/fiks/io/client/SendtMeldingTest.java b/src/test/java/no/ks/fiks/io/client/SendtMeldingTest.java
@@ -17,7 +17,7 @@ void fromSendResponse() {
         final SendtMeldingApiModel sendtMeldingApiModel = SendtMeldingApiModel.builder()
             .meldingId(UUID.randomUUID())
             .mottakerKontoId(UUID.randomUUID())
-            .meldingType("meldingType")
+            .meldingType("meldingsprotokoll")
             .avsenderKontoId(UUID.randomUUID())
             .svarPaMelding(UUID.randomUUID())
             .dokumentlagerId(UUID.randomUUID())

diff --git a/src/test/java/no/ks/fiks/io/client/model/SendtMeldingTest.java b/src/test/java/no/ks/fiks/io/client/model/SendtMeldingTest.java
@@ -17,7 +17,7 @@ void fromSendResponse() {
             .meldingId(UUID.randomUUID())
             .mottakerKontoId(UUID.randomUUID())
             .avsenderKontoId(UUID.randomUUID())
-            .meldingType("meldingType")
+            .meldingType("meldingsprotokoll")
             .svarPaMelding(UUID.randomUUID())
             .dokumentlagerId(UUID.randomUUID())
             .ttl(TimeUnit.DAYS.toMillis(5L))