Cleansing

2024-07-09 18:37:53 +02:00
parent 8b2a11c5da
commit 12a3abde66
46 changed files with 394 additions and 402 deletions
--- a/library/src/main/java/org/mustangproject/Allowance.java
+++ b/library/src/main/java/org/mustangproject/Allowance.java
@@ -1,14 +1,11 @@
 package org.mustangproject;

-import org.mustangproject.ZUGFeRD.IExportableTransaction;
-import org.mustangproject.ZUGFeRD.IZUGFeRDAllowanceCharge;
-
 import java.math.BigDecimal;

 /***
 * (absolute) allowances on item and document level
 */
-public class Allowance extends Charge implements IZUGFeRDAllowanceCharge {
+public class Allowance extends Charge {

 	/***
 	 * bean constructor
--- a/library/src/main/java/org/mustangproject/CII/CIIToUBL.java
+++ b/library/src/main/java/org/mustangproject/CII/CIIToUBL.java
@@ -5,8 +5,6 @@ import java.io.Serializable;

 import com.helger.commons.error.list.ErrorList;
 import com.helger.en16931.cii2ubl.CIIToUBL23Converter;
-import com.helger.ubl21.UBL21Marshaller;
-import com.helger.ubl22.UBL22Marshaller;
 import com.helger.ubl23.UBL23Marshaller;

 /***
@@ -23,31 +21,7 @@ public class CIIToUBL {
 	   final ErrorList occurred=new ErrorList();
 	   final CIIToUBL23Converter cc=new CIIToUBL23Converter();
 	   final Serializable aUBL = cc.convertCIItoUBL(input, occurred);
-	   if (aUBL instanceof oasis.names.specification.ubl.schema.xsd.invoice_21.InvoiceType)
-	   {
-		   UBL21Marshaller.invoice ()
-				   .setFormattedOutput (true)
-				   .write ((oasis.names.specification.ubl.schema.xsd.invoice_21.InvoiceType) aUBL, output);
-	   }
-	   else	if (aUBL instanceof oasis.names.specification.ubl.schema.xsd.creditnote_21.CreditNoteType)
-	   {
-	     UBL21Marshaller.creditNote ()
-				   .setFormattedOutput (true)
-				   .write ((oasis.names.specification.ubl.schema.xsd.creditnote_21.CreditNoteType) aUBL, output);
-	   }
-	   else	if (aUBL instanceof oasis.names.specification.ubl.schema.xsd.invoice_22.InvoiceType)
-	   {
-		   UBL22Marshaller.invoice ()
-				   .setFormattedOutput (true)
-				   .write ((oasis.names.specification.ubl.schema.xsd.invoice_22.InvoiceType) aUBL, output);
-	   }
-	   else if (aUBL instanceof oasis.names.specification.ubl.schema.xsd.creditnote_22.CreditNoteType)
-	   {
-		   UBL22Marshaller.creditNote ()
-				   .setFormattedOutput (true)
-				   .write ((oasis.names.specification.ubl.schema.xsd.creditnote_22.CreditNoteType) aUBL, output);
-	   }
-	   else if (aUBL instanceof oasis.names.specification.ubl.schema.xsd.invoice_23.InvoiceType)
+     if (aUBL instanceof oasis.names.specification.ubl.schema.xsd.invoice_23.InvoiceType)
 	   {
 		   UBL23Marshaller.invoice ()
 				   .setFormattedOutput (true)
--- a/library/src/main/java/org/mustangproject/Charge.java
+++ b/library/src/main/java/org/mustangproject/Charge.java
@@ -1,9 +1,7 @@
 package org.mustangproject;

 import org.mustangproject.ZUGFeRD.IAbsoluteValueProvider;
-import org.mustangproject.ZUGFeRD.IExportableTransaction;
 import org.mustangproject.ZUGFeRD.IZUGFeRDAllowanceCharge;
-import org.mustangproject.ZUGFeRD.IZUGFeRDExportableItem;

 import java.math.BigDecimal;

--- a/library/src/main/java/org/mustangproject/Invoice.java
+++ b/library/src/main/java/org/mustangproject/Invoice.java
@@ -547,7 +547,7 @@ public class Invoice implements IExportableTransaction {
 			return null;
 		}

-		return ((TradeParty) getSender()).getAsTradeSettlement();
+		return getSender().getAsTradeSettlement();

 	}

--- a/library/src/main/java/org/mustangproject/Item.java
+++ b/library/src/main/java/org/mustangproject/Item.java
@@ -1,7 +1,6 @@
 package org.mustangproject;

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.fop.util.XMLUtil;
 import org.mustangproject.ZUGFeRD.IReferencedDocument;
 import org.mustangproject.ZUGFeRD.IZUGFeRDAllowanceCharge;
 import org.mustangproject.ZUGFeRD.IZUGFeRDExportableItem;
@@ -12,7 +11,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;

 /***
 * describes any invoice line
@@ -28,8 +26,8 @@ public class Item implements IZUGFeRDExportableItem {
 	protected Product product;
 	protected ArrayList<String> notes = null;
 	protected ArrayList<ReferencedDocument> referencedDocuments = null;
-	protected ArrayList<IZUGFeRDAllowanceCharge> Allowances = new ArrayList<IZUGFeRDAllowanceCharge>(),
-		Charges = new ArrayList<IZUGFeRDAllowanceCharge>();
+	protected ArrayList<IZUGFeRDAllowanceCharge> Allowances = new ArrayList<>(),
+		Charges = new ArrayList<>();

 	/***
 	 * default constructor
@@ -138,7 +136,7 @@ public class Item implements IZUGFeRDExportableItem {
 						ReferencedDocument rd = new ReferencedDocument(IssuerAssignedID, TypeCode,
 							ReferenceTypeCode);
 						if (rdocs == null) {
-							rdocs = new ArrayList<ReferencedDocument>();
+							rdocs = new ArrayList<>();
 						}
 						rdocs.add(rd);

@@ -428,7 +426,7 @@ public class Item implements IZUGFeRDExportableItem {
 	 */
 	public Item addNote(String text) {
 		if (notes == null) {
-			notes = new ArrayList<String>();
+			notes = new ArrayList<>();
 		}
 		notes.add(text);
 		return this;
@@ -441,7 +439,7 @@ public class Item implements IZUGFeRDExportableItem {
 	 */
 	public Item addReferencedDocument(ReferencedDocument doc) {
 		if (referencedDocuments == null) {
-			referencedDocuments = new ArrayList<ReferencedDocument>();
+			referencedDocuments = new ArrayList<>();
 		}
 		referencedDocuments.add(doc);
 		return this;
--- a/library/src/main/java/org/mustangproject/LegalOrganisation.java
+++ b/library/src/main/java/org/mustangproject/LegalOrganisation.java
@@ -2,13 +2,6 @@ package org.mustangproject;

 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.mustangproject.ZUGFeRD.*;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

 /***
 * A organisation, i.e. usually a company
--- a/library/src/main/java/org/mustangproject/TradeParty.java
+++ b/library/src/main/java/org/mustangproject/TradeParty.java
@@ -66,15 +66,15 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 				//nodes.item(i).getTextContent())) {
 				Node currentItemNode = nodes.item(nodeIndex);

-				if (nodes.item(nodeIndex).getLocalName() != null) {
-					String debcurrentChild = nodes.item(nodeIndex).getLocalName();
-					if (nodes.item(nodeIndex).getLocalName().equals("Party")) {
+				if (currentItemNode.getLocalName() != null) {
+					String debcurrentChild = currentItemNode.getLocalName();
+					if (debcurrentChild.equals("Party")) {

-						NodeList party = nodes.item(nodeIndex).getChildNodes();
+						NodeList party = currentItemNode.getChildNodes();
 						for (int partyIndex = 0; partyIndex < party.getLength(); partyIndex++) {
 							if (party.item(partyIndex).getLocalName() != null) {
 								String debCN = party.item(partyIndex).getLocalName();
-								if (party.item(partyIndex).getLocalName().equals("PartyName")) {
+								if (debCN.equals("PartyName")) {

 									NodeList partyName = party.item(partyIndex).getChildNodes();
 									for (int partyNameIndex = 0; partyNameIndex < partyName.getLength(); partyNameIndex++) {
@@ -87,7 +87,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 										}
 									}
 								}
-								if (party.item(partyIndex).getLocalName().equals("PostalAddress")) {
+								if (debCN.equals("PostalAddress")) {

 									NodeList postal = party.item(partyIndex).getChildNodes();
 									for (int postalChildIndex = 0; postalChildIndex < postal.getLength(); postalChildIndex++) {
@@ -145,7 +145,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 									}
 								}

-								if (party.item(partyIndex).getLocalName().equals("Contact")) {
+								if (debCN.equals("Contact")) {
 									NodeList contact = party.item(partyIndex).getChildNodes();
 									setContact(new Contact(contact));

@@ -156,19 +156,19 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {

 					}

-					if (nodes.item(nodeIndex).getLocalName().equals("GlobalID")) {
+					if (debcurrentChild.equals("GlobalID")) {
 						if (nodes.item(nodeIndex).getAttributes().getNamedItem("schemeID") != null) {
 							SchemedID gid = new SchemedID().setScheme(nodes.item(nodeIndex).getAttributes().getNamedItem("schemeID").getNodeValue()).setId(nodes.item(nodeIndex).getTextContent());
 							addGlobalID(gid);
 						}

 					}
-					if (nodes.item(nodeIndex).getLocalName().equals("DefinedTradeContact")) {
+					if (debcurrentChild.equals("DefinedTradeContact")) {
 						NodeList contact = nodes.item(nodeIndex).getChildNodes();
 						setContact(new Contact(contact));
 					}

-					if (nodes.item(nodeIndex).getLocalName().equals("PostalTradeAddress")) {
+					if (debcurrentChild.equals("PostalTradeAddress")) {
 						NodeList postal = nodes.item(nodeIndex).getChildNodes();
 						for (int postalChildIndex = 0; postalChildIndex < postal.getLength(); postalChildIndex++) {
 							if (postal.item(postalChildIndex).getLocalName() != null) {
@@ -196,7 +196,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {

 					}

-					if (nodes.item(nodeIndex).getLocalName().equals("SpecifiedTaxRegistration")) {
+					if (debcurrentChild.equals("SpecifiedTaxRegistration")) {
 						NodeList taxChilds = nodes.item(nodeIndex).getChildNodes();
 						for (int taxChildIndex = 0; taxChildIndex < taxChilds.getLength(); taxChildIndex++) {
 							if (taxChilds.item(taxChildIndex).getLocalName() != null) {
@@ -290,7 +290,7 @@ public class TradeParty implements IZUGFeRDExportableTradeParty {
 			for (int nodeIndex = 0; nodeIndex < nodes.getLength(); nodeIndex++) {
 				//nodes.item(i).getTextContent())) {
 				String debLN = nodes.item(nodeIndex).getLocalName();
-				if (nodes.item(nodeIndex).getLocalName().equals("Party")) {
+				if (debLN.equals("Party")) {
 					// take one step back and parse from top
 					parseFromUBL(nodes);
 					return;
--- a/library/src/main/java/org/mustangproject/XMLTools.java
+++ b/library/src/main/java/org/mustangproject/XMLTools.java
@@ -1,7 +1,5 @@
 package org.mustangproject;

-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -11,6 +9,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.RandomAccess;

+import org.apache.commons.io.IOUtils;
 import org.dom4j.io.XMLWriter;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -40,11 +39,13 @@ public class XMLTools extends XMLWriter {
 			list = l;
 		}

-		public Node get(int index) {
+		@Override
+    public Node get(int index) {
 			return list.item(index);
 		}

-		public int size() {
+		@Override
+    public int size() {
 			return list.getLength();
 		}
 	}
@@ -127,6 +128,7 @@ public class XMLTools extends XMLWriter {
 	 */
 	public static byte[] removeBOM(byte[] zugferdRaw) {
 		final byte[] zugferdData;
+		// This handles the UTF-8 BOM 
 		if ((zugferdRaw[0] == (byte) 0xEF) && (zugferdRaw[1] == (byte) 0xBB) && (zugferdRaw[2] == (byte) 0xBF)) {
 			// I don't like BOMs, lets remove it
 			zugferdData = new byte[zugferdRaw.length - 3];
@@ -138,20 +140,7 @@ public class XMLTools extends XMLWriter {
 	}

 	public static byte[] getBytesFromStream(InputStream fileinput) throws IOException {
-
-		// we're on java 8 so we cant use inputstream.readallbytes
-		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-		int nRead;
-		byte[] data = new byte[16384];
-		BufferedInputStream bufferedInput=new BufferedInputStream(fileinput);
-
-		while ((nRead = bufferedInput.read(data, 0, data.length)) != -1) {
-			buffer.write(data, 0, nRead);
-		}
-		return buffer.toByteArray();
-
-		// end of polyfill
+	  return IOUtils.toByteArray (fileinput);
 	}

 }
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/DAPullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/DAPullProvider.java
@@ -33,7 +33,7 @@ import org.mustangproject.FileAttachment;
 import org.mustangproject.Invoice;
 import org.mustangproject.XMLTools;

-public class DAPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider {
+public class DAPullProvider extends ZUGFeRD2PullProvider {

 	protected IExportableTransaction trans;
 	private String paymentTermsDescription;
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/DXExporterFromA1.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/DXExporterFromA1.java
@@ -29,10 +29,11 @@ import org.apache.pdfbox.preflight.parser.PreflightParser;

 import jakarta.activation.DataSource;

-public class DXExporterFromA1 extends DXExporterFromA3 implements IZUGFeRDExporter {
+public class DXExporterFromA1 extends DXExporterFromA3 {
 	protected boolean ignorePDFAErrors = false;

-	public DXExporterFromA1 ignorePDFAErrors() {
+	@Override
+  public DXExporterFromA1 ignorePDFAErrors() {
 		this.ignorePDFAErrors = true;
 		return this;
 	}
@@ -45,7 +46,8 @@ public class DXExporterFromA1 extends DXExporterFromA3 implements IZUGFeRDExport
 	 * @param ver the delivery-x version
 	 * @return the URN of the namespace
 	 */
-	public String getNamespaceForVersion(int ver) {
+	@Override
+  public String getNamespaceForVersion(int ver) {
 		// As of late 2022 the Delivery-X standard is not yet published. See specification:
 		// Die digitale Ablösung des Papier-Lieferscheins, Version 1.1, April 2022
 		// Chapter 7.1 XMP-Erweiterungsschema für PDF/A-3
@@ -57,7 +59,8 @@ public class DXExporterFromA1 extends DXExporterFromA3 implements IZUGFeRDExport
 	 * @param ver the ox version
 	 * @return the namespace prefix as string, without colon
 	 */
-	public String getPrefixForVersion(int ver) {
+	@Override
+  public String getPrefixForVersion(int ver) {
 		return "fx";
 	}

@@ -91,14 +94,17 @@ public class DXExporterFromA1 extends DXExporterFromA3 implements IZUGFeRDExport
 	}


-	public DXExporterFromA1 setProfile(Profile p) {
+	@Override
+  public DXExporterFromA1 setProfile(Profile p) {
 		return (DXExporterFromA1)super.setProfile(p);
 	}
-	public DXExporterFromA1 setProfile(String profileName) {
+	@Override
+  public DXExporterFromA1 setProfile(String profileName) {
 		return (DXExporterFromA1)super.setProfile(profileName);
 	}

-	public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
+	@Override
+  public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
 		if (!ignorePDFAErrors && !isValidA1(dataSource)) {
 			throw new IOException("File is not a valid PDF/A input file");
 		}
@@ -110,32 +116,41 @@ public class DXExporterFromA1 extends DXExporterFromA3 implements IZUGFeRDExport

 	}

-	public DXExporterFromA1 load(String pdfFilename) throws IOException {
+	@Override
+  public DXExporterFromA1 load(String pdfFilename) throws IOException {
 		return (DXExporterFromA1) super.load(pdfFilename);
 	}
-	public DXExporterFromA1 load(byte[] pdfBinary) throws IOException {
+	@Override
+  public DXExporterFromA1 load(byte[] pdfBinary) throws IOException {
 		return (DXExporterFromA1) super.load(pdfBinary);
 	}
-	public DXExporterFromA1 load(InputStream pdfSource) throws IOException{
+	@Override
+  public DXExporterFromA1 load(InputStream pdfSource) throws IOException{
 		return (DXExporterFromA1) super.load(pdfSource);
 	}
-	public DXExporterFromA1 setCreator(String creator) {
+	@Override
+  public DXExporterFromA1 setCreator(String creator) {
 		return (DXExporterFromA1) super.setCreator(creator);
 	}
-	public DXExporterFromA1 setConformanceLevel(PDFAConformanceLevel newLevel) {
+	@Override
+  public DXExporterFromA1 setConformanceLevel(PDFAConformanceLevel newLevel) {
 		return (DXExporterFromA1) super.setConformanceLevel(newLevel);
 	}
-	public DXExporterFromA1 setProducer(String producer){
+	@Override
+  public DXExporterFromA1 setProducer(String producer){
 		return (DXExporterFromA1) super.setProducer(producer);
 	}
-	public DXExporterFromA1 setZUGFeRDVersion(int version){
+	@Override
+  public DXExporterFromA1 setZUGFeRDVersion(int version){
 		return (DXExporterFromA1) super.setZUGFeRDVersion(version);
 	}
-	public DXExporterFromA1 setXML(byte[] zugferdData) throws IOException{
+	@Override
+  public DXExporterFromA1 setXML(byte[] zugferdData) throws IOException{
 		return (DXExporterFromA1) super.setXML(zugferdData);
 	}

-	public DXExporterFromA1 disableAutoClose(boolean disableAutoClose){
+	@Override
+  public DXExporterFromA1 disableAutoClose(boolean disableAutoClose){
 		return (DXExporterFromA1) super.disableAutoClose(disableAutoClose);
 	}
 	public DXExporterFromA1 convertOnly() {
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/DXExporterFromA3.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/DXExporterFromA3.java
@@ -71,7 +71,7 @@ import jakarta.activation.FileDataSource;
 public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {

 	protected PDFAConformanceLevel conformanceLevel = PDFAConformanceLevel.UNICODE;
-	protected ArrayList<FileAttachment> fileAttachments = new ArrayList<FileAttachment>();
+	protected ArrayList<FileAttachment> fileAttachments = new ArrayList<>();

 	/**
 	 * This flag controls whether or not the metadata is overwritten, or kind of merged.
@@ -127,7 +127,7 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	protected String despatchAdviceDocumentType = "DESPATCHADVICE";


-	private HashMap<String, byte[]> additionalXMLs = new HashMap<String, byte[]>();
+	private HashMap<String, byte[]> additionalXMLs = new HashMap<>();


 	private boolean attachZUGFeRDHeaders = true;
@@ -138,7 +138,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param pdfFilename filename of an PDF/A1 compliant document
 	 */
-	public DXExporterFromA3 load(String pdfFilename) throws IOException {
+	@Override
+  public DXExporterFromA3 load(String pdfFilename) throws IOException {

 		ensurePDFIsValid(new FileDataSource(pdfFilename));
 		try (FileInputStream pdf = new FileInputStream(pdfFilename)) {
@@ -146,11 +147,13 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		}
 	}

-	public IXMLProvider getProvider() {
+	@Override
+  public IXMLProvider getProvider() {
 		return xmlProvider;
 	}

-	public DXExporterFromA3 setProfile(Profile p) {
+	@Override
+  public DXExporterFromA3 setProfile(Profile p) {
 		this.profile = p;
 		if (xmlProvider != null) {
 			xmlProvider.setProfile(p);
@@ -158,7 +161,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return this;
 	}

-	public DXExporterFromA3 setProfile(String profilename) {
+	@Override
+  public DXExporterFromA3 setProfile(String profilename) {
 		this.profile = Profiles.getByName(profilename);

 		if (xmlProvider != null) {
@@ -167,7 +171,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return this;
 	}

-	public DXExporterFromA3 addAdditionalFile(String name, byte[] content) {
+	@Override
+  public DXExporterFromA3 addAdditionalFile(String name, byte[] content) {
 		fileAttachments.add(new FileAttachment(name, "text/xml", "Supplement", content).setDescription("ZUGFeRD extension/additional data"));
 		return this;
 	}
@@ -180,7 +185,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param pdfBinary binary of a PDF/A1 compliant document
 	 */
-	public DXExporterFromA3 load(byte[] pdfBinary) throws IOException {
+	@Override
+  public DXExporterFromA3 load(byte[] pdfBinary) throws IOException {
 		ensurePDFIsValid(new ByteArrayDataSource(new ByteArrayInputStream(pdfBinary)));
 		doc = Loader.loadPDF(pdfBinary);
 		return this;
@@ -190,11 +196,13 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		super();
 	}

-	public void attachFile(FileAttachment file) {
+	@Override
+  public void attachFile(FileAttachment file) {
 		fileAttachments.add(file);
 	}

-	public void attachFile(String filename, byte[] data, String mimetype, String relation) {
+	@Override
+  public void attachFile(String filename, byte[] data, String mimetype, String relation) {
 		FileAttachment fa = new FileAttachment(filename, mimetype, relation, data);
 		fileAttachments.add(fa);
 	}
@@ -204,7 +212,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param ZUGFeRDfilename the pdf file name
 	 * @throws IOException if anything is wrong in the target location
 	 */
-	public void export(String ZUGFeRDfilename) throws IOException {
+	@Override
+  public void export(String ZUGFeRDfilename) throws IOException {
 		if (!documentPrepared) {
 			prepareDocument();
 		}
@@ -231,7 +240,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param output the OutputStream
 	 * @throws IOException if anything is wrong in the OutputStream
 	 */
-	public void export(OutputStream output) throws IOException {
+	@Override
+  public void export(OutputStream output) throws IOException {
 		if (!documentPrepared) {
 			prepareDocument();
 		}
@@ -257,7 +267,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param data         the binary data of the file/attachment
 	 * @throws IOException if anything is wrong with filename
 	 */
-	public void PDFAttachGenericFile(String filename, String relationship, String description,
+	@Override
+  public void PDFAttachGenericFile(String filename, String relationship, String description,
 									 String subType, byte[] data) throws IOException {
 		PDFAttachGenericFile(this.doc, filename, relationship, description, subType, data);
 	}
@@ -274,7 +285,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param data         the binary data of the file/attachment
 	 * @throws IOException if anything is wrong with filename
 	 */
-	public void PDFAttachGenericFile(PDDocument doc, String filename, String relationship, String description,
+	@Override
+  public void PDFAttachGenericFile(PDDocument doc, String filename, String relationship, String description,
 									 String subType, byte[] data) throws IOException {
 		fileAttached = true;

@@ -293,7 +305,7 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		ef.setSize(data.length);
 		ef.setCreationDate(new GregorianCalendar());

-		ef.setModDate(GregorianCalendar.getInstance());
+		ef.setModDate(Calendar.getInstance());

 		fs.setEmbeddedFile(ef);

@@ -325,7 +337,7 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		doc.getDocumentCatalog().setNames(names);

 		// AF entry (Array) in catalog with the FileSpec
-		COSBase AFEntry = (COSBase) doc.getDocumentCatalog().getCOSObject().getItem("AF");
+		COSBase AFEntry = doc.getDocumentCatalog().getCOSObject().getItem("AF");
 		if ((AFEntry == null)) {
 			COSArray cosArray = new COSArray();
 			cosArray.add(fs);
@@ -351,7 +363,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param zugferdData XML data to be set as a byte array (XML file in raw form).
 	 * @throws IOException (should not happen)
 	 */
-	public DXExporterFromA3 setXML(byte[] zugferdData) throws IOException {
+	@Override
+  public DXExporterFromA3 setXML(byte[] zugferdData) throws IOException {
 		CustomXMLProvider cus = new CustomXMLProvider();
 		// As of late 2022 the Delivery-X standard is not yet published. See specification:
 		// Die digitale Ablösung des Papier-Lieferscheins, Version 1.1, April 2022
@@ -372,11 +385,13 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param pdfSource source to read a PDF/A1 compliant document from
 	 */
-	public DXExporterFromA3 load(InputStream pdfSource) throws IOException {
+	@Override
+  public DXExporterFromA3 load(InputStream pdfSource) throws IOException {
 		return load(readAllBytes(pdfSource));
 	}

-	public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
+	@Override
+  public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
 		return true;
 	}

@@ -399,23 +414,27 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * <p>
 	 * Feel free to pass "A" as new level if you know what you are doing :-)
 	 */
-	public DXExporterFromA3 setConformanceLevel(PDFAConformanceLevel newLevel) {
+	@Override
+  public DXExporterFromA3 setConformanceLevel(PDFAConformanceLevel newLevel) {
 		conformanceLevel = newLevel;
 		return this;
 	}


-	public DXExporterFromA3 setCreator(String creator) {
+	@Override
+  public DXExporterFromA3 setCreator(String creator) {
 		this.creator = creator;
 		return this;
 	}

-	public DXExporterFromA3 setCreatorTool(String creatorTool) {
+	@Override
+  public DXExporterFromA3 setCreatorTool(String creatorTool) {
 		this.creatorTool = creatorTool;
 		return this;
 	}

-	public DXExporterFromA3 setProducer(String producer) {
+	@Override
+  public DXExporterFromA3 setProducer(String producer) {
 		this.producer = producer;
 		return this;
 	}
@@ -434,7 +453,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return this;
 	}

-	protected DXExporterFromA3 setAttachZUGFeRDHeaders(boolean attachHeaders) {
+	@Override
+  protected DXExporterFromA3 setAttachZUGFeRDHeaders(boolean attachHeaders) {
 		this.attachZUGFeRDHeaders = attachHeaders;
 		return this;
 	}
@@ -447,7 +467,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param metadata the PDFbox XMPMetadata object
 	 */
-	protected void addXMP(XMPMetadata metadata) {
+	@Override
+  protected void addXMP(XMPMetadata metadata) {

 		if (attachZUGFeRDHeaders) {
 			// As of late 2022 the Delivery-X standard is not yet published. See specification:
@@ -478,12 +499,14 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *              <code>setZUGFeRDXMLData(byte[] zugferdData)</code>
 	 * @throws IOException if anything is wrong with already loaded PDF
 	 */
-	public IExporter setTransaction(IExportableTransaction trans) throws IOException {
+	@Override
+  public IExporter setTransaction(IExportableTransaction trans) throws IOException {
 		this.trans = trans;
 		return prepare();
 	}

-	public IExporter prepare() throws IOException {
+	@Override
+  public IExporter prepare() throws IOException {
 		prepareDocument();
 		xmlProvider.generateXML(trans);
 		String filename = "cida.xml";
@@ -502,7 +525,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * Reads the XMPMetadata from the PDDocument, if it exists.
 	 * Otherwise creates XMPMetadata.
 	 */
-	protected XMPMetadata getXmpMetadata() throws IOException {
+	@Override
+  protected XMPMetadata getXmpMetadata() throws IOException {
 		PDMetadata meta = doc.getDocumentCatalog().getMetadata();
 		if ((meta != null) && (meta.getLength() > 0)) {
 			try {
@@ -515,7 +539,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return XMPMetadata.createXMPMetadata();
 	}

-	protected byte[] serializeXmpMetadata(XMPMetadata xmpMetadata) throws TransformerException {
+	@Override
+  protected byte[] serializeXmpMetadata(XMPMetadata xmpMetadata) throws TransformerException {
 		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 		new XmpSerializer().serialize(xmpMetadata, buffer, true); // see https://github.com/ZUGFeRD/mustangproject/issues/44
 		return buffer.toByteArray();
@@ -525,7 +550,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * Sets the producer if the overwrite flag is set or the producer is not already set.
 	 * Sets the PDFVersion to 1.4 if the field is empty.
 	 */
-	protected void writeAdobePDFSchema(XMPMetadata xmp) {
+	@Override
+  protected void writeAdobePDFSchema(XMPMetadata xmp) {
 		AdobePDFSchema pdf = getAdobePDFSchema(xmp);
 		if (overwrite || isEmpty(pdf.getProducer()))
 			pdf.setProducer(producer);
@@ -535,7 +561,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * Returns the AdobePDFSchema from the XMPMetadata if it exists.
 	 * If the overwrite flag is set or no AdobePDFSchema exists in the XMPMetadata, it is created, added and returned.
 	 */
-	protected AdobePDFSchema getAdobePDFSchema(XMPMetadata xmp) {
+	@Override
+  protected AdobePDFSchema getAdobePDFSchema(XMPMetadata xmp) {
 		AdobePDFSchema pdf = xmp.getAdobePDFSchema();
 		if (pdf != null)
 			if (overwrite)
@@ -545,7 +572,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddAdobePDFSchema();
 	}

-	protected void writePDFAIdentificationSchema(XMPMetadata xmp) {
+	@Override
+  protected void writePDFAIdentificationSchema(XMPMetadata xmp) {
 		PDFAIdentificationSchema pdfaid = getPDFAIdentificationSchema(xmp);
 		if (overwrite || isEmpty(pdfaid.getConformance())) {
 			try {
@@ -560,7 +588,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		pdfaid.setPart(3);
 	}

-	protected PDFAIdentificationSchema getPDFAIdentificationSchema(XMPMetadata xmp) {
+	@Override
+  protected PDFAIdentificationSchema getPDFAIdentificationSchema(XMPMetadata xmp) {
 		PDFAIdentificationSchema pdfaid = xmp.getPDFAIdentificationSchema();
 		if (pdfaid != null)
 			if (overwrite)
@@ -570,7 +599,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddPDFAIdentificationSchema();
 	}

-	protected void writeDublinCoreSchema(XMPMetadata xmp) {
+	@Override
+  protected void writeDublinCoreSchema(XMPMetadata xmp) {
 		DublinCoreSchema dc = getDublinCoreSchema(xmp);
 		if (dc.getFormat() == null)
 			dc.setFormat("application/pdf");
@@ -593,7 +623,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		}
 	}

-	protected DublinCoreSchema getDublinCoreSchema(XMPMetadata xmp) {
+	@Override
+  protected DublinCoreSchema getDublinCoreSchema(XMPMetadata xmp) {
 		DublinCoreSchema dc = xmp.getDublinCoreSchema();
 		if (dc != null)
 			if (overwrite)
@@ -603,15 +634,17 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddDublinCoreSchema();
 	}

-	protected void writeXMLBasicSchema(XMPMetadata xmp) {
+	@Override
+  protected void writeXMLBasicSchema(XMPMetadata xmp) {
 		XMPBasicSchema xsb = getXmpBasicSchema(xmp);
 		if (overwrite || isEmpty(xsb.getCreatorTool()) || "UnknownApplication".equals(xsb.getCreatorTool()))
 			xsb.setCreatorTool(creatorTool);
 		if (overwrite || xsb.getCreateDate() == null)
-			xsb.setCreateDate(GregorianCalendar.getInstance());
+			xsb.setCreateDate(Calendar.getInstance());
 	}

-	protected XMPBasicSchema getXmpBasicSchema(XMPMetadata xmp) {
+	@Override
+  protected XMPBasicSchema getXmpBasicSchema(XMPMetadata xmp) {
 		XMPBasicSchema xsb = xmp.getXMPBasicSchema();
 		if (xsb != null)
 			if (overwrite)
@@ -621,7 +654,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddXMPBasicSchema();
 	}

-	protected void writeDocumentInformation() {
+	@Override
+  protected void writeDocumentInformation() {
 		String fullProducer = producer + " (via mustangproject.org " + Version.VERSION + ")";
 		PDDocumentInformation info = doc.getDocumentInformation();
 		if (overwrite || info.getCreationDate() == null)
@@ -643,7 +677,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * Adds an OutputIntent and the sRGB color profile if no OutputIntent exist
 	 */
-	protected void addSRGBOutputIntend() throws IOException {
+	@Override
+  protected void addSRGBOutputIntend() throws IOException {
 		if (!doc.getDocumentCatalog().getOutputIntents().isEmpty()) {
 			return;
 		}
@@ -666,7 +701,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * Adds a MarkInfo element to the PDF if it doesn't already exist and sets it as marked.
 	 */
-	protected void setMarked() {
+	@Override
+  protected void setMarked() {
 		PDDocumentCatalog catalog = doc.getDocumentCatalog();
 		if (catalog.getMarkInfo() == null) {
 			catalog.setMarkInfo(new PDMarkInfo(doc.getPages().getCOSObject()));
@@ -677,7 +713,8 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * Adds a StructureTreeRoot element to the PDF if it doesn't already exist.
 	 */
-	protected void addStructureTreeRoot() {
+	@Override
+  protected void addStructureTreeRoot() {
 		if (doc.getDocumentCatalog().getStructureTreeRoot() == null) {
 			doc.getDocumentCatalog().setStructureTreeRoot(new PDStructureTreeRoot());
 		}
@@ -687,19 +724,22 @@ public class DXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * @return if pdf file will be automatically closed after adding ZF
 	 */
-	public boolean isAutoCloseDisabled() {
+	@Override
+  public boolean isAutoCloseDisabled() {
 		return disableAutoClose;
 	}

 	/**
 	 * @param disableAutoClose prevent PDF file from being closed after adding ZF
 	 */
-	public DXExporterFromA3 disableAutoClose(boolean disableAutoClose) {
+	@Override
+  public DXExporterFromA3 disableAutoClose(boolean disableAutoClose) {
 		this.disableAutoClose = disableAutoClose;
 		return this;
 	}

-	protected void setXMLProvider(IXMLProvider p) {
+	@Override
+  protected void setXMLProvider(IXMLProvider p) {
 		this.xmlProvider = p;
 		if (profile != null) {
 			xmlProvider.setProfile(profile);
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java
@@ -141,6 +141,6 @@ public interface IZUGFeRDExportableItem extends IAbsoluteValueProvider{
 	 */
 	default IZUGFeRDAllowanceCharge[] getItemTotalAllowances() {
 		return null;
-	};
+	}

 }
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXExporterFromA1.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXExporterFromA1.java
@@ -29,10 +29,11 @@ import org.apache.pdfbox.preflight.parser.PreflightParser;

 import jakarta.activation.DataSource;

-public class OXExporterFromA1 extends OXExporterFromA3 implements IZUGFeRDExporter {
+public class OXExporterFromA1 extends OXExporterFromA3 {
 	protected boolean ignorePDFAErrors = false;

-	public OXExporterFromA1 ignorePDFAErrors() {
+	@Override
+  public OXExporterFromA1 ignorePDFAErrors() {
 		this.ignorePDFAErrors = true;
 		return this;
 	}
@@ -45,7 +46,8 @@ public class OXExporterFromA1 extends OXExporterFromA3 implements IZUGFeRDExport
 	 * @param ver the order-x version
 	 * @return the URN of the namespace
 	 */
-	public String getNamespaceForVersion(int ver) {
+	@Override
+  public String getNamespaceForVersion(int ver) {
 		return "urn:factur-x:pdfa:CrossIndustryDocument:1p0#";
 	}
 	/***
@@ -53,7 +55,8 @@ public class OXExporterFromA1 extends OXExporterFromA3 implements IZUGFeRDExport
 	 * @param ver the ox version
 	 * @return the namespace prefix as string, without colon
 	 */
-	public String getPrefixForVersion(int ver) {
+	@Override
+  public String getPrefixForVersion(int ver) {
 		return "fx";
 	}

@@ -87,14 +90,17 @@ public class OXExporterFromA1 extends OXExporterFromA3 implements IZUGFeRDExport
 	}


-	public OXExporterFromA1 setProfile(Profile p) {
+	@Override
+  public OXExporterFromA1 setProfile(Profile p) {
 		return (OXExporterFromA1)super.setProfile(p);
 	}
-	public OXExporterFromA1 setProfile(String profileName) {
+	@Override
+  public OXExporterFromA1 setProfile(String profileName) {
 		return (OXExporterFromA1)super.setProfile(profileName);
 	}

-	public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
+	@Override
+  public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
 		if (!ignorePDFAErrors && !isValidA1(dataSource)) {
 			throw new IOException("File is not a valid PDF/A input file");
 		}
@@ -106,32 +112,41 @@ public class OXExporterFromA1 extends OXExporterFromA3 implements IZUGFeRDExport

 	}

-	public OXExporterFromA1 load(String pdfFilename) throws IOException {
+	@Override
+  public OXExporterFromA1 load(String pdfFilename) throws IOException {
 		return (OXExporterFromA1) super.load(pdfFilename);
 	}
-	public OXExporterFromA1 load(byte[] pdfBinary) throws IOException {
+	@Override
+  public OXExporterFromA1 load(byte[] pdfBinary) throws IOException {
 		return (OXExporterFromA1) super.load(pdfBinary);
 	}
-	public OXExporterFromA1 load(InputStream pdfSource) throws IOException{
+	@Override
+  public OXExporterFromA1 load(InputStream pdfSource) throws IOException{
 		return (OXExporterFromA1) super.load(pdfSource);
 	}
-	public OXExporterFromA1 setCreator(String creator) {
+	@Override
+  public OXExporterFromA1 setCreator(String creator) {
 		return (OXExporterFromA1) super.setCreator(creator);
 	}
-	public OXExporterFromA1 setConformanceLevel(PDFAConformanceLevel newLevel) {
+	@Override
+  public OXExporterFromA1 setConformanceLevel(PDFAConformanceLevel newLevel) {
 		return (OXExporterFromA1) super.setConformanceLevel(newLevel);
 	}
-	public OXExporterFromA1 setProducer(String producer){
+	@Override
+  public OXExporterFromA1 setProducer(String producer){
 		return (OXExporterFromA1) super.setProducer(producer);
 	}
-	public OXExporterFromA1 setZUGFeRDVersion(int version){
+	@Override
+  public OXExporterFromA1 setZUGFeRDVersion(int version){
 		return (OXExporterFromA1) super.setZUGFeRDVersion(version);
 	}
-	public OXExporterFromA1 setXML(byte[] zugferdData) throws IOException{
+	@Override
+  public OXExporterFromA1 setXML(byte[] zugferdData) throws IOException{
 		return (OXExporterFromA1) super.setXML(zugferdData);
 	}

-	public OXExporterFromA1 disableAutoClose(boolean disableAutoClose){
+	@Override
+  public OXExporterFromA1 disableAutoClose(boolean disableAutoClose){
 		return (OXExporterFromA1) super.disableAutoClose(disableAutoClose);
 	}
 	public OXExporterFromA1 convertOnly() {
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXExporterFromA3.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXExporterFromA3.java
@@ -71,7 +71,7 @@ import jakarta.activation.FileDataSource;
 public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {

 	protected PDFAConformanceLevel conformanceLevel = PDFAConformanceLevel.UNICODE;
-	protected ArrayList<FileAttachment> fileAttachments = new ArrayList<FileAttachment>();
+	protected ArrayList<FileAttachment> fileAttachments = new ArrayList<>();

 	/**
 	 * This flag controls whether or not the metadata is overwritten, or kind of merged.
@@ -127,7 +127,7 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	protected String orderXDocumentType = "ORDER";


-	private HashMap<String, byte[]> additionalXMLs = new HashMap<String, byte[]>();
+	private HashMap<String, byte[]> additionalXMLs = new HashMap<>();


 	private boolean attachZUGFeRDHeaders = true;
@@ -138,7 +138,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param pdfFilename filename of an PDF/A1 compliant document
 	 */
-	public OXExporterFromA3 load(String pdfFilename) throws IOException {
+	@Override
+  public OXExporterFromA3 load(String pdfFilename) throws IOException {

 		ensurePDFIsValid(new FileDataSource(pdfFilename));
 		try (FileInputStream pdf = new FileInputStream(pdfFilename)) {
@@ -146,11 +147,13 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		}
 	}

-	public IXMLProvider getProvider() {
+	@Override
+  public IXMLProvider getProvider() {
 		return xmlProvider;
 	}

-	public OXExporterFromA3 setProfile(Profile p) {
+	@Override
+  public OXExporterFromA3 setProfile(Profile p) {
 		this.profile = p;
 		if (xmlProvider != null) {
 			xmlProvider.setProfile(p);
@@ -158,7 +161,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return this;
 	}

-	public OXExporterFromA3 setProfile(String profilename) {
+	@Override
+  public OXExporterFromA3 setProfile(String profilename) {
 		this.profile = Profiles.getByName(profilename);

 		if (xmlProvider != null) {
@@ -167,7 +171,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return this;
 	}

-	public OXExporterFromA3 addAdditionalFile(String name, byte[] content) {
+	@Override
+  public OXExporterFromA3 addAdditionalFile(String name, byte[] content) {
 		fileAttachments.add(new FileAttachment(name, "text/xml", "Supplement", content).setDescription("ZUGFeRD extension/additional data"));
 		return this;
 	}
@@ -180,7 +185,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param pdfBinary binary of a PDF/A1 compliant document
 	 */
-	public OXExporterFromA3 load(byte[] pdfBinary) throws IOException {
+	@Override
+  public OXExporterFromA3 load(byte[] pdfBinary) throws IOException {
 		ensurePDFIsValid(new ByteArrayDataSource(new ByteArrayInputStream(pdfBinary)));
 		doc = Loader.loadPDF(pdfBinary);
 		return this;
@@ -190,11 +196,13 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		super();
 	}

-	public void attachFile(FileAttachment file) {
+	@Override
+  public void attachFile(FileAttachment file) {
 		fileAttachments.add(file);
 	}

-	public void attachFile(String filename, byte[] data, String mimetype, String relation) {
+	@Override
+  public void attachFile(String filename, byte[] data, String mimetype, String relation) {
 		FileAttachment fa = new FileAttachment(filename, mimetype, relation, data);
 		fileAttachments.add(fa);
 	}
@@ -204,7 +212,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param ZUGFeRDfilename the pdf file name
 	 * @throws IOException if anything is wrong in the target location
 	 */
-	public void export(String ZUGFeRDfilename) throws IOException {
+	@Override
+  public void export(String ZUGFeRDfilename) throws IOException {
 		if (!documentPrepared) {
 			prepareDocument();
 		}
@@ -231,7 +240,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param output the OutputStream
 	 * @throws IOException if anything is wrong in the OutputStream
 	 */
-	public void export(OutputStream output) throws IOException {
+	@Override
+  public void export(OutputStream output) throws IOException {
 		if (!documentPrepared) {
 			prepareDocument();
 		}
@@ -257,7 +267,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param data         the binary data of the file/attachment
 	 * @throws java.io.IOException if anything is wrong with filename
 	 */
-	public void PDFAttachGenericFile(String filename, String relationship, String description,
+	@Override
+  public void PDFAttachGenericFile(String filename, String relationship, String description,
 									 String subType, byte[] data) throws IOException {
 		PDFAttachGenericFile(this.doc, filename, relationship, description, subType, data);
 	}
@@ -274,7 +285,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param data         the binary data of the file/attachment
 	 * @throws IOException if anything is wrong with filename
 	 */
-	public void PDFAttachGenericFile(PDDocument doc, String filename, String relationship, String description,
+	@Override
+  public void PDFAttachGenericFile(PDDocument doc, String filename, String relationship, String description,
 									 String subType, byte[] data) throws IOException {
 		fileAttached = true;

@@ -293,7 +305,7 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		ef.setSize(data.length);
 		ef.setCreationDate(new GregorianCalendar());

-		ef.setModDate(GregorianCalendar.getInstance());
+		ef.setModDate(Calendar.getInstance());

 		fs.setEmbeddedFile(ef);

@@ -325,7 +337,7 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		doc.getDocumentCatalog().setNames(names);

 		// AF entry (Array) in catalog with the FileSpec
-		COSBase AFEntry = (COSBase) doc.getDocumentCatalog().getCOSObject().getItem("AF");
+		COSBase AFEntry = doc.getDocumentCatalog().getCOSObject().getItem("AF");
 		if ((AFEntry == null)) {
 			COSArray cosArray = new COSArray();
 			cosArray.add(fs);
@@ -351,7 +363,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * @param zugferdData XML data to be set as a byte array (XML file in raw form).
 	 * @throws IOException (should not happen)
 	 */
-	public OXExporterFromA3 setXML(byte[] zugferdData) throws IOException {
+	@Override
+  public OXExporterFromA3 setXML(byte[] zugferdData) throws IOException {
 		CustomXMLProvider cus = new CustomXMLProvider();
 		cus.setXML(zugferdData);
 		this.setXMLProvider(cus);
@@ -366,11 +379,13 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param pdfSource source to read a PDF/A1 compliant document from
 	 */
-	public OXExporterFromA3 load(InputStream pdfSource) throws IOException {
+	@Override
+  public OXExporterFromA3 load(InputStream pdfSource) throws IOException {
 		return load(readAllBytes(pdfSource));
 	}

-	public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
+	@Override
+  public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
 		return true;
 	}

@@ -393,23 +408,27 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * <p>
 	 * Feel free to pass "A" as new level if you know what you are doing :-)
 	 */
-	public OXExporterFromA3 setConformanceLevel(PDFAConformanceLevel newLevel) {
+	@Override
+  public OXExporterFromA3 setConformanceLevel(PDFAConformanceLevel newLevel) {
 		conformanceLevel = newLevel;
 		return this;
 	}


-	public OXExporterFromA3 setCreator(String creator) {
+	@Override
+  public OXExporterFromA3 setCreator(String creator) {
 		this.creator = creator;
 		return this;
 	}

-	public OXExporterFromA3 setCreatorTool(String creatorTool) {
+	@Override
+  public OXExporterFromA3 setCreatorTool(String creatorTool) {
 		this.creatorTool = creatorTool;
 		return this;
 	}

-	public OXExporterFromA3 setProducer(String producer) {
+	@Override
+  public OXExporterFromA3 setProducer(String producer) {
 		this.producer = producer;
 		return this;
 	}
@@ -428,7 +447,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return this;
 	}

-	protected OXExporterFromA3 setAttachZUGFeRDHeaders(boolean attachHeaders) {
+	@Override
+  protected OXExporterFromA3 setAttachZUGFeRDHeaders(boolean attachHeaders) {
 		this.attachZUGFeRDHeaders = attachHeaders;
 		return this;
 	}
@@ -441,7 +461,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *
 	 * @param metadata the PDFbox XMPMetadata object
 	 */
-	protected void addXMP(XMPMetadata metadata) {
+	@Override
+  protected void addXMP(XMPMetadata metadata) {

 		if (attachZUGFeRDHeaders) {
 			XMPSchemaZugferd zf = new XMPSchemaZugferd(metadata, 1, true, xmlProvider.getProfile(),
@@ -468,12 +489,14 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 *              <code>setZUGFeRDXMLData(byte[] zugferdData)</code>
 	 * @throws IOException if anything is wrong with already loaded PDF
 	 */
-	public IExporter setTransaction(IExportableTransaction trans) throws IOException {
+	@Override
+  public IExporter setTransaction(IExportableTransaction trans) throws IOException {
 		this.trans = trans;
 		return prepare();
 	}

-	public IExporter prepare() throws IOException {
+	@Override
+  public IExporter prepare() throws IOException {
 		prepareDocument();
 		xmlProvider.generateXML(trans);
 		String filename = "order-x.xml";
@@ -492,7 +515,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * Reads the XMPMetadata from the PDDocument, if it exists.
 	 * Otherwise creates XMPMetadata.
 	 */
-	protected XMPMetadata getXmpMetadata() throws IOException {
+	@Override
+  protected XMPMetadata getXmpMetadata() throws IOException {
 		PDMetadata meta = doc.getDocumentCatalog().getMetadata();
 		if ((meta != null) && (meta.getLength() > 0)) {
 			try {
@@ -505,7 +529,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return XMPMetadata.createXMPMetadata();
 	}

-	protected byte[] serializeXmpMetadata(XMPMetadata xmpMetadata) throws TransformerException {
+	@Override
+  protected byte[] serializeXmpMetadata(XMPMetadata xmpMetadata) throws TransformerException {
 		ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 		new XmpSerializer().serialize(xmpMetadata, buffer, true); // see https://github.com/ZUGFeRD/mustangproject/issues/44
 		return buffer.toByteArray();
@@ -515,7 +540,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * Sets the producer if the overwrite flag is set or the producer is not already set.
 	 * Sets the PDFVersion to 1.4 if the field is empty.
 	 */
-	protected void writeAdobePDFSchema(XMPMetadata xmp) {
+	@Override
+  protected void writeAdobePDFSchema(XMPMetadata xmp) {
 		AdobePDFSchema pdf = getAdobePDFSchema(xmp);
 		if (overwrite || isEmpty(pdf.getProducer()))
 			pdf.setProducer(producer);
@@ -525,7 +551,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	 * Returns the AdobePDFSchema from the XMPMetadata if it exists.
 	 * If the overwrite flag is set or no AdobePDFSchema exists in the XMPMetadata, it is created, added and returned.
 	 */
-	protected AdobePDFSchema getAdobePDFSchema(XMPMetadata xmp) {
+	@Override
+  protected AdobePDFSchema getAdobePDFSchema(XMPMetadata xmp) {
 		AdobePDFSchema pdf = xmp.getAdobePDFSchema();
 		if (pdf != null)
 			if (overwrite)
@@ -535,7 +562,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddAdobePDFSchema();
 	}

-	protected void writePDFAIdentificationSchema(XMPMetadata xmp) {
+	@Override
+  protected void writePDFAIdentificationSchema(XMPMetadata xmp) {
 		PDFAIdentificationSchema pdfaid = getPDFAIdentificationSchema(xmp);
 		if (overwrite || isEmpty(pdfaid.getConformance())) {
 			try {
@@ -550,7 +578,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		pdfaid.setPart(3);
 	}

-	protected PDFAIdentificationSchema getPDFAIdentificationSchema(XMPMetadata xmp) {
+	@Override
+  protected PDFAIdentificationSchema getPDFAIdentificationSchema(XMPMetadata xmp) {
 		PDFAIdentificationSchema pdfaid = xmp.getPDFAIdentificationSchema();
 		if (pdfaid != null)
 			if (overwrite)
@@ -560,7 +589,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddPDFAIdentificationSchema();
 	}

-	protected void writeDublinCoreSchema(XMPMetadata xmp) {
+	@Override
+  protected void writeDublinCoreSchema(XMPMetadata xmp) {
 		DublinCoreSchema dc = getDublinCoreSchema(xmp);
 		if (dc.getFormat() == null)
 			dc.setFormat("application/pdf");
@@ -583,7 +613,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		}
 	}

-	protected DublinCoreSchema getDublinCoreSchema(XMPMetadata xmp) {
+	@Override
+  protected DublinCoreSchema getDublinCoreSchema(XMPMetadata xmp) {
 		DublinCoreSchema dc = xmp.getDublinCoreSchema();
 		if (dc != null)
 			if (overwrite)
@@ -593,15 +624,17 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddDublinCoreSchema();
 	}

-	protected void writeXMLBasicSchema(XMPMetadata xmp) {
+	@Override
+  protected void writeXMLBasicSchema(XMPMetadata xmp) {
 		XMPBasicSchema xsb = getXmpBasicSchema(xmp);
 		if (overwrite || isEmpty(xsb.getCreatorTool()) || "UnknownApplication".equals(xsb.getCreatorTool()))
 			xsb.setCreatorTool(creatorTool);
 		if (overwrite || xsb.getCreateDate() == null)
-			xsb.setCreateDate(GregorianCalendar.getInstance());
+			xsb.setCreateDate(Calendar.getInstance());
 	}

-	protected XMPBasicSchema getXmpBasicSchema(XMPMetadata xmp) {
+	@Override
+  protected XMPBasicSchema getXmpBasicSchema(XMPMetadata xmp) {
 		XMPBasicSchema xsb = xmp.getXMPBasicSchema();
 		if (xsb != null)
 			if (overwrite)
@@ -611,7 +644,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 		return xmp.createAndAddXMPBasicSchema();
 	}

-	protected void writeDocumentInformation() {
+	@Override
+  protected void writeDocumentInformation() {
 		String fullProducer = producer + " (via mustangproject.org " + Version.VERSION + ")";
 		PDDocumentInformation info = doc.getDocumentInformation();
 		if (overwrite || info.getCreationDate() == null)
@@ -633,7 +667,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * Adds an OutputIntent and the sRGB color profile if no OutputIntent exist
 	 */
-	protected void addSRGBOutputIntend() throws IOException {
+	@Override
+  protected void addSRGBOutputIntend() throws IOException {
 		if (!doc.getDocumentCatalog().getOutputIntents().isEmpty()) {
 			return;
 		}
@@ -656,7 +691,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * Adds a MarkInfo element to the PDF if it doesn't already exist and sets it as marked.
 	 */
-	protected void setMarked() {
+	@Override
+  protected void setMarked() {
 		PDDocumentCatalog catalog = doc.getDocumentCatalog();
 		if (catalog.getMarkInfo() == null) {
 			catalog.setMarkInfo(new PDMarkInfo(doc.getPages().getCOSObject()));
@@ -667,7 +703,8 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * Adds a StructureTreeRoot element to the PDF if it doesn't already exist.
 	 */
-	protected void addStructureTreeRoot() {
+	@Override
+  protected void addStructureTreeRoot() {
 		if (doc.getDocumentCatalog().getStructureTreeRoot() == null) {
 			doc.getDocumentCatalog().setStructureTreeRoot(new PDStructureTreeRoot());
 		}
@@ -677,19 +714,22 @@ public class OXExporterFromA3 extends ZUGFeRDExporterFromA3 {
 	/**
 	 * @return if pdf file will be automatically closed after adding ZF
 	 */
-	public boolean isAutoCloseDisabled() {
+	@Override
+  public boolean isAutoCloseDisabled() {
 		return disableAutoClose;
 	}

 	/**
 	 * @param disableAutoClose prevent PDF file from being closed after adding ZF
 	 */
-	public OXExporterFromA3 disableAutoClose(boolean disableAutoClose) {
+	@Override
+  public OXExporterFromA3 disableAutoClose(boolean disableAutoClose) {
 		this.disableAutoClose = disableAutoClose;
 		return this;
 	}

-	protected void setXMLProvider(IXMLProvider p) {
+	@Override
+  protected void setXMLProvider(IXMLProvider p) {
 		this.xmlProvider = p;
 		if (profile != null) {
 			xmlProvider.setProfile(profile);
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/OXPullProvider.java
@@ -37,7 +37,7 @@ import org.mustangproject.EStandard;
 import org.mustangproject.FileAttachment;
 import org.mustangproject.XMLTools;

-public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider {
+public class OXPullProvider extends ZUGFeRD2PullProvider {

 	protected IExportableTransaction trans;
 	protected TransactionCalculator calc;
@@ -329,7 +329,7 @@ public class OXPullProvider extends ZUGFeRD2PullProvider implements IXMLProvider
 				}
 			}
 		}
-		if ((trans.getDocumentCode() == CORRECTEDINVOICE)/*||(trans.getDocumentCode() == DocumentCodeTypeConstants.CREDITNOTE)*/) {
+		if ((trans.getDocumentCode().equals(CORRECTEDINVOICE))/*||(trans.getDocumentCode().equals (DocumentCodeTypeConstants.CREDITNOTE))*/) {
 			hasDueDate = false;
 		}

--- a/library/src/main/java/org/mustangproject/ZUGFeRD/PDFBoxUpdateMitigation.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/PDFBoxUpdateMitigation.java
@@ -2,19 +2,13 @@ package org.mustangproject.ZUGFeRD;

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.RandomAccessFile;
-import java.util.LinkedHashMap;
-import java.util.Map;

 import org.apache.pdfbox.io.IOUtils;
-import org.apache.pdfbox.io.RandomAccessRead;
-import org.apache.pdfbox.io.RandomAccessReadBuffer;
 import org.apache.pdfbox.preflight.parser.PreflightParser;

 import jakarta.activation.DataSource;
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD1PullProvider.java
@@ -40,7 +40,7 @@ import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 import org.mustangproject.XMLTools;

-public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider implements IXMLProvider {
+public class ZUGFeRD1PullProvider extends ZUGFeRD2PullProvider {


 	//// MAIN CLASS
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA1.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA1.java
@@ -30,7 +30,7 @@ import org.mustangproject.EStandard;

 import jakarta.activation.DataSource;

-public class ZUGFeRDExporterFromA1 extends ZUGFeRDExporterFromA3 implements IZUGFeRDExporter {
+public class ZUGFeRDExporterFromA1 extends ZUGFeRDExporterFromA3 {

 	private static boolean isValidA1(DataSource dataSource) throws IOException {
 		return getPDFAParserValidationResult(PreflightParserHelper.createPreflightParser(dataSource));
@@ -66,14 +66,17 @@ public class ZUGFeRDExporterFromA1 extends ZUGFeRDExporterFromA3 implements IZUG
 	}


-	public ZUGFeRDExporterFromA1 setProfile(Profile p) {
+	@Override
+  public ZUGFeRDExporterFromA1 setProfile(Profile p) {
 		return (ZUGFeRDExporterFromA1)super.setProfile(p);
 	}
-	public ZUGFeRDExporterFromA1 setProfile(String profileName) {
+	@Override
+  public ZUGFeRDExporterFromA1 setProfile(String profileName) {
 		return (ZUGFeRDExporterFromA1)super.setProfile(profileName);
 	}

-	public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
+	@Override
+  public boolean ensurePDFIsValid(final DataSource dataSource) throws IOException {
 		if (!ignorePDFAErrors && !isValidA1(dataSource)) {
 			throw new IOException("File is not a valid PDF/A-1 input file");
 		}
@@ -81,35 +84,45 @@ public class ZUGFeRDExporterFromA1 extends ZUGFeRDExporterFromA3 implements IZUG
 	}


-	public ZUGFeRDExporterFromA1 load(String pdfFilename) throws IOException {
+	@Override
+  public ZUGFeRDExporterFromA1 load(String pdfFilename) throws IOException {
 		return (ZUGFeRDExporterFromA1) super.load(pdfFilename);
 	}
-	public ZUGFeRDExporterFromA1 load(byte[] pdfBinary) throws IOException {
+	@Override
+  public ZUGFeRDExporterFromA1 load(byte[] pdfBinary) throws IOException {
 		return (ZUGFeRDExporterFromA1) super.load(pdfBinary);
 	}
-	public ZUGFeRDExporterFromA1 load(InputStream pdfSource) throws IOException{
+	@Override
+  public ZUGFeRDExporterFromA1 load(InputStream pdfSource) throws IOException{
 		return (ZUGFeRDExporterFromA1) super.load(pdfSource);
 	}
-	public ZUGFeRDExporterFromA1 setCreator(String creator) {
+	@Override
+  public ZUGFeRDExporterFromA1 setCreator(String creator) {
 		return (ZUGFeRDExporterFromA1) super.setCreator(creator);
 	}
-	public ZUGFeRDExporterFromA1 setConformanceLevel(PDFAConformanceLevel newLevel) {
+	@Override
+  public ZUGFeRDExporterFromA1 setConformanceLevel(PDFAConformanceLevel newLevel) {
 		return (ZUGFeRDExporterFromA1) super.setConformanceLevel(newLevel);
 	}
-	public ZUGFeRDExporterFromA1 setProducer(String producer){
+	@Override
+  public ZUGFeRDExporterFromA1 setProducer(String producer){
 		return (ZUGFeRDExporterFromA1) super.setProducer(producer);
 	}
-	public ZUGFeRDExporterFromA1 setZUGFeRDVersion(EStandard est, int version){
+	@Override
+  public ZUGFeRDExporterFromA1 setZUGFeRDVersion(EStandard est, int version){
 		return (ZUGFeRDExporterFromA1) super.setZUGFeRDVersion(est, version);
 	}
-	public ZUGFeRDExporterFromA1 setZUGFeRDVersion(int version){
+	@Override
+  public ZUGFeRDExporterFromA1 setZUGFeRDVersion(int version){
 		return (ZUGFeRDExporterFromA1) super.setZUGFeRDVersion(version);
 	}
-	public ZUGFeRDExporterFromA1 setXML(byte[] zugferdData) throws IOException{
+	@Override
+  public ZUGFeRDExporterFromA1 setXML(byte[] zugferdData) throws IOException{
 		return (ZUGFeRDExporterFromA1) super.setXML(zugferdData);
 	}

-	public ZUGFeRDExporterFromA1 disableAutoClose(boolean disableAutoClose){
+	@Override
+  public ZUGFeRDExporterFromA1 disableAutoClose(boolean disableAutoClose){
 		return (ZUGFeRDExporterFromA1) super.disableAutoClose(disableAutoClose);
 	}
 	public ZUGFeRDExporterFromA1 convertOnly() {
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3.java
@@ -22,7 +22,6 @@ package org.mustangproject.ZUGFeRD;

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -76,7 +75,7 @@ import org.mustangproject.FileAttachment;
 import jakarta.activation.DataSource;
 import jakarta.activation.FileDataSource;

-public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporter, IExporter, Closeable {
+public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporter {
 	private boolean isFacturX = true;

 	public static final int DefaultZUGFeRDVersion = 2;
@@ -87,7 +86,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 		return this;
 	}
 	protected PDFAConformanceLevel conformanceLevel = PDFAConformanceLevel.UNICODE;
-	protected ArrayList<FileAttachment> fileAttachments = new ArrayList<FileAttachment>();
+	protected ArrayList<FileAttachment> fileAttachments = new ArrayList<>();

 	/**
 	 * This flag controls whether or not the metadata is overwritten, or kind of merged.
@@ -139,7 +138,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte

 	protected PDDocument doc;

-	private HashMap<String, byte[]> additionalXMLs = new HashMap<String, byte[]>();
+	private HashMap<String, byte[]> additionalXMLs = new HashMap<>();


 	protected int ZFVersion = DefaultZUGFeRDVersion;
@@ -248,9 +247,10 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 	 * Generate ZF2.1 files with filename factur-x.xml
 	 *
 	 * @return this (fluent setter)
-	 * @deprecated
+	 * @deprecated It's now the default anyway
 	 */
-	public ZUGFeRDExporterFromA3 setFacturX() {
+	@Deprecated
+  public ZUGFeRDExporterFromA3 setFacturX() {
 		isFacturX = true;
 		return this;
 	}
@@ -310,7 +310,8 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 	 * @param ZUGFeRDfilename the pdf file name
 	 * @throws IOException if anything is wrong in the target location
 	 */
-	public void export(String ZUGFeRDfilename) throws IOException {
+	@Override
+  public void export(String ZUGFeRDfilename) throws IOException {
 		if (!documentPrepared) {
 			prepareDocument();
 		}
@@ -337,7 +338,8 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 	 * @param output the OutputStream
 	 * @throws IOException if anything is wrong in the OutputStream
 	 */
-	public void export(OutputStream output) throws IOException {
+	@Override
+  public void export(OutputStream output) throws IOException {
 		if (!documentPrepared) {
 			prepareDocument();
 		}
@@ -399,7 +401,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 		ef.setSize(data.length);
 		ef.setCreationDate(new GregorianCalendar());

-		ef.setModDate(GregorianCalendar.getInstance());
+		ef.setModDate(Calendar.getInstance());

 		fs.setEmbeddedFile(ef);

@@ -431,7 +433,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 		doc.getDocumentCatalog().setNames(names);

 		// AF entry (Array) in catalog with the FileSpec
-		COSBase AFEntry = (COSBase) doc.getDocumentCatalog().getCOSObject().getItem("AF");
+		COSBase AFEntry = doc.getDocumentCatalog().getCOSObject().getItem("AF");
 		if ((AFEntry == null)) {
 			COSArray cosArray = new COSArray();
 			cosArray.add(fs);
@@ -636,7 +638,8 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 	 *              <code>setZUGFeRDXMLData(byte[] zugferdData)</code>
 	 * @throws IOException if anything is wrong with already loaded PDF
 	 */
-	public IExporter setTransaction(IExportableTransaction trans) throws IOException {
+	@Override
+  public IExporter setTransaction(IExportableTransaction trans) throws IOException {
 		this.trans = trans;
 		return prepare();
 	}
@@ -788,7 +791,7 @@ public class ZUGFeRDExporterFromA3 extends XRExporter implements IZUGFeRDExporte
 		if (overwrite || isEmpty(xsb.getCreatorTool()) || "UnknownApplication".equals(xsb.getCreatorTool()))
 			xsb.setCreatorTool(creatorTool);
 		if (overwrite || xsb.getCreateDate() == null)
-			xsb.setCreateDate(GregorianCalendar.getInstance());
+			xsb.setCreateDate(Calendar.getInstance());
 	}

 	protected XMPBasicSchema getXmpBasicSchema(XMPMetadata xmp) {
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromPDFA.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromPDFA.java
@@ -168,7 +168,7 @@ public class ZUGFeRDExporterFromPDFA implements IZUGFeRDExporter {
 	}

 	public IZUGFeRDExporter setProfile(Profile p) {
-		return (IZUGFeRDExporter) getExporter().setProfile(p);
+		return getExporter().setProfile(p);
 	}

 	public IZUGFeRDExporter setProfile(String profileName) {
@@ -176,7 +176,7 @@ public class ZUGFeRDExporterFromPDFA implements IZUGFeRDExporter {
 		if (p==null)  {
 			throw new RuntimeException("Profile not found.");
 		}
-		return (IZUGFeRDExporter) getExporter().setProfile(p);
+		return getExporter().setProfile(p);
 	}

 	public IZUGFeRDExporter setConformanceLevel(PDFAConformanceLevel newLevel) {
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java
@@ -222,9 +222,8 @@ public class ZUGFeRDVisualizer {
 		}

 		FileInputStream fis = new FileInputStream(xmlFilename);
-		String fileContent = "";
 		try {
-			fileContent = new String(Files.readAllBytes(Paths.get(xmlFilename)), StandardCharsets.UTF_8);
+			new String(Files.readAllBytes(Paths.get(xmlFilename)), StandardCharsets.UTF_8);
 		} catch (IOException e2) {
 			LOG.log(Level.SEVERE, null, e2);
 		}
@@ -276,11 +275,8 @@ public class ZUGFeRDVisualizer {
 	public void toPDF(String xmlFilename, String pdfFilename) {

 		// the writing part
-		CIIToUBL c2u = new CIIToUBL();
-		String sourceFilename = "factur-x.xml";
 		File CIIinputFile = new File(xmlFilename);

-		String expected = null;
 		String result = null;

 		ZUGFeRDVisualizer zvi = new ZUGFeRDVisualizer();