diff --git a/library/src/main/java/org/mustangproject/TradeParty.java b/library/src/main/java/org/mustangproject/TradeParty.java index b953008c..e67567e4 100644 --- a/library/src/main/java/org/mustangproject/TradeParty.java +++ b/library/src/main/java/org/mustangproject/TradeParty.java @@ -12,6 +12,7 @@ import org.mustangproject.ZUGFeRD.IZUGFeRDTradeSettlement; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; /*** @@ -424,6 +425,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty { @Override + @JsonIgnore public String getUriUniversalCommunicationID() { if (uriUniversalCommunicationId != null) { return uriUniversalCommunicationId.getID(); @@ -433,6 +435,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty { @Override + @JsonIgnore public String getUriUniversalCommunicationIDScheme() { if (uriUniversalCommunicationId != null) { return uriUniversalCommunicationId.getScheme(); diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java index d6a425d4..03cc04c8 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/DeSerializationTest.java @@ -36,7 +36,7 @@ public class DeSerializationTest extends TestCase { public void testJackson() throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); - Invoice i = new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date()).setSender(new TradeParty("some org", "teststr", "55232", "teststadt", "DE").addTaxID("taxID").addBankDetails(new BankDetails("DE3600000123456", "ABCDEFG1001").setAccountName("Donald Duck"))).setOwnVATID("DE0815").setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE4711").setContact(new Contact("Franz Müller", "01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE"))).setNumber("0185").addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), new BigDecimal("1"), new BigDecimal(1.0))); + Invoice i = new Invoice().setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date()).setSender(new TradeParty("some org", "teststr", "55232", "teststadt", "DE").addTaxID("taxID").addBankDetails(new BankDetails("DE3600000123456", "ABCDEFG1001").setAccountName("Donald Duck")).setEmail("info@company.com")).setOwnVATID("DE0815").setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addVATID("DE4711").setContact(new Contact("Franz Müller", "01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE"))).setNumber("0185").addItem(new Item(new Product("Testprodukt", "", "C62", new BigDecimal(19)), new BigDecimal("1"), new BigDecimal(1.0))); String jsonArray = mapper.writeValueAsString(i); // [{"stringValue":"a","intValue":1,"booleanValue":true}, @@ -45,6 +45,8 @@ public class DeSerializationTest extends TestCase { Invoice fromJSON = mapper.readValue(jsonArray, Invoice.class); assertEquals(fromJSON.getNumber(), i.getNumber()); assertEquals(fromJSON.getZFItems().length, i.getZFItems().length); + assertEquals("info@company.com", fromJSON.getSender().getEmail()); + assertEquals("info@company.com", fromJSON.getSender().getUriUniversalCommunicationID()); } }