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

Merge pull request #1067 from phax/java17-base

Browse Source 
Set Java 17 as base + dependency updates + test fix
This commit is contained in:
Jochen Staerk
2026-05-07 13:22:43 +02:00
committed by GitHub
parent d8313dae20 51a216bb94
commit f6b6c0a36e
15 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/org/mustangproject/CII/CIIToUBL.java
View File

@@ -3,7 +3,7 @@ package org.mustangproject.CII;
import java.io.File;
import java.io.Serializable;
import com.helger.commons.error.list.ErrorList;
import com.helger.diagnostics.error.list.ErrorList;
import com.helger.en16931.cii2ubl.CIIToUBL23Converter;
import com.helger.ubl23.UBL23Marshaller;

10
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
View File

@@ -551,9 +551,13 @@ public class ZUGFeRDInvoiceImporter {
NodeList lineDueNodes = (NodeList) xpr.evaluate(getDocument(), XPathConstants.NODESET);
BigDecimal duePayableAmount = null;
if (lineDueNodes.getLength() > 0) {
duePayableAmount = new BigDecimal(XMLTools.trimOrNull(lineDueNodes.item(0)));
if (zpp instanceof CalculatedInvoice) {
((CalculatedInvoice) zpp).setDuePayable(duePayableAmount);
String duePayableAmountStr=XMLTools.trimOrNull(lineDueNodes.item(0));
if (duePayableAmountStr!=null) {
// Always set it, because it is used in the calculation below
duePayableAmount = new BigDecimal(duePayableAmountStr);
if (zpp instanceof CalculatedInvoice) {
((CalculatedInvoice) zpp).setDuePayable(duePayableAmount);
}
}
}

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

@@ -20,7 +20,7 @@
*/
package org.mustangproject.ZUGFeRD;
import com.helger.commons.io.stream.StreamHelper;
import com.helger.base.io.stream.StreamHelper;
import javax.xml.XMLConstants;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.commons.io.IOUtils;

4
library/src/test/java/org/mustangproject/ZUGFeRD/DXTest.java
View File

@@ -335,10 +335,8 @@ public class DXTest extends MustangReaderTestCase {
zf2p.setProfile(Profiles.getByName(EStandard.despatchadvice,"Pilot",1));
zf2p.generateXML(i);
String theXML = new String(zf2p.getXML(), StandardCharsets.UTF_8);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}

4
library/src/test/java/org/mustangproject/ZUGFeRD/FXTest.java
View File

@@ -62,10 +62,8 @@ public class FXTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}

3
library/src/test/java/org/mustangproject/ZUGFeRD/UBLTest.java
View File

@@ -30,8 +30,10 @@ import java.text.ParseException;
import java.util.Date;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.mustangproject.BankDetails;
import org.mustangproject.CII.CIIToUBL;
import org.mustangproject.Contact;
@@ -42,6 +44,7 @@ import org.mustangproject.TradeParty;
import javax.xml.xpath.XPathExpressionException;
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class UBLTest extends ResourceCase {
final String TARGET_XML = "./target/testout-1Lieferschein.xml";

12
library/src/test/java/org/mustangproject/ZUGFeRD/XRTest.java
View File

@@ -81,10 +81,8 @@ public class XRTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
@@ -134,10 +132,8 @@ public class XRTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_EDGE_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
@@ -251,10 +247,8 @@ public class XRTest extends TestCase {
assertThat(theXML).valueByXPath("//*[local-name()='DuePayableAmount']")
.asDouble()
.isEqualTo(1);
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML));
try(BufferedWriter writer = new BufferedWriter(new FileWriter(TARGET_XML))) {
writer.write(theXML);
writer.close();
} catch (IOException e) {
e.printStackTrace();
}

6
library/src/test/java/org/mustangproject/ZUGFeRD/ZF2PushTest.java
View File

@@ -309,9 +309,7 @@ public class ZF2PushTest extends TestCase {
String number = "123";
String priceStr = "3.00";
BigDecimal price = new BigDecimal(priceStr);
try {
InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
try(InputStream SOURCE_PDF = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf")) {
ZUGFeRDExporterFromA1 ze = new ZUGFeRDExporterFromA1();
ze.ignorePDFAErrors().load(SOURCE_PDF);
ze.setProfile(Profiles.getByName("Extended"));
@@ -359,7 +357,7 @@ public class ZF2PushTest extends TestCase {
/***
* you can activate intra community suppliy on item level
* you can activate intra community supply on item level
*/
public void testIntraCommunitySupplyItemExport() {