louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36 from yankee42/fix-compilation-errors

Browse Source 
Fix compilation errors mainly due to merge conflicts
This commit is contained in:
Jochen Staerk
2017-06-09 16:03:03 +02:00
committed by GitHub
parent a47bf95ea6 366c2a3228
commit 56c7411821
6 changed files with 85 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -52,6 +52,12 @@
<version>4.11</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.helger</groupId>
<artifactId>ph-schematron</artifactId>
<version>4.3.1</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

1121
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
View File

File diff suppressed because it is too large Load Diff

19
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA1Factory.java
View File

@@ -44,14 +44,9 @@ public class ZUGFeRDExporterFromA1Factory {
*/ */
public ZUGFeRDExporter loadFromPDFA1(String pdfFilename) throws IOException { public ZUGFeRDExporter loadFromPDFA1(String pdfFilename) throws IOException {
ensurePDFIsValidA1(new FileDataSource(pdfFilename)); ensurePDFIsValidA1(new FileDataSource(pdfFilename));
PDDocument doc = PDDocument.load(new File(pdfFilename));
ZUGFeRDExporter zugFeRDExporter = null; makePDFA3compliant(doc);
try(PDDocument doc = PDDocument.load(new File(pdfFilename))) { return new ZUGFeRDExporter(doc);
makePDFA3compliant(doc);
zugFeRDExporter = new ZUGFeRDExporter(doc);
}
return zugFeRDExporter;
} }
/** /**
@@ -62,12 +57,10 @@ public class ZUGFeRDExporterFromA1Factory {
*/ */
public ZUGFeRDExporter loadFromPDFA1(byte[] pdfBinary) throws IOException { public ZUGFeRDExporter loadFromPDFA1(byte[] pdfBinary) throws IOException {
ensurePDFIsValidA1(new ByteArrayDataSource(new ByteArrayInputStream(pdfBinary))); ensurePDFIsValidA1(new ByteArrayDataSource(new ByteArrayInputStream(pdfBinary)));
ZUGFeRDExporter zugFeRDExporter; ZUGFeRDExporter zugFeRDExporter;
try (PDDocument doc = PDDocument.load(pdfBinary)) { PDDocument doc = PDDocument.load(pdfBinary);
makePDFA3compliant(doc); makePDFA3compliant(doc);
zugFeRDExporter = new ZUGFeRDExporter(doc); zugFeRDExporter = new ZUGFeRDExporter(doc);
}
return zugFeRDExporter; return zugFeRDExporter;
} }

48
src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDTransactionModelConverter.java
View File

@@ -7,8 +7,11 @@ import org.mustangproject.ZUGFeRD.model.CreditorFinancialAccountType;
import org.mustangproject.ZUGFeRD.model.CreditorFinancialInstitutionType; import org.mustangproject.ZUGFeRD.model.CreditorFinancialInstitutionType;
import org.mustangproject.ZUGFeRD.model.CrossIndustryDocumentType; import org.mustangproject.ZUGFeRD.model.CrossIndustryDocumentType;
import org.mustangproject.ZUGFeRD.model.DateTimeType; import org.mustangproject.ZUGFeRD.model.DateTimeType;
import org.mustangproject.ZUGFeRD.model.DateTimeTypeConstants;
import org.mustangproject.ZUGFeRD.model.DocumentCodeType; import org.mustangproject.ZUGFeRD.model.DocumentCodeType;
import org.mustangproject.ZUGFeRD.model.DocumentCodeTypeConstants;
import org.mustangproject.ZUGFeRD.model.DocumentContextParameterType; import org.mustangproject.ZUGFeRD.model.DocumentContextParameterType;
import org.mustangproject.ZUGFeRD.model.DocumentContextParameterTypeConstants;
import org.mustangproject.ZUGFeRD.model.DocumentLineDocumentType; import org.mustangproject.ZUGFeRD.model.DocumentLineDocumentType;
import org.mustangproject.ZUGFeRD.model.ExchangedDocumentContextType; import org.mustangproject.ZUGFeRD.model.ExchangedDocumentContextType;
import org.mustangproject.ZUGFeRD.model.ExchangedDocumentType; import org.mustangproject.ZUGFeRD.model.ExchangedDocumentType;
@@ -16,8 +19,10 @@ import org.mustangproject.ZUGFeRD.model.IDType;
import org.mustangproject.ZUGFeRD.model.IndicatorType; import org.mustangproject.ZUGFeRD.model.IndicatorType;
import org.mustangproject.ZUGFeRD.model.LogisticsServiceChargeType; import org.mustangproject.ZUGFeRD.model.LogisticsServiceChargeType;
import org.mustangproject.ZUGFeRD.model.NoteType; import org.mustangproject.ZUGFeRD.model.NoteType;
import org.mustangproject.ZUGFeRD.model.NoteTypeConstants;
import org.mustangproject.ZUGFeRD.model.ObjectFactory; import org.mustangproject.ZUGFeRD.model.ObjectFactory;
import org.mustangproject.ZUGFeRD.model.PaymentMeansCodeType; import org.mustangproject.ZUGFeRD.model.PaymentMeansCodeType;
import org.mustangproject.ZUGFeRD.model.PaymentMeansCodeTypeConstants;
import org.mustangproject.ZUGFeRD.model.PercentType; import org.mustangproject.ZUGFeRD.model.PercentType;
import org.mustangproject.ZUGFeRD.model.QuantityType; import org.mustangproject.ZUGFeRD.model.QuantityType;
import org.mustangproject.ZUGFeRD.model.SupplyChainEventType; import org.mustangproject.ZUGFeRD.model.SupplyChainEventType;
@@ -27,8 +32,11 @@ import org.mustangproject.ZUGFeRD.model.SupplyChainTradeLineItemType;
import org.mustangproject.ZUGFeRD.model.SupplyChainTradeSettlementType; import org.mustangproject.ZUGFeRD.model.SupplyChainTradeSettlementType;
import org.mustangproject.ZUGFeRD.model.SupplyChainTradeTransactionType; import org.mustangproject.ZUGFeRD.model.SupplyChainTradeTransactionType;
import org.mustangproject.ZUGFeRD.model.TaxCategoryCodeType; import org.mustangproject.ZUGFeRD.model.TaxCategoryCodeType;
import org.mustangproject.ZUGFeRD.model.TaxCategoryCodeTypeConstants;
import org.mustangproject.ZUGFeRD.model.TaxRegistrationType; import org.mustangproject.ZUGFeRD.model.TaxRegistrationType;
import org.mustangproject.ZUGFeRD.model.TaxRegistrationTypeConstants;
import org.mustangproject.ZUGFeRD.model.TaxTypeCodeType; import org.mustangproject.ZUGFeRD.model.TaxTypeCodeType;
import org.mustangproject.ZUGFeRD.model.TaxTypeCodeTypeConstants;
import org.mustangproject.ZUGFeRD.model.TextType; import org.mustangproject.ZUGFeRD.model.TextType;
import org.mustangproject.ZUGFeRD.model.TradeAddressType; import org.mustangproject.ZUGFeRD.model.TradeAddressType;
import org.mustangproject.ZUGFeRD.model.TradeAllowanceChargeType; import org.mustangproject.ZUGFeRD.model.TradeAllowanceChargeType;
@@ -86,7 +94,7 @@ class ZUGFeRDTransactionModelConverter {
DocumentContextParameterType contextParameter = xmlFactory DocumentContextParameterType contextParameter = xmlFactory
.createDocumentContextParameterType(); .createDocumentContextParameterType();
IDType idType = xmlFactory.createIDType(); IDType idType = xmlFactory.createIDType();
idType.setValue(DocumentContextParameterType.EXTENDED); idType.setValue(DocumentContextParameterTypeConstants.EXTENDED);
contextParameter.setID(idType); contextParameter.setID(idType);
context.getGuidelineSpecifiedDocumentContextParameter().add( context.getGuidelineSpecifiedDocumentContextParameter().add(
contextParameter); contextParameter);
@@ -110,14 +118,14 @@ class ZUGFeRDTransactionModelConverter {
DateTimeType issueDateTime = xmlFactory.createDateTimeType(); DateTimeType issueDateTime = xmlFactory.createDateTimeType();
DateTimeType.DateTimeString issueDateTimeString = xmlFactory DateTimeType.DateTimeString issueDateTimeString = xmlFactory
.createDateTimeTypeDateTimeString(); .createDateTimeTypeDateTimeString();
issueDateTimeString.setFormat(DateTimeType.DateTimeString.DATE); issueDateTimeString.setFormat(DateTimeTypeConstants.DATE);
issueDateTimeString.setValue(zugferdDateFormat.format(trans issueDateTimeString.setValue(zugferdDateFormat.format(trans
.getIssueDate())); .getIssueDate()));
issueDateTime.setDateTimeString(issueDateTimeString); issueDateTime.setDateTimeString(issueDateTimeString);
document.setIssueDateTime(issueDateTime); document.setIssueDateTime(issueDateTime);
DocumentCodeType documentCodeType = xmlFactory.createDocumentCodeType(); DocumentCodeType documentCodeType = xmlFactory.createDocumentCodeType();
documentCodeType.setValue(DocumentCodeType.INVOICE); documentCodeType.setValue(DocumentCodeTypeConstants.INVOICE);
document.setTypeCode(documentCodeType); document.setTypeCode(documentCodeType);
TextType name = xmlFactory.createTextType(); TextType name = xmlFactory.createTextType();
@@ -127,7 +135,7 @@ class ZUGFeRDTransactionModelConverter {
if (trans.getOwnOrganisationFullPlaintextInfo() != null) { if (trans.getOwnOrganisationFullPlaintextInfo() != null) {
NoteType regularInfo = xmlFactory.createNoteType(); NoteType regularInfo = xmlFactory.createNoteType();
CodeType regularInfoSubjectCode = xmlFactory.createCodeType(); CodeType regularInfoSubjectCode = xmlFactory.createCodeType();
regularInfoSubjectCode.setValue(NoteType.REGULARINFO); regularInfoSubjectCode.setValue(NoteTypeConstants.REGULARINFO);
regularInfo.setSubjectCode(regularInfoSubjectCode); regularInfo.setSubjectCode(regularInfoSubjectCode);
TextType regularInfoContent = xmlFactory.createTextType(); TextType regularInfoContent = xmlFactory.createTextType();
regularInfoContent.setValue(trans regularInfoContent.setValue(trans
@@ -205,7 +213,7 @@ class ZUGFeRDTransactionModelConverter {
.createTaxRegistrationType(); .createTaxRegistrationType();
IDType buyerUstId = xmlFactory.createIDType(); IDType buyerUstId = xmlFactory.createIDType();
buyerUstId.setValue(trans.getRecipient().getVATID()); buyerUstId.setValue(trans.getRecipient().getVATID());
buyerUstId.setSchemeID(TaxRegistrationType.USTID); buyerUstId.setSchemeID(TaxRegistrationTypeConstants.USTID);
buyerTaxRegistration.setID(buyerUstId); buyerTaxRegistration.setID(buyerUstId);
buyerTradeParty.getSpecifiedTaxRegistration().add(buyerTaxRegistration); buyerTradeParty.getSpecifiedTaxRegistration().add(buyerTaxRegistration);
@@ -244,7 +252,7 @@ class ZUGFeRDTransactionModelConverter {
.createTaxRegistrationType(); .createTaxRegistrationType();
IDType sellerTaxId = xmlFactory.createIDType(); IDType sellerTaxId = xmlFactory.createIDType();
sellerTaxId.setValue(trans.getOwnTaxID()); sellerTaxId.setValue(trans.getOwnTaxID());
sellerTaxId.setSchemeID(TaxRegistrationType.TAXID); sellerTaxId.setSchemeID(TaxRegistrationTypeConstants.TAXID);
sellerTaxRegistration.setID(sellerTaxId); sellerTaxRegistration.setID(sellerTaxId);
sellerTradeParty.getSpecifiedTaxRegistration().add( sellerTradeParty.getSpecifiedTaxRegistration().add(
sellerTaxRegistration); sellerTaxRegistration);
@@ -253,7 +261,7 @@ class ZUGFeRDTransactionModelConverter {
sellerTaxRegistration = xmlFactory.createTaxRegistrationType(); sellerTaxRegistration = xmlFactory.createTaxRegistrationType();
IDType sellerUstId = xmlFactory.createIDType(); IDType sellerUstId = xmlFactory.createIDType();
sellerUstId.setValue(trans.getOwnVATID()); sellerUstId.setValue(trans.getOwnVATID());
sellerUstId.setSchemeID(TaxRegistrationType.USTID); sellerUstId.setSchemeID(TaxRegistrationTypeConstants.USTID);
sellerTaxRegistration.setID(sellerUstId); sellerTaxRegistration.setID(sellerUstId);
sellerTradeParty.getSpecifiedTaxRegistration().add( sellerTradeParty.getSpecifiedTaxRegistration().add(
sellerTaxRegistration); sellerTaxRegistration);
@@ -270,7 +278,7 @@ class ZUGFeRDTransactionModelConverter {
DateTimeType deliveryDate = xmlFactory.createDateTimeType(); DateTimeType deliveryDate = xmlFactory.createDateTimeType();
DateTimeType.DateTimeString deliveryDateString = xmlFactory DateTimeType.DateTimeString deliveryDateString = xmlFactory
.createDateTimeTypeDateTimeString(); .createDateTimeTypeDateTimeString();
deliveryDateString.setFormat(DateTimeType.DateTimeString.DATE); deliveryDateString.setFormat(DateTimeTypeConstants.DATE);
deliveryDateString.setValue(zugferdDateFormat.format(trans deliveryDateString.setValue(zugferdDateFormat.format(trans
.getDeliveryDate())); .getDeliveryDate()));
deliveryDate.setDateTimeString(deliveryDateString); deliveryDate.setDateTimeString(deliveryDateString);
@@ -321,7 +329,7 @@ class ZUGFeRDTransactionModelConverter {
.createTradeSettlementPaymentMeansType(); .createTradeSettlementPaymentMeansType();
PaymentMeansCodeType paymentDataType = xmlFactory PaymentMeansCodeType paymentDataType = xmlFactory
.createPaymentMeansCodeType(); .createPaymentMeansCodeType();
paymentDataType.setValue(PaymentMeansCodeType.BANKACCOUNT); paymentDataType.setValue(PaymentMeansCodeTypeConstants.BANKACCOUNT);
paymentData.setTypeCode(paymentDataType); paymentData.setTypeCode(paymentDataType);
TextType paymentInfo = xmlFactory.createTextType(); TextType paymentInfo = xmlFactory.createTextType();
@@ -360,12 +368,12 @@ class ZUGFeRDTransactionModelConverter {
TradeTaxType tradeTax = xmlFactory.createTradeTaxType(); TradeTaxType tradeTax = xmlFactory.createTradeTaxType();
TaxTypeCodeType taxTypeCode = xmlFactory.createTaxTypeCodeType(); TaxTypeCodeType taxTypeCode = xmlFactory.createTaxTypeCodeType();
taxTypeCode.setValue(TaxTypeCodeType.SALESTAX); taxTypeCode.setValue(TaxTypeCodeTypeConstants.SALESTAX);
tradeTax.setTypeCode(taxTypeCode); tradeTax.setTypeCode(taxTypeCode);
TaxCategoryCodeType taxCategoryCode = xmlFactory TaxCategoryCodeType taxCategoryCode = xmlFactory
.createTaxCategoryCodeType(); .createTaxCategoryCodeType();
taxCategoryCode.setValue(TaxCategoryCodeType.STANDARDRATE); taxCategoryCode.setValue(TaxCategoryCodeTypeConstants.STANDARDRATE);
tradeTax.setCategoryCode(taxCategoryCode); tradeTax.setCategoryCode(taxCategoryCode);
VATAmount amount = VATPercentAmountMap.get(currentTaxPercent); VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
@@ -427,11 +435,11 @@ class ZUGFeRDTransactionModelConverter {
*/ */
TaxCategoryCodeType taxType = xmlFactory TaxCategoryCodeType taxType = xmlFactory
.createTaxCategoryCodeType(); .createTaxCategoryCodeType();
taxType.setValue(TaxCategoryCodeType.STANDARDRATE); taxType.setValue(TaxCategoryCodeTypeConstants.STANDARDRATE);
tradeTax.setCategoryCode(taxType); tradeTax.setCategoryCode(taxType);
TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType(); TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
taxCode.setValue(TaxTypeCodeType.SALESTAX); taxCode.setValue(TaxTypeCodeTypeConstants.SALESTAX);
tradeTax.setTypeCode(taxCode); tradeTax.setTypeCode(taxCode);
allowance.getCategoryTradeTax().add(tradeTax); allowance.getCategoryTradeTax().add(tradeTax);
@@ -478,11 +486,11 @@ class ZUGFeRDTransactionModelConverter {
*/ */
TaxCategoryCodeType taxType = xmlFactory TaxCategoryCodeType taxType = xmlFactory
.createTaxCategoryCodeType(); .createTaxCategoryCodeType();
taxType.setValue(TaxCategoryCodeType.STANDARDRATE); taxType.setValue(TaxCategoryCodeTypeConstants.STANDARDRATE);
tradeTax.setCategoryCode(taxType); tradeTax.setCategoryCode(taxType);
TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType(); TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
taxCode.setValue(TaxTypeCodeType.SALESTAX); taxCode.setValue(TaxTypeCodeTypeConstants.SALESTAX);
tradeTax.setTypeCode(taxCode); tradeTax.setTypeCode(taxCode);
charge.getCategoryTradeTax().add(tradeTax); charge.getCategoryTradeTax().add(tradeTax);
@@ -527,11 +535,11 @@ class ZUGFeRDTransactionModelConverter {
*/ */
TaxCategoryCodeType taxType = xmlFactory TaxCategoryCodeType taxType = xmlFactory
.createTaxCategoryCodeType(); .createTaxCategoryCodeType();
taxType.setValue(TaxCategoryCodeType.STANDARDRATE); taxType.setValue(TaxCategoryCodeTypeConstants.STANDARDRATE);
tradeTax.setCategoryCode(taxType); tradeTax.setCategoryCode(taxType);
TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType(); TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
taxCode.setValue(TaxTypeCodeType.SALESTAX); taxCode.setValue(TaxTypeCodeTypeConstants.SALESTAX);
tradeTax.setTypeCode(taxCode); tradeTax.setTypeCode(taxCode);
serviceCharge.getAppliedTradeTax().add(tradeTax); serviceCharge.getAppliedTradeTax().add(tradeTax);
@@ -550,7 +558,7 @@ class ZUGFeRDTransactionModelConverter {
DateTimeType dueDate = xmlFactory.createDateTimeType(); DateTimeType dueDate = xmlFactory.createDateTimeType();
DateTimeType.DateTimeString dueDateString = xmlFactory DateTimeType.DateTimeString dueDateString = xmlFactory
.createDateTimeTypeDateTimeString(); .createDateTimeTypeDateTimeString();
dueDateString.setFormat(DateTimeType.DateTimeString.DATE); dueDateString.setFormat(DateTimeTypeConstants.DATE);
dueDateString.setValue(zugferdDateFormat.format(trans.getDueDate())); dueDateString.setValue(zugferdDateFormat.format(trans.getDueDate()));
dueDate.setDateTimeString(dueDateString); dueDate.setDateTimeString(dueDateString);
paymentTerm.setDueDateDateTime(dueDate); paymentTerm.setDueDateDateTime(dueDate);
@@ -752,11 +760,11 @@ class ZUGFeRDTransactionModelConverter {
TaxCategoryCodeType taxCategoryCode = xmlFactory TaxCategoryCodeType taxCategoryCode = xmlFactory
.createTaxCategoryCodeType(); .createTaxCategoryCodeType();
taxCategoryCode.setValue(TaxCategoryCodeType.STANDARDRATE); taxCategoryCode.setValue(TaxCategoryCodeTypeConstants.STANDARDRATE);
tradeTax.setCategoryCode(taxCategoryCode); tradeTax.setCategoryCode(taxCategoryCode);
TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType(); TaxTypeCodeType taxCode = xmlFactory.createTaxTypeCodeType();
taxCode.setValue(TaxTypeCodeType.SALESTAX); taxCode.setValue(TaxTypeCodeTypeConstants.SALESTAX);
tradeTax.setTypeCode(taxCode); tradeTax.setTypeCode(taxCode);
PercentType taxPercent = xmlFactory.createPercentType(); PercentType taxPercent = xmlFactory.createPercentType();

19
src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
View File

@@ -401,22 +401,19 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
public void testZExport() throws Exception public void testZExport() throws Exception
{ {
final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505newEdge.pdf"; final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505newEdge.pdf";
// the writing part
ZUGFeRDExporter ze = null; try(InputStream SOURCE_PDF =
try { this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
// automatically add Zugferd to all outgoing invoices
ze = new ZUGFeRDExporterFromA1Factory() ZUGFeRDExporter ze = new ZUGFeRDExporterFromA1Factory()
.setProducer("My Application") .setProducer("My Application")
.setCreator(System.getProperty("user.name")) .setCreator(System.getProperty("user.name"))
.loadFromPDFA1(SOURCE_PDF); .loadFromPDFA1(SOURCE_PDF)) {
ze.PDFattachZugferdFile(this); ze.PDFattachZugferdFile(this);
ze.export(TARGET_PDF); ze.export(TARGET_PDF);
} finally {
if (ze != null) {
ze.close();
}
} }
// now check the contents (like MustangReaderTest) // now check the contents (like MustangReaderTest)

16
src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
View File

@@ -402,23 +402,19 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
public void testZExport() throws Exception public void testZExport() throws Exception
{ {
final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505new.pdf"; final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505new.pdf";
// the writing part // the writing part
ZUGFeRDExporter ze = null; try(InputStream SOURCE_PDF =
try { this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
// automatically add Zugferd to all outgoing invoices
ze = new ZUGFeRDExporterFromA1Factory() ZUGFeRDExporter ze = new ZUGFeRDExporterFromA1Factory()
.setProducer("My Application") .setProducer("My Application")
.setCreator(System.getProperty("user.name")) .setCreator(System.getProperty("user.name"))
.loadFromPDFA1(SOURCE_PDF); .loadFromPDFA1(SOURCE_PDF)) {
ze.PDFattachZugferdFile(this); ze.PDFattachZugferdFile(this);
ze.export(TARGET_PDF); ze.export(TARGET_PDF);
} finally {
if (ze != null) {
ze.close();
}
} }
// now check the contents (like MustangReaderTest) // now check the contents (like MustangReaderTest)