From ff08af33e512cdf225ecf7ec113cfbafae437c3e Mon Sep 17 00:00:00 2001 From: Bjorn Dybvik Langfors Date: Thu, 27 Sep 2018 10:07:30 +0000 Subject: [PATCH 1/3] Update dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f00fbd3..e3978aa 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ UTF-8 1.8 1.1.29 - 4.0.0-RC2 + 4.0.2 no.difi.vefa - 0.9.7 + 1.0.4 From e465977a7df1a8e0f3b1fec69092e781335e3432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Dybvik=20Langfors?= Date: Wed, 3 Oct 2018 10:12:02 +0200 Subject: [PATCH 2/3] Initial attempt to fix compatibility to current vefa-peppol --- .../no/balder/spiralis/jdbc/SpiralisTaskPersisterImpl.java | 4 ++-- .../main/java/no/balder/spiralis/tool/ObjectMother.java | 7 +++++++ .../spiralis/tool/gson/InboundMetaDataDeserializer.java | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/spiralis-common/src/main/java/no/balder/spiralis/jdbc/SpiralisTaskPersisterImpl.java b/spiralis-common/src/main/java/no/balder/spiralis/jdbc/SpiralisTaskPersisterImpl.java index c284f77..e16b691 100644 --- a/spiralis-common/src/main/java/no/balder/spiralis/jdbc/SpiralisTaskPersisterImpl.java +++ b/spiralis-common/src/main/java/no/balder/spiralis/jdbc/SpiralisTaskPersisterImpl.java @@ -92,11 +92,11 @@ public Long saveInboundTask(SpiralisReceptionTask spiralisReceptionTask, URI pay if (spiralisReceptionTask.getInboundMetadata().getTransmissionIdentifier() != null) { - ps.setString(12, spiralisReceptionTask.getInboundMetadata().getTransmissionIdentifier().getValue()); + ps.setString(12, spiralisReceptionTask.getInboundMetadata().getTransmissionIdentifier().getIdentifier()); } else ps.setString(12, null); - ps.setString(13, spiralisReceptionTask.getInboundMetadata().getHeader().getIdentifier().getValue()); + ps.setString(13, spiralisReceptionTask.getInboundMetadata().getHeader().getIdentifier().getIdentifier()); final String receiverOrgNo = spiralisReceptionTask.getInboundMetadata().getHeader().getReceiver().getIdentifier().toString(); ps.setString(14, receiverOrgNo); diff --git a/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java b/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java index f8c5fb5..15d8628 100644 --- a/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java +++ b/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java @@ -2,6 +2,7 @@ import no.difi.oxalis.api.inbound.InboundMetadata; import no.difi.oxalis.api.model.TransmissionIdentifier; +import no.difi.oxalis.api.tag.Tag; import no.difi.vefa.peppol.common.code.DigestMethod; import no.difi.vefa.peppol.common.model.*; @@ -114,6 +115,12 @@ public Receipt primaryReceipt() { public X509Certificate getCertificate() { return ObjectMother.sampleCertificate(); } + + @Override + public Tag getTag() { + // FIXME + return Tag.of("SomeTag"); + } }; } diff --git a/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java b/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java index ee34dcf..fe3e7e8 100644 --- a/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java +++ b/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java @@ -7,6 +7,7 @@ import com.google.gson.reflect.TypeToken; import no.difi.oxalis.api.inbound.InboundMetadata; import no.difi.oxalis.api.model.TransmissionIdentifier; +import no.difi.oxalis.api.tag.Tag; import no.difi.vefa.peppol.common.model.*; import java.io.ByteArrayInputStream; @@ -90,6 +91,12 @@ public List getReceipts() { public Receipt primaryReceipt() { return getJson(j, ctx, "primaryReceipt", Receipt.class); } + + @Override + public Tag getTag() { + // FIXME + return Tag.NONE; + } }; } } From 82396dca0f9c559f513a962225c0e531eecace82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Dybvik=20Langfors?= Date: Thu, 4 Oct 2018 11:05:17 +0200 Subject: [PATCH 3/3] Fix formatting --- .../java/no/balder/spiralis/tool/ObjectMother.java | 9 ++++----- .../tool/gson/InboundMetaDataDeserializer.java | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java b/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java index 15d8628..dee33fa 100644 --- a/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java +++ b/spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java @@ -116,11 +116,10 @@ public X509Certificate getCertificate() { return ObjectMother.sampleCertificate(); } - @Override - public Tag getTag() { - // FIXME - return Tag.of("SomeTag"); - } + @Override + public Tag getTag() { + return Tag.of("SomeTag"); + } }; } diff --git a/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java b/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java index fe3e7e8..8899d24 100644 --- a/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java +++ b/spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java @@ -92,11 +92,11 @@ public Receipt primaryReceipt() { return getJson(j, ctx, "primaryReceipt", Receipt.class); } - @Override - public Tag getTag() { - // FIXME - return Tag.NONE; - } + @Override + public Tag getTag() { + //FIXME + return Tag.NONE; + } }; } }