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

Removed JAXBExceptions from the public API of the ZUGFeRDExporter, because users of the library should not need to know which library ZUGFeRD uses for XML serialization

Browse Source
This commit is contained in:
Yannik Hampe
2017-05-13 16:26:07 +02:00
parent a60cb07c9b
commit 56a251e790
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExportException.java Normal file
View File

@@ -0,0 +1,18 @@
package org.mustangproject.ZUGFeRD;
public class ZUGFeRDExportException extends RuntimeException {
public ZUGFeRDExportException() {
}
public ZUGFeRDExportException(String message) {
super(message);
}
public ZUGFeRDExportException(String message, Throwable cause) {
super(message, cause);
}
public ZUGFeRDExportException(Throwable cause) {
super(cause);
}
}

34
mustang/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
View File

@@ -78,15 +78,19 @@ public class ZUGFeRDExporter implements Closeable {
* doc.save(PDFfilename); * doc.save(PDFfilename);
* *
* @author jstaerk * @author jstaerk
* @throws javax.xml.bind.JAXBException * @throws ZUGFeRDExportException if the exporter could not be initialized
* *
*/ */
public ZUGFeRDExporter() throws JAXBException { public ZUGFeRDExporter() {
jaxbContext = JAXBContext try {
.newInstance("org.mustangproject.ZUGFeRD.model"); jaxbContext = JAXBContext
marshaller = jaxbContext.createMarshaller(); .newInstance("org.mustangproject.ZUGFeRD.model");
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
} catch (JAXBException e) {
throw new ZUGFeRDExportException("Could not initialize JAXB", e);
}
} }
private class LineCalc { private class LineCalc {
@@ -554,8 +558,7 @@ public class ZUGFeRDExporter implements Closeable {
private Totals totals; private Totals totals;
private String getZugferdXMLForTransaction( private String createZugferdXMLForTransaction(IZUGFeRDExportableTransaction trans) {
IZUGFeRDExportableTransaction trans) throws JAXBException {
this.trans = trans; this.trans = trans;
this.totals = new Totals(); this.totals = new Totals();
currency = trans.getCurrency(); currency = trans.getCurrency();
@@ -571,9 +574,16 @@ public class ZUGFeRDExporter implements Closeable {
JAXBElement<CrossIndustryDocumentType> jaxElement = xmlFactory JAXBElement<CrossIndustryDocumentType> jaxElement = xmlFactory
.createCrossIndustryDocument(invoice); .createCrossIndustryDocument(invoice);
try {
return marshalJaxToXMLString(jaxElement);
} catch (JAXBException e) {
throw new ZUGFeRDExportException("Could not marshal ZUGFeRD transaction to XML", e);
}
}
private String marshalJaxToXMLString(Object jaxElement) throws JAXBException {
ByteArrayOutputStream outputXml = new ByteArrayOutputStream(); ByteArrayOutputStream outputXml = new ByteArrayOutputStream();
marshaller.marshal(jaxElement, outputXml); marshaller.marshal(jaxElement, outputXml);
return outputXml.toString(); return outputXml.toString();
} }
@@ -1388,7 +1398,7 @@ public class ZUGFeRDExporter implements Closeable {
* <code>setZUGFeRDXMLData(byte[] zugferdData)</code> * <code>setZUGFeRDXMLData(byte[] zugferdData)</code>
*/ */
public void PDFattachZugferdFile(IZUGFeRDExportableTransaction trans) public void PDFattachZugferdFile(IZUGFeRDExportableTransaction trans)
throws IOException, JAXBException { throws IOException {
if (zugferdData == null) // XML ZUGFeRD data not set externally, needs if (zugferdData == null) // XML ZUGFeRD data not set externally, needs
// to be built // to be built
@@ -1396,7 +1406,7 @@ public class ZUGFeRDExporter implements Closeable {
// create a dummy file stream, this would probably normally be a // create a dummy file stream, this would probably normally be a
// FileInputStream // FileInputStream
byte[] zugferdRaw = getZugferdXMLForTransaction(trans).getBytes(); //$NON-NLS-1$ byte[] zugferdRaw = createZugferdXMLForTransaction(trans).getBytes(); //$NON-NLS-1$
if ((zugferdRaw[0] == (byte) 0xEF) if ((zugferdRaw[0] == (byte) 0xEF)
&& (zugferdRaw[1] == (byte) 0xBB) && (zugferdRaw[1] == (byte) 0xBB)