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

Merge branch 'master' into code-quality-enhancements

Browse Source
This commit is contained in:
Daniel Luckas
2025-07-23 09:27:58 +02:00
parent 7ebaf3af8a 0f07baa08e
commit 8d34196313
6 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
validator/src/main/java/org/mustangproject/validator/XMLValidator.java
View File

@@ -225,13 +225,7 @@ public class XMLValidator extends Validator {
isExtended = context.getProfile().contains("extended");
validateSchema(zfXML.getBytes(StandardCharsets.UTF_8), "OX_10/comfort/SCRDMCCBDACIOMessageStructure_100pD20B.xsd", 99, EPart.ox);
xsltFilename = "/xslt/OX_10/comfort/SCRDMCCBDACIOMessageStructure_100pD20B_COMFORT.xslt";
} else if (root.getLocalName().equalsIgnoreCase("SCRDMCCBDACIOMessageStructure")) {
context.setGeneration("1");
isOrderX = true;
validateSchema(zfXML.getBytes(StandardCharsets.UTF_8), "OX_10/comfort/SCRDMCCBDACIOMessageStructure_100pD20B.xsd", 99, EPart.ox);
xsltFilename = "/xslt/OX_10/comfort/SCRDMCCBDACIOMessageStructure_100pD20B_COMFORT.xslt";
} else if (root.getLocalName().equalsIgnoreCase("CrossIndustryInvoice")) { // ZUGFeRD 2.0 or Factur-X
context.setGeneration("2");

6
validator/src/test/java/org/mustangproject/validator/ResourceCase.java
View File

@@ -17,8 +17,7 @@ public class ResourceCase extends TestCase {
private static final Logger LOGGER = LoggerFactory.getLogger(ResourceCase.class.getCanonicalName()); // log output is
public static File getResourceAsFile(String resourcePath) {
try {
InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream(resourcePath);
try(InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream(resourcePath)) {
if (in == null) {
return null;
}
@@ -42,8 +41,7 @@ public class ResourceCase extends TestCase {
}
public static byte[] getResourceAsByteArray(String resourcePath) {
try {
InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream(resourcePath);
try(InputStream in = ClassLoader.getSystemClassLoader().getResourceAsStream(resourcePath)) {
if (in == null) {
return null;
}