Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies to Oxalis and vefa-peppol #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update dependencies to Oxalis and vefa-peppol #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff08af3
Update dependencies
elsand Sep 27, 2018
e465977
Initial attempt to fix compatibility to current vefa-peppol
Oct 3, 2018
82396dc
Fix formatting
Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<ringo.version>1.1.29</ringo.version>
<oxalis.version>4.0.0-RC2</oxalis.version>
<oxalis.version>4.0.2</oxalis.version>
<vefa.peppol.groupId>no.difi.vefa</vefa.peppol.groupId>
<vefa.peppol.version>0.9.7</vefa.peppol.version>
<vefa.peppol.version>1.0.4</vefa.peppol.version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions spiralis-common/src/main/java/no/balder/spiralis/jdbc/SpiralisTaskPersisterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 6 additions & 0 deletions spiralis-common/src/main/java/no/balder/spiralis/tool/ObjectMother.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down Expand Up @@ -114,6 +115,11 @@ public Receipt primaryReceipt() {
public X509Certificate getCertificate() {
return ObjectMother.sampleCertificate();
}

@Override
public Tag getTag() {
return Tag.of("SomeTag");
}
};
}

Expand Down
7 changes: 7 additions & 0 deletions spiralis-common/src/main/java/no/balder/spiralis/tool/gson/InboundMetaDataDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -90,6 +91,12 @@ public List<Receipt> getReceipts() {
public Receipt primaryReceipt() {
return getJson(j, ctx, "primaryReceipt", Receipt.class);
}

@Override
public Tag getTag() {
//FIXME
return Tag.NONE;
}
};
}
}