diff --git a/api-client/pom.xml b/api-client/pom.xml index d200b72c..0cff03d4 100644 --- a/api-client/pom.xml +++ b/api-client/pom.xml @@ -8,7 +8,7 @@ no.digipost sdp-shared - 1.1.18-SNAPSHOT + 1.1.19-SNAPSHOT diff --git a/api-client/src/main/java/no/digipost/api/MessageSender.java b/api-client/src/main/java/no/digipost/api/MessageSender.java index 67199896..e1aec72f 100644 --- a/api-client/src/main/java/no/digipost/api/MessageSender.java +++ b/api-client/src/main/java/no/digipost/api/MessageSender.java @@ -96,7 +96,7 @@ public EbmsApplikasjonsKvittering hentKvittering(final EbmsPullRequest pullReque return hentKvittering(pullRequest, null); } - public EbmsApplikasjonsKvittering hentKvittering(final EbmsPullRequest pullRequest, final EbmsApplikasjonsKvittering tidligereKvitteringSomSkalBekreftes) { + public EbmsApplikasjonsKvittering hentKvittering(final EbmsPullRequest pullRequest, final KanBekreftesSomBehandletKvittering tidligereKvitteringSomSkalBekreftes) { return meldingTemplate.sendAndReceive(uri, new PullRequestSender(pullRequest, marshaller, tidligereKvitteringSomSkalBekreftes), new ApplikasjonsKvitteringReceiver(marshaller)); } @@ -161,7 +161,7 @@ public static class Builder { private ClientInterceptorWrapper clientInterceptorWrapper = new DoNothingClientInterceptorWrapper(); private Builder(final String endpointUri, final EbmsAktoer tekniskAvsenderId, final EbmsAktoer tekniskMottaker, - final WsSecurityInterceptor wsSecurityInterceptor, final KeyStoreInfo keystoreInfo) { + final WsSecurityInterceptor wsSecurityInterceptor, final KeyStoreInfo keystoreInfo) { this.endpointUri = endpointUri; this.tekniskAvsenderId = tekniskAvsenderId; this.tekniskMottaker = tekniskMottaker; @@ -356,6 +356,7 @@ public InsertInterceptor(final Class clazz, final ClientInterceptor interceptor) public static interface ClientInterceptorWrapper { ClientInterceptor wrap(ClientInterceptor clientInterceptor); } + public static class DoNothingClientInterceptorWrapper implements ClientInterceptorWrapper { @Override public ClientInterceptor wrap(ClientInterceptor clientInterceptor) { diff --git a/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java b/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java index 4492bbe8..7c11ac69 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java +++ b/api-client/src/main/java/no/digipost/api/handlers/BekreftelseSender.java @@ -42,7 +42,7 @@ public BekreftelseSender(final KanBekreftesSomBehandletKvittering kanBekreftesSo @Override public void doWithMessage(final WebServiceMessage message) throws IOException, TransformerException { List references = new ArrayList(); - references.add(kanBekreftesSomBehandletKvittering.getReferanseTilMeldingSomKvitteres().getUnmarshaled()); + references.add(kanBekreftesSomBehandletKvittering.getReferanseTilMeldingSomKvitteres().getUnmarshalled()); ebmsContext.addRequestStep(new AddReferencesStep(jaxb2Marshaller, kanBekreftesSomBehandletKvittering.getMeldingsId(), references)); } diff --git a/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java b/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java index ab35f9ed..6e2f2b40 100644 --- a/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java +++ b/api-client/src/main/java/no/digipost/api/handlers/PullRequestSender.java @@ -16,10 +16,10 @@ package no.digipost.api.handlers; import no.digipost.api.interceptors.steps.AddReferencesStep; -import no.digipost.api.representations.EbmsApplikasjonsKvittering; import no.digipost.api.representations.EbmsContext; import no.digipost.api.representations.EbmsProcessingStep; import no.digipost.api.representations.EbmsPullRequest; +import no.digipost.api.representations.KanBekreftesSomBehandletKvittering; import no.digipost.api.representations.Mpc; import no.digipost.api.xml.Constants; import no.digipost.api.xml.Marshalling; @@ -30,18 +30,20 @@ import org.springframework.ws.client.core.WebServiceMessageCallback; import org.springframework.ws.soap.SoapHeaderElement; import org.springframework.ws.soap.SoapMessage; +import org.w3.xmldsig.Reference; import javax.xml.transform.TransformerException; - import java.io.IOException; +import java.util.ArrayList; +import java.util.List; public class PullRequestSender extends EbmsContextAware implements WebServiceMessageCallback { private final EbmsPullRequest pullRequest; private final Jaxb2Marshaller marshaller; - private final EbmsApplikasjonsKvittering tidligereKvitteringSomSkalBekreftes; + private final KanBekreftesSomBehandletKvittering tidligereKvitteringSomSkalBekreftes; - public PullRequestSender(final EbmsPullRequest pullRequest, final Jaxb2Marshaller marshaller, final EbmsApplikasjonsKvittering tidligereKvitteringSomSkalBekreftes) { + public PullRequestSender(final EbmsPullRequest pullRequest, final Jaxb2Marshaller marshaller, final KanBekreftesSomBehandletKvittering tidligereKvitteringSomSkalBekreftes) { this.pullRequest = pullRequest; this.marshaller = marshaller; this.tidligereKvitteringSomSkalBekreftes = tidligereKvitteringSomSkalBekreftes; @@ -50,7 +52,10 @@ public PullRequestSender(final EbmsPullRequest pullRequest, final Jaxb2Marshalle @Override public void doWithMessage(final WebServiceMessage message) throws IOException, TransformerException { if (tidligereKvitteringSomSkalBekreftes != null) { - ebmsContext.addRequestStep(new AddReferencesStep(marshaller, tidligereKvitteringSomSkalBekreftes.messageId, tidligereKvitteringSomSkalBekreftes.references)); + List referenceToMessageToBeConfirmed = new ArrayList(); + referenceToMessageToBeConfirmed.add(tidligereKvitteringSomSkalBekreftes.getReferanseTilMeldingSomKvitteres().getUnmarshalled()); + + ebmsContext.addRequestStep(new AddReferencesStep(marshaller, tidligereKvitteringSomSkalBekreftes.getMeldingsId(), referenceToMessageToBeConfirmed)); } ebmsContext.addRequestStep(new EbmsProcessingStep() { @@ -60,8 +65,7 @@ public void apply(final EbmsContext ebmsContext, final SoapHeaderElement ebmsMes Mpc mpc = new Mpc(pullRequest.prioritet, pullRequest.mpcId); SignalMessage signalMessage = new SignalMessage() .withMessageInfo(pullRequest.createMessageInfo()) - .withPullRequest(new PullRequest() - .withMpc(mpc.toString()) + .withPullRequest(new PullRequest().withMpc(mpc.toString()) ); Marshalling.marshal(marshaller, ebmsMessaging, Constants.SIGNAL_MESSAGE_QNAME, signalMessage); } diff --git a/api-commons/pom.xml b/api-commons/pom.xml index 3be7a820..c5b6d75f 100644 --- a/api-commons/pom.xml +++ b/api-commons/pom.xml @@ -8,7 +8,7 @@ no.digipost sdp-shared - 1.1.18-SNAPSHOT + 1.1.19-SNAPSHOT diff --git a/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java b/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java index d63dd4fe..015caf7b 100644 --- a/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java +++ b/api-commons/src/main/java/no/digipost/api/representations/KvitteringsReferanse.java @@ -25,39 +25,38 @@ public class KvitteringsReferanse { - private final String marshaled; + private final String marshalled; private final Jaxb2Marshaller marshallerSingleton = Marshalling.getMarshallerSingleton(); - public String getMarshaled() { - return marshaled; + public String getMarshalled() { + return marshalled; } - public Reference getUnmarshaled() { - return (Reference) marshallerSingleton.unmarshal(new StreamSource(new StringReader(marshaled))); + public Reference getUnmarshalled() { + return (Reference) marshallerSingleton.unmarshal(new StreamSource(new StringReader(marshalled))); } private KvitteringsReferanse(Reference reference) { - StringResult marshaledReference = new StringResult(); + StringResult marshalledReference = new StringResult(); Jaxb2Marshaller marshallerSingleton = Marshalling.getMarshallerSingleton(); - Marshalling.marshal(marshallerSingleton, reference, marshaledReference); + Marshalling.marshal(marshallerSingleton, reference, marshalledReference); - this.marshaled = marshaledReference.toString(); + this.marshalled = marshalledReference.toString(); } - private KvitteringsReferanse(String marshaledReference) { - marshaled = marshaledReference; + private KvitteringsReferanse(String marshalledReference) { + marshalled = marshalledReference; } public static Builder builder(Reference reference) { return new Builder(reference); } - public static Builder builder(String marshaledReference) { - return new Builder(marshaledReference); + public static Builder builder(String marshalledReference) { + return new Builder(marshalledReference); } - public static class Builder { private KvitteringsReferanse target; private boolean built = false; @@ -66,8 +65,8 @@ private Builder(Reference reference) { this.target = new KvitteringsReferanse(reference); } - private Builder(String marshaledReference){ - this.target = new KvitteringsReferanse(marshaledReference); + private Builder(String marshalledReference) { + this.target = new KvitteringsReferanse(marshalledReference); } public KvitteringsReferanse build() { diff --git a/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java b/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java index c8bc9203..2504ceed 100644 --- a/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java +++ b/api-commons/src/test/java/no/digipost/api/representations/EbmsApplikasjonsKvitteringTest.java @@ -15,6 +15,7 @@ */ package no.digipost.api.representations; +import org.fest.assertions.core.Condition; import org.junit.Test; import org.w3.xmldsig.Reference; @@ -34,10 +35,19 @@ public void testGetMeldingsId() throws Exception { } @Test - public void testGetReferanse() throws Exception { - EbmsApplikasjonsKvittering ebmsApplikasjonskvittering = getEbmsApplikasjonskvittering(); + public void testGetReferanseTilMeldingSomKvitteres() throws Exception { + KvitteringsReferanse referanseTilMeldingSomKvitteres = getEbmsApplikasjonskvittering().getReferanseTilMeldingSomKvitteres(); + + assertThat(referanseTilMeldingSomKvitteres.getMarshalled()).has(lengthGreaterThan(500)); + } - assertThat(ebmsApplikasjonskvittering.getReferanseTilMeldingSomKvitteres()).isNotNull(); + private Condition lengthGreaterThan(final int length) { + return new Condition() { + @Override + public boolean matches(String s) { + return s.length() > length; + } + }; } private EbmsApplikasjonsKvittering getEbmsApplikasjonskvittering() { diff --git a/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java b/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java index 59848487..51a36e75 100644 --- a/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java +++ b/api-commons/src/test/java/no/digipost/api/representations/KvitteringsReferanseTest.java @@ -28,24 +28,24 @@ public void testBuilder_FromReference() throws Exception { KvitteringsReferanse kvitteringsReferanse = KvitteringsReferanse.builder(referenceToOriginalMessage).build(); - assertThat(kvitteringsReferanse.getMarshaled()).isNotNull(); + assertThat(kvitteringsReferanse.getMarshalled()).isNotNull(); } @Test - public void testBuilder_FromMarshaledReference() throws Exception { - String marshaledReferenceToOriginalMessage = KvitteringsReferanse.builder(ObjectMother.getReference()).build().getMarshaled(); + public void testBuilder_FrommarshalledReference() throws Exception { + String marshalledReferenceToOriginalMessage = "eFFiS1V0dUVHU3JzZ1pzU0FUNXJGKy95ZmxyK2hsMmNVQzRjS3lpTXhSTT0="; - KvitteringsReferanse kvitteringsReferanse = KvitteringsReferanse.builder(marshaledReferenceToOriginalMessage).build(); + KvitteringsReferanse kvitteringsReferanse = KvitteringsReferanse.builder(marshalledReferenceToOriginalMessage).build(); - assertThat(kvitteringsReferanse.getMarshaled()).isEqualTo(marshaledReferenceToOriginalMessage); + assertThat(kvitteringsReferanse.getMarshalled()).isEqualTo(marshalledReferenceToOriginalMessage); } @Test - public void testGetUnmarshaled() { + public void testGetUnmarshalled() { Reference referenceToOriginalMessage = ObjectMother.getReference(); KvitteringsReferanse kvitteringsReferanse = KvitteringsReferanse.builder(referenceToOriginalMessage).build(); - assertThat(kvitteringsReferanse.getUnmarshaled()).isEqualTo(referenceToOriginalMessage); + assertThat(kvitteringsReferanse.getUnmarshalled()).isEqualTo(referenceToOriginalMessage); } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7f33fd02..fbc40d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 sdp-shared - 1.1.18-SNAPSHOT + 1.1.19-SNAPSHOT pom ${project.artifactId} Shared dependencies for Sikker Digital Post diff --git a/xsd/pom.xml b/xsd/pom.xml index 60b0d7d2..b66bf6f0 100644 --- a/xsd/pom.xml +++ b/xsd/pom.xml @@ -8,7 +8,7 @@ no.digipost sdp-shared - 1.1.18-SNAPSHOT + 1.1.19-SNAPSHOT