demo/validator
1
0
Fork 0
mirror of https://github.com/itplr-kosit/validator.git synced 2026-05-25 16:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

#40 Fix NPE in Result.getReportDocument for malformed xml input

Browse source 
Information about parsing errors in fallback-report
This commit is contained in:
Andreas Penski (init) 2020-01-06 11:49:42 +01:00
parent 0ca79fc89d
commit 7f57d8744b
5 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/de/kosit/validationtool/impl/EngineInformation.java
View file

@ -55,4 +55,22 @@ public class EngineInformation {
public static String getFrameworkVersion() {
return PROPERTIES.getProperty("framework_version");
}
/**
* Gibt die Major-Versions-Nummer des eingesetzten Frameworks zurück.
*
* @return die Major-Versions-Nummer
*/
public static String getFrameworkMajorVersion() {
return getFrameworkVersion().substring(0, 1);
}
/**
* Gibt den Namespace des eingesetzten Frameworks zurück.
*
* @return die Major-Versions-Nummer
*/
public static String getFrameworkNamespace() {
return "http://www.xoev.de/de/validator/framework/" + getFrameworkMajorVersion() + "/createreportinput";
}
}

16
src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java
View file

@ -19,19 +19,25 @@
package de.kosit.validationtool.impl.tasks;
import java.util.Collection;
import java.util.stream.Collectors;
import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import lombok.RequiredArgsConstructor;
import de.kosit.validationtool.impl.CollectingErrorEventHandler;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.EngineInformation;
import de.kosit.validationtool.impl.ObjectFactory;
import de.kosit.validationtool.impl.RelativeUriResolver;
import de.kosit.validationtool.impl.ScenarioRepository;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import de.kosit.validationtool.model.scenarios.ScenarioType;
import net.sf.saxon.s9api.BuildingContentHandler;
@ -53,6 +59,7 @@ import net.sf.saxon.s9api.XsltTransformer;
@RequiredArgsConstructor
public class CreateReportAction implements CheckAction {
private static final String ERROR_MESSAGE_ELEMENT = "error-message";
private final Processor processor;
private final ConversionService conversionService;
@ -71,7 +78,7 @@ public class CreateReportAction implements CheckAction {
try {
final XdmNode parsedDocument = results.getParserResult().isValid() ? results.getParserResult().getObject()
: createEmpty();
: createErrorInformation(results.getParserResult().getErrors());
final Document reportInput = this.conversionService.writeDocument(results.getReportInput());
final XdmNode root = documentBuilder.build(new DOMSource(reportInput));
@ -95,9 +102,14 @@ public class CreateReportAction implements CheckAction {
}
}
private static XdmNode createEmpty() throws SaxonApiException, SAXException {
private static XdmNode createErrorInformation(final Collection<XMLSyntaxError> errors) throws SaxonApiException, SAXException {
final BuildingContentHandler contentHandler = ObjectFactory.createProcessor().newDocumentBuilder().newBuildingContentHandler();
contentHandler.startDocument();
contentHandler.startElement(EngineInformation.getFrameworkNamespace(), ERROR_MESSAGE_ELEMENT, ERROR_MESSAGE_ELEMENT,
new AttributesImpl());
final String message = errors.stream().map(XMLSyntaxError::getMessage).collect(Collectors.joining());
contentHandler.characters(message.toCharArray(), 0, message.length());
contentHandler.endElement(EngineInformation.getFrameworkNamespace(), ERROR_MESSAGE_ELEMENT, ERROR_MESSAGE_ELEMENT);
return contentHandler.getDocumentNode();
}