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

Make sure to close streams

Browse Source
This commit is contained in:
Philip Helger
2024-07-09 17:32:23 +02:00
parent d3df17525d
commit be2d57e3e3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package org.mustangproject.validator; package org.mustangproject.validator;
import com.helger.schematron.ISchematronResource; import com.helger.schematron.ISchematronResource;
import com.helger.schematron.svrl.SVRLHelper;
import com.helger.schematron.svrl.SVRLMarshaller; import com.helger.schematron.svrl.SVRLMarshaller;
import com.helger.schematron.svrl.jaxb.SchematronOutputType; import com.helger.schematron.svrl.jaxb.SchematronOutputType;
import org.mustangproject.XMLTools; import org.mustangproject.XMLTools;
@@ -21,6 +22,7 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
@@ -63,11 +65,16 @@ public class XMLValidator extends Validator {
final ValidationResultItem vri = new ValidationResultItem(ESeverity.exception, e.getMessage()).setSection(9) final ValidationResultItem vri = new ValidationResultItem(ESeverity.exception, e.getMessage()).setSection(9)
.setPart(EPart.fx); .setPart(EPart.fx);
final StringWriter sw = new StringWriter(); try (final StringWriter sw = new StringWriter();
final PrintWriter pw = new PrintWriter(sw); final PrintWriter pw = new PrintWriter(sw))
e.printStackTrace(pw); {
vri.setStacktrace(sw.toString()); e.printStackTrace(pw);
context.addResultItem(vri); vri.setStacktrace(sw.toString());
context.addResultItem(vri);
}
catch (IOException ex) {
throw new UncheckedIOException (ex);
}
} }
} }
@@ -433,6 +440,7 @@ public class XMLValidator extends Validator {
} catch (final Exception e) { } catch (final Exception e) {
throw new IrrecoverableValidationError(e.getMessage()); throw new IrrecoverableValidationError(e.getMessage());
} }
// SVRLHelper.getAllFailedAssertions (sout);
Document SVRLReport = new SVRLMarshaller().getAsDocument(sout); Document SVRLReport = new SVRLMarshaller().getAsDocument(sout);
XPath xPath = XPathFactory.newInstance().newXPath(); XPath xPath = XPathFactory.newInstance().newXPath();
String expression = "//*[local-name() = 'failed-assert']"; String expression = "//*[local-name() = 'failed-assert']";