Merged with Master

src/main/java/org/mustangproject/ZUGFeRD/CustomXMLProvider.java

@@ -1,9 +1,27 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 public class CustomXMLProvider implements IXMLProvider {
 
 	protected byte[] zugferdData;
-	
+
 	@Override
 	public byte[] getXML() {
 		return zugferdData;
@@ -14,20 +32,20 @@ public class CustomXMLProvider implements IXMLProvider {
 		if (!zf.contains("<rsm:CrossIndustry")) {
 			throw new RuntimeException("ZUGFeRD XML does not contain <rsm:CrossIndustry and can thus not be valid");
 		}
-		
+
 		zugferdData=newData;
 	}
 
 	@Override
 	public void generateXML(IZUGFeRDExportableTransaction trans) {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 	@Override
 	public void setTest() {
 		// TODO Auto-generated method stub
-		
+
 	}
 
 }

src/main/java/org/mustangproject/ZUGFeRD/IExporterFactory.java

@@ -1,10 +1,26 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.xmpbox.XMPMetadata;
-
 public interface IExporterFactory {
 	public ZUGFeRDExporter load(String pdfFilename) throws IOException;
 	/**
@@ -21,15 +37,15 @@ public interface IExporterFactory {
 	 *
 	 * @param pdfSource
 	 *            source to read a PDF/A1 compliant document from
-	 * @throws IOException 
+	 * @throws IOException
 	 */
 	public ZUGFeRDExporter load(InputStream pdfSource) throws IOException;
-	
+
 	public IExporterFactory setCreator(String creator);
 	public IExporterFactory setConformanceLevel(PDFAConformanceLevel newLevel);
 	public IExporterFactory setProducer(String producer) ;
 	public IExporterFactory setZUGFeRDVersion(int version);
 	public IExporterFactory ignorePDFAErrors();
 	public IExporterFactory setZUGFeRDConformanceLevel(ZUGFeRDConformanceLevel zugferdConformanceLevel);
-				
+
 }

src/main/java/org/mustangproject/ZUGFeRD/IXMLProvider.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 public interface IXMLProvider {
@@ -6,5 +24,5 @@ public interface IXMLProvider {
 	public void setTest();
 
 	public void generateXML(IZUGFeRDExportableTransaction trans);
-	
+
 }

src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableContact.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 /**
  * Mustangproject's ZUGFeRD implementation
@@ -23,7 +41,7 @@ public interface IZUGFeRDExportableContact {
 	 */
 	String getZIP();
 
-	/** 
+	/**
 	 * VAT ID (Umsatzsteueridentifikationsnummer) of the contact
 	 * @return
 	 */
@@ -36,13 +54,13 @@ public interface IZUGFeRDExportableContact {
 	String getCountry();
 
 	/***
-	 * Returns the city of the contact 
+	 * Returns the city of the contact
 	 * @return
 	 */
 	String getLocation();
 
 	/***
-	 * Returns the street address (street+number) of the contact 
+	 * Returns the street address (street+number) of the contact
 	 */
 	String getStreet();
 

src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 /**
  * Mustangproject's ZUGFeRD implementation

src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableProduct.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 import java.math.BigDecimal;
 /**

src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 /**
  * Mustangproject's ZUGFeRD implementation
@@ -14,7 +32,7 @@ import java.util.Date;
 
 public interface IZUGFeRDExportableTransaction {
 
-	/** 
+	/**
 	 * Number, typically invoice number of the invoice
 	 * @return
 	 */
@@ -29,7 +47,7 @@ public interface IZUGFeRDExportableTransaction {
 	/**
 	 * this should be the full sender institution name, details, manager and tax registration like.
 	 * It is one of the few functions which may return null.
-	 * 
+	 *
 	 Lieferant GmbH
 	 Lieferantenstraße 20
 	 80333 München
@@ -45,10 +63,10 @@ public interface IZUGFeRDExportableTransaction {
 	 * @return
 	 */
 	Date getDueDate();
-        
+
         IZUGFeRDAllowanceCharge[] getZFAllowances();
         IZUGFeRDAllowanceCharge[] getZFCharges();
-        IZUGFeRDAllowanceCharge[] getZFLogisticsServiceCharges();        
+        IZUGFeRDAllowanceCharge[] getZFLogisticsServiceCharges();
 
 	IZUGFeRDExportableItem[] getZFItems();
 
@@ -104,7 +122,7 @@ public interface IZUGFeRDExportableTransaction {
 	 * @return
 	 */
 	String getOwnZIP();
-	
+
 	/**
 	 * own city
 	 * @return
@@ -116,38 +134,38 @@ public interface IZUGFeRDExportableTransaction {
 	 * @return
 	 */
 	String getOwnCountry();
-	
+
 	/**
 	 * get delivery date
 	 * @return
 	 */
 	Date getDeliveryDate();
-	
+
         /**
 	 * get main invoice currency used on the invoice
 	 * @return
-	 */        
+	 */
      String getCurrency();
-        
+
         /**
 	 * get payment information text. e.g. Bank transfer
 	 * @return
-	 */  	
+	 */
         String getOwnPaymentInfoText();
 
         /**
 	 * get payment term descriptional text
          * e.g. Bis zum 22.10.2015 ohne Abzug
 	 * @return
-	 */         
+	 */
         String getPaymentTermDescription();
-        
+
         /**
          * get reference document number
          * typically used for Invoice Corrections
          * Will be added as IncludedNote in comfort profile
-         * @return 
+         * @return
          */
         String getReferenceNumber();
-	
+
 }

src/main/java/org/mustangproject/ZUGFeRD/PDFAConformanceLevel.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 public enum PDFAConformanceLevel {

src/main/java/org/mustangproject/ZUGFeRD/VATAmount.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 import java.math.BigDecimal;

src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaPDFAExtensions.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 /**
@@ -41,13 +59,13 @@ public class XMPSchemaPDFAExtensions extends PDFAExtensionSchema {
 	public final String prefix_pdfaProperty = "pdfaProperty";
 	public String namespace = null;
 	public String prefix = null;
-	
-	
+
+
 	protected void setZUGFeRDVersion(int ver) {
 		namespace=ZUGFeRDExporter.getNamespaceForVersion(ver);
 		prefix=ZUGFeRDExporter.getPrefixForVersion(ver);
 	}
-	
+
 
 	private DefinedStructuredType addProperty(ArrayProperty parent, String name, String type, String category,
 			String description) {
@@ -81,7 +99,7 @@ public class XMPSchemaPDFAExtensions extends PDFAExtensionSchema {
 		setZUGFeRDVersion(ZFVersion);
 		attachExtensions(metadata, true);
 	}
-	
+
 	public XMPSchemaPDFAExtensions(XMPMetadata metadata, int ZFVersion, boolean withZF) {
 		super(metadata);
 		setZUGFeRDVersion(ZFVersion);

src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaZugferd.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 /**
  * Mustangproject's ZUGFeRD implementation

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java

@@ -1,25 +1,40 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
-
 import org.mustangproject.ZUGFeRD.model.CrossIndustryDocumentType;
 import org.mustangproject.ZUGFeRD.model.ZFNamespacePrefixMapper;
 
 public class ZUGFeRD1PullProvider implements IXMLProvider {
-	
+
 
 	protected byte[] zugferdData;
 	private Marshaller marshaller;
 
 	private boolean isTest;
 
-	
+
 
 	/**
 	 * enables the flag to indicate a test invoice in the XML structure

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 import java.io.UnsupportedEncodingException;
@@ -15,7 +33,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		private BigDecimal totalGross;
 		private BigDecimal itemTotalNetAmount;
 		private BigDecimal itemTotalVATAmount;
-		
+
 		public LineCalc(IZUGFeRDExportableItem currentItem) {
 			this.currentItem=currentItem;
 			BigDecimal multiplicator=currentItem.getProduct().getVATPercent().divide(new BigDecimal(100)).add(new BigDecimal(1));
@@ -50,7 +68,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 	public void setTest() {
 		isTest = true;
 	}
-	
+
 	private String nDigitFormat(BigDecimal value, int scale) {
 		/*
 		 * I needed 123,45, locale independent.I tried
@@ -81,12 +99,12 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		value=value.setScale( scale, BigDecimal.ROUND_HALF_UP ); // first, round so that e.g. 1.189999999999999946709294817992486059665679931640625 becomes 1.19
 		char[] repeat = new char[scale];
 		Arrays.fill(repeat, '0');
-		
+
 		DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols();
 		otherSymbols.setDecimalSeparator('.');
 		DecimalFormat dec = new DecimalFormat("0."+new String(repeat), otherSymbols);
 		return dec.format(value);
-		
+
 	}
 
 	private String vatFormat(BigDecimal value) {
@@ -110,15 +128,15 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 	}
 
 	private BigDecimal getTotalGross() {
-		
+
 		BigDecimal res=getTotal();
 		HashMap<BigDecimal, VATAmount> VATPercentAmountMap=getVATPercentAmountMap();
 		for (BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
 			VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
-			res=res.add(amount.getCalculated()); 
+			res=res.add(amount.getCalculated());
 		}
 
-			
+
 		return res;
 	}
 
@@ -135,13 +153,13 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 	 * which taxes have been used with which amounts in this transaction,
 	 * empty for no taxes, or e.g. 19=>190 and 7=>14 if 1000 Eur were applicable
 	 * to 19% VAT (=>190 EUR VAT) and 200 EUR were applicable to 7% (=>14 EUR VAT)
-	 * 190 Eur  
+	 * 190 Eur
 	 * @return
 	 *
 	*/
 	private HashMap<BigDecimal, VATAmount> getVATPercentAmountMap() {
 		HashMap<BigDecimal, VATAmount> hm=new HashMap<BigDecimal, VATAmount> ();
-		
+
 		for (IZUGFeRDExportableItem currentItem : trans.getZFItems()) {
 			BigDecimal percent=currentItem.getProduct().getVATPercent();
 			LineCalc lc=new LineCalc(currentItem);
@@ -151,14 +169,14 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 				hm.put(percent, itemVATAmount);
 			} else {
 				hm.put(percent, current.add(itemVATAmount));
-				
+
 			}
 		}
 
 		return hm;
 	}
 
-	
+
 	@Override
 	public void generateXML(IZUGFeRDExportableTransaction trans) {
 
@@ -168,7 +186,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		String testBooleanStr="false";
 		if (isTest) {
 			testBooleanStr="true";
-			
+
 		}
 		String senderReg="";
 		if (trans.getOwnOrganisationFullPlaintextInfo()!=null) {
@@ -179,11 +197,11 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					+ "		</ram:Content>\n"
 					+ "<ram:SubjectCode>REG</ram:SubjectCode>\n"
 					+ "</ram:IncludedCINote>\n";
-			
+
 		}
-        
-        
-		
+
+
+
 				String xml= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" //$NON-NLS-1$
 
 					+ "<rsm:CrossIndustryInvoice xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rsm=\"urn:un:unece:uncefact:data:standard:CrossIndustryInvoice:100\""
@@ -334,7 +352,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					+ "			</ram:SpecifiedTradeSettlementPaymentMeans>\n"; //$NON-NLS-1$
 
 
-			
+
 			HashMap<BigDecimal, VATAmount> VATPercentAmountMap=getVATPercentAmountMap();
 			for (BigDecimal currentTaxPercent : VATPercentAmountMap.keySet()) {
 				VATAmount amount = VATPercentAmountMap.get(currentTaxPercent);
@@ -414,7 +432,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 
 					xml=xml	+ "	</rsm:SupplyChainTradeTransaction>\n" //$NON-NLS-1$
 					+ "</rsm:CrossIndustryInvoice>"; //$NON-NLS-1$
-					
+
 				byte[] zugferdRaw;
 				try {
 					zugferdRaw = xml.getBytes("UTF-8");

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDConformanceLevel.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 public enum ZUGFeRDConformanceLevel {

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExportException.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 public class ZUGFeRDExportException extends RuntimeException {

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java

@@ -1,3 +1,22 @@
+
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 /*
@@ -10,6 +29,18 @@ package org.mustangproject.ZUGFeRD;
  *
  */
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+import javax.xml.transform.TransformerException;
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;
@@ -30,19 +61,6 @@ import org.apache.xmpbox.schema.XMPBasicSchema;
 import org.apache.xmpbox.type.BadFieldValueException;
 import org.apache.xmpbox.xml.XmpSerializer;
 
-import javax.xml.transform.TransformerException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
-
 public class ZUGFeRDExporter implements Closeable {
 
 	public static final int DefaultZUGFeRDVersion = 1;
@@ -435,7 +453,7 @@ public class ZUGFeRDExporter implements Closeable {
 	 *
 	 * @param zUGFeRDConformanceLevel
 	 *            the new conformance level
-	 * 
+	 *
 	 * @deprecated Use {@link ZUGFeRDExporterFromA1Factory} instead
 	 */
 	@Deprecated
@@ -590,7 +608,7 @@ public class ZUGFeRDExporter implements Closeable {
 	public void setPDFA3(boolean ensurePDFisUpgraded) {
 		this.ensurePDFisUpgraded = ensurePDFisUpgraded;
 	}
-	
+
 	public void setAttachZUGFeRDHeaders(boolean attachZUGFeRDHeaders) {
 		this.attachZUGFeRDHeaders=attachZUGFeRDHeaders;
 	}

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA1Factory.java

@@ -1,10 +1,28 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 
 public class ZUGFeRDExporterFromA1Factory  extends ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 	public ZUGFeRDExporterFromA1Factory() {
 		ensurePDFisUpgraded=true;
-		
+
 	}
 
 }

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java

@@ -1,5 +1,30 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import javax.activation.DataSource;
+import javax.activation.FileDataSource;
 import org.apache.pdfbox.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.preflight.PreflightDocument;
@@ -7,22 +32,13 @@ import org.apache.pdfbox.preflight.exception.ValidationException;
 import org.apache.pdfbox.preflight.parser.PreflightParser;
 import org.apache.pdfbox.preflight.utils.ByteArrayDataSource;
 
-
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 	protected boolean ignorePDFAErrors = false;
 	protected ZUGFeRDConformanceLevel zugferdConformanceLevel = ZUGFeRDConformanceLevel.EXTENDED;
 	protected PDFAConformanceLevel conformanceLevel = PDFAConformanceLevel.UNICODE;
 	protected String producer = "mustangproject";
 	protected String creator = "mustangproject";
-	
+
 	protected int ZFVersion=ZUGFeRDExporter.DefaultZUGFeRDVersion;
 	protected boolean ensurePDFisUpgraded=false;
 	private boolean attachZUGFeRDHeaders=true;
@@ -34,7 +50,7 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 	 *            filename of an PDF/A1 compliant document
 	 */
 	public ZUGFeRDExporter load(String pdfFilename) throws IOException {
-		
+
 		ensurePDFIsValidPDFA(new FileDataSource(pdfFilename));
 		ZUGFeRDExporter zugFeRDExporter;
 		PDDocument doc = PDDocument.load(new File(pdfFilename));
@@ -45,12 +61,12 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 		zugFeRDExporter.setProducer(producer);
 		zugFeRDExporter.setAttachZUGFeRDHeaders(attachZUGFeRDHeaders);
 		zugFeRDExporter.setPDFA3(ensurePDFisUpgraded);
-		
+
 		return zugFeRDExporter;
 
 	}
-	
-		
+
+
 
 	/**
 	 * Makes A PDF/A3a-compliant document from a PDF-A1 compliant document (on the
@@ -70,10 +86,10 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
 		zugFeRDExporter.setProducer(producer);
 		zugFeRDExporter.setAttachZUGFeRDHeaders(attachZUGFeRDHeaders);
 		zugFeRDExporter.setPDFA3(ensurePDFisUpgraded);
-		
+
 		return zugFeRDExporter;
 	}
-	
+
 	public ZUGFeRDExporterFromA3Factory () {
 
 		ensurePDFisUpgraded=false;

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 /**
  * Mustangproject's ZUGFeRD implementation
@@ -14,7 +32,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -39,7 +56,7 @@ public class ZUGFeRDImporter {
 	/*
 	 * call extract(importFilename). containsMeta() will return if ZUGFeRD data has
 	 * been found, afterwards you can call getBIC(), getIBAN() etc.
-	 * 
+	 *
 	 */
 
 	/** @var if metadata has been found */
@@ -68,7 +85,7 @@ public class ZUGFeRDImporter {
 			bis.close();
 		} catch (IOException ioe) {
 			ioe.printStackTrace();
-		} 
+		}
 	}
 
 	/**
@@ -157,25 +174,25 @@ public class ZUGFeRDImporter {
 		/*
 		 * ndList = document .getElementsByTagName("GermanBankleitzahlID");
 		 * //$NON-NLS-1$
-		 * 
+		 *
 		 * for (int bookingIndex = 0; bookingIndex < ndList .getLength();
 		 * bookingIndex++) { Node booking = ndList.item(bookingIndex); // if there is a
 		 * attribute in the tag number:value setBIC(booking.getTextContent());
-		 * 
+		 *
 		 * }
-		 * 
+		 *
 		 * ndList = document.getElementsByTagName("ProprietaryID"); //$NON-NLS-1$
-		 * 
+		 *
 		 * for (int bookingIndex = 0; bookingIndex < ndList .getLength();
 		 * bookingIndex++) { Node booking = ndList.item(bookingIndex); // if there is a
 		 * attribute in the tag number:value setIBAN(booking.getTextContent());
-		 * 
+		 *
 		 * } <ram:PayeePartyCreditorFinancialAccount> <ram:IBANID>DE1234</ram:IBANID>
 		 * </ram:PayeePartyCreditorFinancialAccount>
 		 * <ram:PayeeSpecifiedCreditorFinancialInstitution>
 		 * <ram:BICID>DE5656565</ram:BICID> <ram:Name>Commerzbank</ram:Name>
 		 * </ram:PayeeSpecifiedCreditorFinancialInstitution>
-		 * 
+		 *
 		 */
 		
 		/***

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDMigrator.java

@@ -1,89 +1,98 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-
-
 public class ZUGFeRDMigrator {
-	static final ClassLoader cl = ZUGFeRDMigrator.class.getClassLoader();
-	private static TransformerFactory factory = null;
-	private static final String resourcePath = ""; //$NON-NLS-1$
 
-	private static TransformerFactory getTransformerFactory() {
-		//TransformerFactory fact = new net.sf.saxon.TransformerFactoryImpl();
-		TransformerFactory fact = TransformerFactory.newInstance();
-		fact.setURIResolver(new ClasspathResourceURIResolver());
-		return fact;
-	}
-	public String migrateFromV1ToV2(String xmlFilename) {
-/***
- * http://www.unece.org/fileadmin/DAM/cefact/xml/XML-Naming-And-Design-Rules-V2_1.pdf
- * http://www.ferd-net.de/upload/Dokumente/FACTUR-X_ZUGFeRD_2p0_Teil1_Profil_EN16931_1p03.pdf
-http://countwordsfree.com/xmlviewer
- */
-		ByteArrayOutputStream baos=new ByteArrayOutputStream();
-		try {
-			applySchematronXsl(new FileInputStream(xmlFilename), baos);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (TransformerException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		String res=null;
-		try {
-			res=baos.toString("UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return res;
-	}
+    static final ClassLoader CLASS_LOADER = ZUGFeRDMigrator.class.getClassLoader();
+    private static final String RESOURCE_PATH = ""; //$NON-NLS-1$
+    private static final Logger LOG = Logger.getLogger(ZUGFeRDMigrator.class.getName());
+//    private static File createTempFileResult(final Transformer transformer, final StreamSource toTransform,
+//            final String suffix) throws TransformerException, IOException {
+//        File result = File.createTempFile("ZUV_", suffix); //$NON-NLS-1$
+//        result.deleteOnExit();
+//
+//        try (FileOutputStream fos = new FileOutputStream(result)) {
+//            transformer.transform(toTransform, new StreamResult(fos));
+//        }
+//        return result;
+//    }
+    private TransformerFactory mFactory = null;
+    private Templates mXsltTemplate = null;
 
-	private static File createTempFileResult(final Transformer transformer, final StreamSource toTransform,
-			final String suffix) throws TransformerException, IOException {
-		File result = File.createTempFile("ZUV_", suffix); //$NON-NLS-1$
-		result.deleteOnExit();
+    public ZUGFeRDMigrator() {
+            mFactory = new net.sf.saxon.TransformerFactoryImpl();
+            //fact = TransformerFactory.newInstance();
+            mFactory.setURIResolver(new ClasspathResourceURIResolver());
+        try {
+            mXsltTemplate = mFactory.newTemplates(new StreamSource(CLASS_LOADER.getResourceAsStream(RESOURCE_PATH + "COMFORTtoEN16931.xsl")));
+        } catch (TransformerConfigurationException ex) {
+            LOG.log(Level.SEVERE, null, ex);
+        }
+    }
 
-		try (FileOutputStream fos = new FileOutputStream(result)) {
-			transformer.transform(toTransform, new StreamResult(fos));
-		}
-		return result;
-	}
-	
-	private static class ClasspathResourceURIResolver implements URIResolver {
-		ClasspathResourceURIResolver() {
-			// Do nothing, just prevents synthetic access warning.
-		}
+    public String migrateFromV1ToV2(String xmlFilename) throws FileNotFoundException, TransformerException, UnsupportedEncodingException {
+        /**
+         * *
+         * http://www.unece.org/fileadmin/DAM/cefact/xml/XML-Naming-And-Design-Rules-V2_1.pdf
+         * http://www.ferd-net.de/upload/Dokumente/FACTUR-X_ZUGFeRD_2p0_Teil1_Profil_EN16931_1p03.pdf
+         * http://countwordsfree.com/xmlviewer
+         */
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        applySchematronXsl(new FileInputStream(xmlFilename), baos);
+        String res = null;
+        res = baos.toString("UTF-8");
+        return res;
+    }
 
-		@Override
-		public Source resolve(String href, String base) throws TransformerException {
-			return new StreamSource(cl.getResourceAsStream(resourcePath + href));
-		}
-	}
-	
-	public static void applySchematronXsl(final InputStream xmlFile,
-			final OutputStream EN16931Outstream) throws TransformerException {
-		factory=getTransformerFactory();
-		Transformer transformer = factory.newTransformer(new StreamSource(cl.getResourceAsStream(resourcePath+"COMFORTtoEN16931.xsl")));
-		transformer.transform(new StreamSource(xmlFile), new StreamResult(EN16931Outstream));
-	}
+    public void applySchematronXsl(final InputStream xmlFile,
+            final OutputStream EN16931Outstream) throws TransformerException {
+        Transformer transformer = mXsltTemplate.newTransformer();
+        transformer.transform(new StreamSource(xmlFile), new StreamResult(EN16931Outstream));
+    }
 
+    private static class ClasspathResourceURIResolver implements URIResolver {
+        ClasspathResourceURIResolver() {
+            // Do nothing, just prevents synthetic access warning.
+        }
+
+        @Override
+        public Source resolve(String href, String base) throws TransformerException {
+            return new StreamSource(CLASS_LOADER.getResourceAsStream(RESOURCE_PATH + href));
+        }
+    }
 }

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDTransactionModelConverter.java

@@ -1,5 +1,33 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD;
 
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
 import org.mustangproject.ZUGFeRD.model.AmountType;
 import org.mustangproject.ZUGFeRD.model.CodeType;
 import org.mustangproject.ZUGFeRD.model.CountryIDType;
@@ -48,17 +76,6 @@ import org.mustangproject.ZUGFeRD.model.TradeSettlementMonetarySummationType;
 import org.mustangproject.ZUGFeRD.model.TradeSettlementPaymentMeansType;
 import org.mustangproject.ZUGFeRD.model.TradeTaxType;
 
-import javax.xml.bind.JAXBElement;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
 class ZUGFeRDTransactionModelConverter {
     private static final SimpleDateFormat zugferdDateFormat = new SimpleDateFormat("yyyyMMdd");
     private static final ObjectFactory xmlFactory = new ObjectFactory();
@@ -827,12 +844,12 @@ class ZUGFeRDTransactionModelConverter {
 		 * DecimalFormatSymbols(); symbols.setDecimalSeparator(',');
 		 * symbols.setGroupingSeparator(' ');
 		 * df.setDecimalFormatSymbols(symbols);
-		 * 
+		 *
 		 * but that would not switch off grouping. Although I liked very much
 		 * the (incomplete) "BNF diagram" in
 		 * http://docs.oracle.com/javase/tutorial/i18n/format/decimalFormat.html
 		 * in the end I decided to calculate myself and take eur+sparator+cents
-		 * 
+		 *
 		 * This function will cut off, i.e. floor() subcent values Tests:
 		 * System.err.println(utils.currencyFormat(new BigDecimal(0),
 		 * ".")+"\n"+utils.currencyFormat(new BigDecimal("-1.10"),
@@ -841,7 +858,7 @@ class ZUGFeRDTransactionModelConverter {
 		 * ",")+"\n"+utils.currencyFormat(new BigDecimal("20000123.3489"),
 		 * ",")+"\n"+utils.currencyFormat(new BigDecimal("20000123.3419"),
 		 * ",")+"\n"+utils.currencyFormat(new BigDecimal("12"), ","));
-		 * 
+		 *
 		 * results 0.00 -1,10 -1,10 -1,01 20000123,34 20000123,34 12,00
 		 */
         value = value.setScale(scale, BigDecimal.ROUND_HALF_UP); // first, round
@@ -944,7 +961,7 @@ class ZUGFeRDTransactionModelConverter {
 
         return hm;
     }
-    
+
     ZUGFeRDTransactionModelConverter withTest(boolean isTest) {
         this.isTest = isTest;
         return this;

src/main/java/org/mustangproject/ZUGFeRD/model/DateTimeTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class DateTimeTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/DocumentCodeTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class DocumentCodeTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/DocumentContextParameterTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class DocumentContextParameterTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/NoteTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class NoteTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/PaymentMeansCodeTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class PaymentMeansCodeTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/QuantityTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class QuantityTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/TaxCategoryCodeTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class TaxCategoryCodeTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/TaxRegistrationTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class TaxRegistrationTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/TaxTypeCodeTypeConstants.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
 public class TaxTypeCodeTypeConstants {

src/main/java/org/mustangproject/ZUGFeRD/model/ZFNamespacePrefixMapper.java

@@ -1,14 +1,31 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.ZUGFeRD.model;
 
+import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
-
 public class ZFNamespacePrefixMapper extends NamespacePrefixMapper {
 
 	private Map<String, String> namespaceMap = new HashMap<>();
- 
+
 	/**
 	 * Create mappings.
 	 */
@@ -18,7 +35,7 @@ public class ZFNamespacePrefixMapper extends NamespacePrefixMapper {
 		namespaceMap.put("urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15", "udt");
 		namespaceMap.put("urn:ferd:CrossIndustryDocument:invoice:1p0", "rsm");
 	}
- 
+
 	/* (non-Javadoc)
 	 * Returning null when not found based on spec.
 	 * @see com.sun.xml.bind.marshaller.NamespacePrefixMapper#getPreferredPrefix(java.lang.String, java.lang.String, boolean)

src/main/java/org/mustangproject/toecount/FileChecker.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.toecount;
 
 import org.mustangproject.ZUGFeRD.ZUGFeRDImporter;
@@ -6,7 +24,7 @@ public class FileChecker {
 	String filename;
 	StatRun thisRun;
 	boolean isPDF=false;
-	
+
 	public FileChecker(String filename, StatRun statistics) {
 		this.filename=filename;
 		thisRun=statistics;
@@ -21,12 +39,12 @@ public class FileChecker {
 					thisRun.incPDFCount();
 				}
 			}
-			
+
 		} else {
-			thisRun.incPDFCount();			
+			thisRun.incPDFCount();
 		}
 	}
-	
+
 	public boolean checkForZUGFeRD() {
 		if ((!isPDF)&&(!thisRun.shallIgnoreFileExt())) {
 			return false;
@@ -48,22 +66,22 @@ public class FileChecker {
         at org.mustangproject.ZUGFeRD.ZUGFeRDImporter.extract(ZUGFeRDImporter.java:64)
         at toecount.FileChecker.checkForZUGFeRD(FileChecker.java:33)
         at toecount.Toecount.main(Toecount.java:111)
-			 * 
+			 *
 			 */
 			// Ignore nevertheless, most likely we're batch processing
 			return false;
 		} catch (Exception e2) {
 			/**
-			 * probably thrown up from 
+			 * probably thrown up from
 			AM org.apache.pdfbox.pdfparser.PDFParser parse, most likely
 			INFORMATION: Document is encrypted
-			but also other internal PDF errors possible like 
+			but also other internal PDF errors possible like
 			..Okt 23, 2015 11:17:53 AM org.apache.pdfbox.pdfparser.XrefTrailerResolver setStartxref
 			 */
 			return false;
 		}
 	}
-	
+
 	public boolean isPDF() {
 		return isPDF;
 	}
@@ -71,5 +89,5 @@ public class FileChecker {
 	public String getOutputLine() {
 		return thisRun.getOutputLine();
 	}
-	
+
 }

src/main/java/org/mustangproject/toecount/FileTraverser.java

@@ -1,9 +1,26 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.toecount;
 
-import static java.nio.file.FileVisitResult.CONTINUE;
-
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
+import static java.nio.file.FileVisitResult.CONTINUE;
 import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
@@ -29,7 +46,7 @@ public class FileTraverser extends SimpleFileVisitor<Path> {
 			fc.checkForZUGFeRD();
 			System.out.print(fc.getOutputLine());
 
-		} 
+		}
 		return CONTINUE;
 	}
 

src/main/java/org/mustangproject/toecount/StatRun.java

@@ -1,3 +1,21 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.toecount;
 
 public class StatRun {
@@ -10,7 +28,7 @@ public class StatRun {
 	public void ignoreFileExtension() {
 		checkFileExt=false;
 	}
-	
+
 	public boolean shallIgnoreFileExt() {
 		return !checkFileExt;
 	}
@@ -51,11 +69,11 @@ public class StatRun {
 	 * @return
 	 */
 	public String getSummaryLine() {
-	
+
 		return "\r\n===================================================================\r\n"+String.format(
 				"Files:\t%d\tDirs:\t%d\tPDF:\t%d\tZUGFeRD:\t%d\r\n",
 				getFileCount(), getDirCount(), getPDFCount(), getZUGFeRDCount());
-	
+
 	}
 	/***
 	 * show that something is happening
@@ -65,5 +83,5 @@ public class StatRun {
 		return ".";
 	}
 
-	
+
 }

src/main/java/org/mustangproject/toecount/Toecount.java

@@ -1,18 +1,42 @@
+/** **********************************************************************
+ *
+ * Copyright 2018 Jochen Staerk
+ *
+ * Use is subject to license terms.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *********************************************************************** */
 package org.mustangproject.toecount;
 
 /***
  * This is the command line interface to mustangproject
- * 
+ *
  */
 
+import com.sanityinc.jargs.CmdLineParser;
+import com.sanityinc.jargs.CmdLineParser.Option;
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.xml.transform.TransformerException;
 import org.mustangproject.ZUGFeRD.ZUGFeRDConformanceLevel;
 import org.mustangproject.ZUGFeRD.ZUGFeRDExporter;
 import org.mustangproject.ZUGFeRD.ZUGFeRDExporterFromA1Factory;
@@ -20,9 +44,6 @@ import org.mustangproject.ZUGFeRD.ZUGFeRDExporterFromA3Factory;
 import org.mustangproject.ZUGFeRD.ZUGFeRDImporter;
 import org.mustangproject.ZUGFeRD.ZUGFeRDMigrator;
 
-import com.sanityinc.jargs.CmdLineParser;
-import com.sanityinc.jargs.CmdLineParser.Option;
-
 public class Toecount {
 	// build with: /opt/local/bin/mvn clean compile assembly:single
 	private static void printUsage() {
@@ -53,7 +74,7 @@ public class Toecount {
 	/***
 	 * Asks the user for a String (offering a defaultValue) conforming to a Regex
 	 * pattern
-	 * 
+	 *
 	 * @param prompt
 	 * @param defaultValue
 	 * @param pattern
@@ -98,10 +119,10 @@ public class Toecount {
 	 * Prompts the user for a input or output filename
 	 * @param prompt
 	 * @param defaultFilename
-	 * @param expectedExtension will warn if filename does not match expected file extension 
+	 * @param expectedExtension will warn if filename does not match expected file extension
 	 * @param ensureFileExists will warn if file does NOT exist (for input files)
 	 * @param ensureFileNotExists will warn if file DOES exist (for output files)
-	 * 
+	 *
 	 * @return String
 	 */
 	protected static String getFilenameFromUser(String prompt, String defaultFilename, String expectedExtension, boolean ensureFileExists, boolean ensureFileNotExists) {
@@ -147,7 +168,7 @@ public class Toecount {
 					System.out.println("File does not exist, try again or CTRL+C to cancel");
 					// discard the input, a scanner.reset is not sufficient
 					fileExistenceOK = false;
-				}			
+				}
 			} else {
 				fileExistenceOK=true;
 
@@ -158,7 +179,7 @@ public class Toecount {
 						System.out.println("Output file already exists, try again or CTRL+C to cancel");
 						// discard the input, a scanner.reset is not sufficient
 
-					}			
+					}
 				} else {
 					fileExistenceOK=true;
 				}
@@ -275,12 +296,12 @@ public class Toecount {
 					String versionInput = "";
 					try {
 						versionInput = getStringFromUser("ZUGFeRD version (1 or 2)", "1", "1|2");
-						
+
 					} catch (Exception e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
-					
+
 					String profileInput = "";
 					int zfIntVersion=Integer.valueOf(versionInput);
 
@@ -288,7 +309,7 @@ public class Toecount {
 					if (zfIntVersion==1) {
 						try {
 							profileInput = getStringFromUser("ZUGFeRD profile b)asic, c)omfort or e)xtended", "e", "B|b|C|c|E|e").toLowerCase();
-							
+
 						} catch (Exception e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
@@ -296,17 +317,17 @@ public class Toecount {
 						if (profileInput.equals("b")) {
 							profile=ZUGFeRDConformanceLevel.BASIC;
 						} else if (profileInput.equals("c")) {
-							profile=ZUGFeRDConformanceLevel.COMFORT;						
+							profile=ZUGFeRDConformanceLevel.COMFORT;
 						} else if (profileInput.equals("e")) {
 							profile=ZUGFeRDConformanceLevel.EXTENDED;
-							
+
 						}
-						
+
 					} else if (zfIntVersion==2) {
 						try {
-							profileInput = getStringFromUser("ZUGFeRD profile  [M]INIMUM, BASIC [W]L, [B]ASIC,\n" + 
+							profileInput = getStringFromUser("ZUGFeRD profile  [M]INIMUM, BASIC [W]L, [B]ASIC,\n" +
 									"[C]IUS, [E]N16931, E[X]TENDED", "E", "M|m|W|w|B|b|C|c|E|e|X|x|").toLowerCase();
-							
+
 						} catch (Exception e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
@@ -314,7 +335,7 @@ public class Toecount {
 						if (profileInput.equals("m")) {
 							profile=ZUGFeRDConformanceLevel.MINIMUM;
 						} else if (profileInput.equals("w")) {
-							profile=ZUGFeRDConformanceLevel.BASICWL;						
+							profile=ZUGFeRDConformanceLevel.BASICWL;
 						} else if (profileInput.equals("b")) {
 							profile=ZUGFeRDConformanceLevel.BASIC;
 						} else if (profileInput.equals("c")) {
@@ -324,13 +345,13 @@ public class Toecount {
 						} else if (profileInput.equals("x")) {
 							profile=ZUGFeRDConformanceLevel.EXTENDED;
 						}
-						
+
 					}
-					
+
 					ZUGFeRDExporter ze = new ZUGFeRDExporterFromA3Factory().setProducer("Toecount")
 							.setCreator(System.getProperty("user.name")).setZUGFeRDConformanceLevel(profile).load(pdfName);
 					ze.setZUGFeRDVersion(zfIntVersion);
-				
+
 					ze.setZUGFeRDXMLData(Files.readAllBytes(Paths.get(xmlName)));
 
 					ze.export(outName);
@@ -373,21 +394,25 @@ public class Toecount {
 				}
 				System.out.println("Written to " + outName);
 			} else if (upgradeRequested) {
-				String xmlName = "";
-				String outName = "";
+                try {
+                    String xmlName = "";
+                    String outName = "";
 
-				try {
-					xmlName = getFilenameFromUser("ZUGFeRD 1.0 XML source", "ZUGFeRD-invoice.xml", "xml", true, false);
-					outName = getFilenameFromUser("ZUGFeRD 2.0 XML target", "factur-x.xml", "xml", false, true);
-
-					ZUGFeRDMigrator zmi = new ZUGFeRDMigrator();
-					String xml = zmi.migrateFromV1ToV2(xmlName);
-					Files.write(Paths.get(outName), xml.getBytes());
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-				System.out.println("Written to " + outName);
+                    xmlName = getFilenameFromUser("ZUGFeRD 1.0 XML source", "ZUGFeRD-invoice.xml", "xml", true, false);
+                    outName = getFilenameFromUser("ZUGFeRD 2.0 XML target", "factur-x.xml", "xml", false, true);
 
+                    ZUGFeRDMigrator zmi = new ZUGFeRDMigrator();
+                    String xml = null;
+                    xml = zmi.migrateFromV1ToV2(xmlName);
+                    Files.write(Paths.get(outName), xml.getBytes());
+                    System.out.println("Written to " + outName);
+                } catch (FileNotFoundException ex) {
+                    Logger.getLogger(Toecount.class.getName()).log(Level.SEVERE, null, ex);
+                } catch (TransformerException | UnsupportedEncodingException ex) {
+                    Logger.getLogger(Toecount.class.getName()).log(Level.SEVERE, null, ex);
+                } catch (IOException ex) {
+                    Logger.getLogger(Toecount.class.getName()).log(Level.SEVERE, null, ex);
+                }
 			} else {
 				// no argument or argument unknown
 				printUsage();