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

closes #416

Browse Source
This commit is contained in:
jstaerk
2024-07-18 18:55:41 +02:00
parent 647efd462a
commit 5b00818817
4 changed files with 72 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
History.md
View File

@@ -15,7 +15,9 @@
- Be able to validate XRechnung/UBL files #337
- ph-schematron aktualisiert, logback zugungsten log4j entfernt #402
- java.util Logging zugungsten log4j entfernt #407
- ZF extended no longer requires deliveydate #409
- ZF extended no longer requires deliverydate #411
- Return all BankDetails from parsed CII xml. Closes #408.
- ubl visualization: do not require ubl namespace prefix #416
2.11.0
=======

3
Mustang-CLI/src/main/java/org/mustangproject/commandline/Main.java
View File

@@ -843,8 +843,9 @@ public class Main {
} else {
zvi.toPDF(sourceName, outName);
}
} catch (TransformerException | IOException e) {
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
System.err.println(e.getMessage());
}
System.out.println("Written to " + outName);

50
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDVisualizer.java
View File

@@ -36,6 +36,9 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -63,6 +66,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.helger.commons.io.stream.StreamHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class ZUGFeRDVisualizer {
@@ -74,7 +81,7 @@ public class ZUGFeRDVisualizer {
static final ClassLoader CLASS_LOADER = ZUGFeRDVisualizer.class.getClassLoader();
private static final String RESOURCE_PATH = "";
private static final Logger LOGGER = LoggerFactory.getLogger (ZUGFeRDVisualizer.class);
private static final Logger LOGGER = LoggerFactory.getLogger(ZUGFeRDVisualizer.class);
// private static File createTempFileResult(final Transformer transformer, final
// StreamSource toTransform,
// final String suffix) throws TransformerException, IOException {
@@ -100,7 +107,7 @@ public class ZUGFeRDVisualizer {
}
public String visualize(String xmlFilename, Language lang)
throws FileNotFoundException, TransformerException {
throws FileNotFoundException, TransformerException, IOException, SAXException, ParserConfigurationException {
try {
if (mXsltXRTemplate == null) {
@@ -120,7 +127,7 @@ public class ZUGFeRDVisualizer {
CLASS_LOADER.getResourceAsStream(RESOURCE_PATH + "stylesheets/ZUGFeRD_1p0_c1p0_s1p0.xslt")));
}
} catch (TransformerConfigurationException ex) {
LOGGER.error ("Failed to init XSLT templates", ex);
LOGGER.error("Failed to init XSLT templates", ex);
}
/**
@@ -134,35 +141,40 @@ public class ZUGFeRDVisualizer {
try {
fileContent = new String(Files.readAllBytes(Paths.get(xmlFilename)), StandardCharsets.UTF_8);
} catch (IOException e2) {
LOGGER.error ("Failed to read file content", e2);
LOGGER.error("Failed to read file content", e2);
}
ByteArrayOutputStream iaos = new ByteArrayOutputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
String zf1Signature = "rsm:CrossIndustryDocument";
String zf2Signature = "rsm:CrossIndustryInvoice";
String ublSignature = "ubl:Invoice";
String ublCreditNoteSignature = "ubl:CreditNote";
String zf1Signature = "CrossIndustryDocument";
String zf2Signature = "CrossIndustryInvoice";
String ublSignature = "Invoice";
String ublCreditNoteSignature = "CreditNote";
boolean doPostProcessing = false;
if (fileContent.contains(zf1Signature)) {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.parse(new InputSource(fis));
Element root = doc.getDocumentElement();
fis = new FileInputStream(xmlFilename); // fis wont reset() so re-read from beginning
if (root.getLocalName().equals(zf1Signature)) {
applyZF1XSLT(fis, baos);
} else if (fileContent.contains(zf2Signature)) {
} else if (root.getLocalName().equals(zf2Signature)) {
//zf2 or fx
applyZF2XSLT(fis, iaos);
doPostProcessing = true;
} else if (fileContent.contains(ublSignature)) {
} else if (root.getLocalName().equals(ublSignature)) {
//zf2 or fx
applyUBL2XSLT(fis, iaos);
doPostProcessing = true;
} else if (fileContent.contains(ublCreditNoteSignature)) {
} else if (root.getLocalName().equals(ublCreditNoteSignature)) {
//zf2 or fx
applyUBLCreditNote2XSLT(fis, iaos);
doPostProcessing = true;
} else {
throw new IllegalArgumentException("File does not look like CII or UBL");
}
if (doPostProcessing) {
// take the copy of the stream and re-write it to an InputStream
@@ -179,11 +191,11 @@ public class ZUGFeRDVisualizer {
// ByteArrayOutputStream
iaos.writeTo(out);
} catch (IOException e) {
LOGGER.error ("Failed to write to stream", e);
LOGGER.error("Failed to write to stream", e);
} finally {
// close the PipedOutputStream here because we're done writing data
// once this thread has completed its run
StreamHelper.close (out);
StreamHelper.close(out);
}
}
}).start();
@@ -218,7 +230,7 @@ public class ZUGFeRDVisualizer {
// TODO why are we reading the whole file here and discarding the content?
new String(Files.readAllBytes(Paths.get(xmlFilename)), StandardCharsets.UTF_8);
} catch (IOException e2) {
LOGGER.error ("Failed to read file", e2);
LOGGER.error("Failed to read file", e2);
}
ByteArrayOutputStream iaos = new ByteArrayOutputStream();

17
library/src/test/java/org/mustangproject/ZUGFeRD/VisualizationTest.java
View File

@@ -21,7 +21,9 @@ package org.mustangproject.ZUGFeRD;
import org.junit.FixMethodOrder;
import org.junit.runners.MethodSorters;
import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.*;
import java.io.*;
import java.nio.charset.StandardCharsets;
@@ -57,10 +59,13 @@ public class VisualizationTest extends ResourceCase {
fail("TransformerException should not happen: "+e.getMessage());
} catch (IOException e) {
fail("IOException should not happen: "+e.getMessage());
} catch (ParserConfigurationException e) {
fail("ParserConfigurationException should not happen: "+e.getMessage());
} catch (SAXException e) {
fail("SAXException should not happen: "+e.getMessage());
}
assertNotNull(result);
// Reading ZUGFeRD
assertEquals(expected, result);
@@ -91,10 +96,13 @@ public class VisualizationTest extends ResourceCase {
fail("TransformerException should not happen: "+e.getMessage());
} catch (IOException e) {
fail("IOException should not happen: "+e.getMessage());
} catch (ParserConfigurationException e) {
fail("ParserConfigurationException should not happen: "+e.getMessage());
} catch (SAXException e) {
fail("SAXException should not happen: "+e.getMessage());
}
assertNotNull(result);
// Reading ZUGFeRD
assertEquals(expected, result);
@@ -125,10 +133,13 @@ public class VisualizationTest extends ResourceCase {
fail("TransformerException should not happen: "+e.getMessage());
} catch (IOException e) {
fail("IOException should not happen: "+e.getMessage());
} catch (ParserConfigurationException e) {
fail("ParserConfigurationException should not happen: "+e.getMessage());
} catch (SAXException e) {
fail("SAXException should not happen: "+e.getMessage());
}
assertNotNull(result);
// Reading ZUGFeRD
assertEquals(expected, result);