Skip to content

Commit

Permalink
Update one-record-ontologymodel library 1.1.0 => 1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mskopp committed Oct 27, 2021
1 parent 82e9ae3 commit 41148d9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ dependencies {
// one-record-ontologymodel from riege.com is a public GitHub repository
// but not published on mavenCentral.
// Nevertheless it can be retrieved via https://jitpack.io
// See also https://jitpack.io/#riege/one-record-ontologymodel/1.1.0
implementation('com.github.riege:one-record-ontologymodel:1.1.0') { transitive = false }

// See also https://jitpack.io/#riege/one-record-ontologymodel
implementation('com.riege:one-record-ontologymodel:1.1.2') { transitive = false }
// cargoxml-jaxb from riege.com cannot be retrieved via https://jitpack.io
// because building it requires access to the Cargo-XML Toolkit schema files
// which are not included on GitHub and JitPack has not access to them!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public final class XFWB3toOneRecordConverter {
* Converter for CargoXML XFWB into a OneRecord (master or direct) Waybill.
*
* @param xfwb CargoXML XFWB
* @return OneRecord Waybill - Master or Direct Waybill
*/
public XFWB3toOneRecordConverter(WaybillType xfwb) {
this.xfwb = xfwb;
Expand Down Expand Up @@ -1287,7 +1286,7 @@ private RegulatedEntity convert(CustomsInfo ci) {
OtherIdentifier oi = OneRecordTypeConstants.createOtherIdentifier();
oi.setOtherIdentifierType(regulated.getRegulatedEntityCategory());
oi.setIdentifier(ci.getCustomsInfoNote());
company.getBranch().setOtherIdentifiers(oi);
company.getBranch().setOtherIdentifiers(buildSet(oi));
regulated.setRegulatedEntityIdentifier(company);
return regulated;
}
Expand Down Expand Up @@ -1420,7 +1419,7 @@ private Company enhanceCompany(Company company, TextType xmlName, IDType xmlAcco
OtherIdentifier oi = OneRecordTypeConstants.createOtherIdentifier();
oi.setOtherIdentifierType(OneRecordTypeConstants.OTHER_IDENTIFIER_FORWARDER_ACCOUNT_NUMBER_AT_CARRIER);
oi.setIdentifier(value);
company.getBranch().setOtherIdentifiers(oi);
company.getBranch().setOtherIdentifiers(buildSet(oi));
}

final Person person = OneRecordTypeConstants.createPerson();
Expand Down Expand Up @@ -1471,7 +1470,7 @@ private Company enhanceCompany(Company company, TextType xmlName, IDType xmlAcco
if (mail != null) {
person.getContact().add(createContact(ContactTypeCode.EMAIL, mail));
}
company.getBranch().setContactPersons(person);
company.getBranch().setContactPersons(buildSet(person));
}
return company;
}
Expand Down

0 comments on commit 41148d9

Please sign in to comment.