diff --git a/pom.xml b/pom.xml index 5b24d741..5b953e51 100644 --- a/pom.xml +++ b/pom.xml @@ -45,11 +45,11 @@ 1.0.2 json UTF-8 - 1.1.0 + 1.2.1 ${java.version} 1.8 1.7.26 - 1.1.2 + 1.2.0 1.4.2 fiksio-katalog-api-v1 23.3-jre @@ -59,7 +59,7 @@ 5.6.0 1.0.11 9.4.0 - 1.1.0 + 1.2.0 5.4.2 1.2.3 diff --git a/src/main/java/no/ks/fiks/io/client/KatalogHandler.java b/src/main/java/no/ks/fiks/io/client/KatalogHandler.java index 60788060..4f064bb7 100644 --- 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 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 index 653e84ab..64d79873 100644 --- 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 index 9572369d..d7d608d6 100644 --- 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 index ce047be3..6c6d17a2 100644 --- 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 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 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 index 2f6586f8..0a45ff88 100644 --- 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 index e463e8d1..2b8622de 100644 --- 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))