Reactiate improved migration feature, this time in the library

library/src/main/java/org/mustangproject/ZUGFeRD/IExportableTransaction.java

@@ -30,6 +30,7 @@ package org.mustangproject.ZUGFeRD;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.mustangproject.FileAttachment;
 import org.mustangproject.ZUGFeRD.model.DocumentCodeTypeConstants;
 
 public interface IExportableTransaction  {

library/src/main/java/org/mustangproject/ZUGFeRD/XMLUpgrader.java

@@ -0,0 +1,68 @@
+package org.mustangproject.ZUGFeRD;
+
+import javax.xml.transform.*;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import java.io.*;
+
+
+/***
+ * Uses a XSLT transformation to upgrade
+ * from ZUGFeRD 1 to ZUGFeRD 2 (=Factur-X1 ˜= XRechnung)
+ * This is an external functionality of the software and not very complete, for
+ * internal operations (generation of ZF2) of course the ZF2PullProvider is used
+ */
+public class XMLUpgrader {
+
+	static final ClassLoader CLASS_LOADER = XMLUpgrader.class.getClassLoader();
+	private static final String RESOURCE_PATH = ""; //$NON-NLS-1$
+	private TransformerFactory mFactory = null;
+	private Templates mXsltTemplate = null;
+
+	public XMLUpgrader() {
+		mFactory = new net.sf.saxon.TransformerFactoryImpl();
+		//fact = TransformerFactory.newInstance();
+		mFactory.setURIResolver(new ClasspathResourceURIResolver());
+	}
+
+	/***
+	 * Takes a filename of a ZF1 XML file and returns the string of ZF2 XML
+	 * @param xmlFilename
+	 * @return String the updated XML
+	 * @throws FileNotFoundException
+	 * @throws TransformerException
+	 * @throws UnsupportedEncodingException
+	 */
+	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
+		 */
+		mXsltTemplate = mFactory.newTemplates(new StreamSource(CLASS_LOADER.getResourceAsStream(RESOURCE_PATH + "stylesheets/ZF1ToZF2.xsl")));
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		applySchematronXsl(new FileInputStream(xmlFilename), baos);
+		String res = null;
+		res = baos.toString("UTF-8");
+		return res;
+	}
+
+	protected 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));
+		}
+	}
+}

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

@@ -30,11 +30,13 @@ import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.DocumentHelper;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
+import org.mustangproject.FileAttachment;
 import org.mustangproject.Invoice;
 import org.mustangproject.XMLTools;
 
@@ -496,13 +498,13 @@ public class ZUGFeRD2PullProvider implements IXMLProvider, IAbsoluteValueProvide
 		// Additional Documents of XRechnung (Rechnungsbegruendende Unterlagen - BG-24 XRechnung)
 		if (trans.getAdditionalReferencedDocuments() != null) {
 			for (FileAttachment f : trans.getAdditionalReferencedDocuments()) {
-				final String documentContent = Base64.encodeBase64String(f.getData());
+				// final String documentContent = Base64.encodeBase64String(f.getData());
 				xml = xml + "  <ram:AdditionalReferencedDocument>\n"
 						+ "    <ram:IssuerAssignedID>" + f.getFilename() + "</ram:IssuerAssignedID>\n"
 						+ "    <ram:TypeCode>916</ram:TypeCode>\n"
 						+ "    <ram:Name>" + f.getDescription() + "</ram:Name>\n"
 						+ "    <ram:AttachmentBinaryObject mimeCode=\"" + f.getMimetype() + "\"\n"
-						+ "      filename=\"" + f.getFilename() + ">" + documentContent + "\n"
+//						+ "      filename=\"" + f.getFilename() + ">" + documentContent + "\n"
 						+ "  </ram:AdditionalReferencedDocument>\n";
 			}
 		}