#41 fix validation of garbage e.g. non xml files

src/main/java/de/kosit/validationtool/impl/ContentRepository.java

@@ -96,7 +96,7 @@ public class ContentRepository {
         final CollectingErrorEventHandler listener = new CollectingErrorEventHandler();
         try {
             xsltCompiler.setErrorListener(listener);
-            xsltCompiler.setURIResolver(new RelativeUriResolver(this.repository));
+            xsltCompiler.setURIResolver(createResolver());
 
             return xsltCompiler.compile(resolve(uri));
         } catch (final SaxonApiException e) {
@@ -202,4 +202,12 @@ public class ContentRepository {
         return StringUtils.startsWithIgnoreCase(path, "jar:") && path.split("!").length == 2;
     }
 
+    /**
+     * Erzeugt einen resolver für dieses Repository, der nur relativ auflösen kann
+     * 
+     * @return ein neuer Resolver
+     */
+    public RelativeUriResolver createResolver() {
+        return new RelativeUriResolver(this.repository);
+    }
 }

src/main/java/de/kosit/validationtool/impl/DefaultCheck.java

@@ -86,9 +86,9 @@ public class DefaultCheck implements Check {
         this.checkSteps.add(new DocumentParseAction());
         this.checkSteps.add(new ScenarioSelectionAction(this.repository));
         this.checkSteps.add(new SchemaValidationAction());
-        this.checkSteps.add(new SchematronValidationAction(configuration.getScenarioRepository(), this.conversionService));
+        this.checkSteps.add(new SchematronValidationAction(this.contentRepository, this.conversionService));
         this.checkSteps.add(new ValidateReportInputAction(this.conversionService, this.contentRepository.getReportInputSchema()));
-        this.checkSteps.add(new CreateReportAction(processor, this.conversionService, configuration.getScenarioRepository()));
+        this.checkSteps.add(new CreateReportAction(processor, this.conversionService, this.repository, this.contentRepository));
         this.checkSteps.add(new ComputeAcceptanceAction());
     }
 
@@ -131,14 +131,12 @@ public class DefaultCheck implements Check {
 
     private Result createResult(final Bag t) {
         final DefaultResult result = new DefaultResult(t.getReport(), t.getAcceptStatus(), new HtmlExtractor(this.contentRepository));
+        result.setWellformed(t.getParserResult().isValid());
         result.setReportInput(t.getReportInput());
         if (t.getSchemaValidationResult() != null) {
             result.setSchemaViolations(convertErrors(t.getSchemaValidationResult().getErrors()));
         }
         result.setProcessingSuccessful(!t.isStopped() && t.isFinished());
-        if (t.getReportInput().getProcessingError() != null) {
-            result.getProcessingErrors().addAll(t.getReportInput().getProcessingError().getError());
-        }
         result.setSchematronResult(t.getReportInput().getValidationResultsSchematron().stream()
                 .map(e -> e.getResults().getSchematronOutput()).collect(Collectors.toList()));
         return result;

src/main/java/de/kosit/validationtool/impl/DefaultResult.java

@@ -1,6 +1,6 @@
 package de.kosit.validationtool.impl;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -45,10 +45,7 @@ public class DefaultResult implements Result {
 
     @Setter(AccessLevel.PACKAGE)
     @Getter
-    private List<XmlError> schemaViolations = new ArrayList<>();
-
-    @Getter
-    private final List<String> processingErrors = new ArrayList<>();
+    private List<XmlError> schemaViolations;
 
     @Getter
     @Setter(AccessLevel.PACKAGE)
@@ -58,12 +55,21 @@ public class DefaultResult implements Result {
     @Setter
     private boolean processingSuccessful;
 
+    @Getter
+    @Setter
+    private boolean wellformed;
+
     public DefaultResult(final XdmNode report, final AcceptRecommendation recommendation, final HtmlExtractor htmlExtractor) {
         this.report = report;
         this.acceptRecommendation = recommendation;
         this.htmlExtraction = htmlExtractor;
     }
 
+    @Override
+    public List<String> getProcessingErrors() {
+        return getReportInput().getProcessingError() != null ? getReportInput().getProcessingError().getError() : Collections.emptyList();
+    }
+
     /**
      * Gibt den Report als W3C-{@link Document} zurück.
      *
@@ -84,6 +90,11 @@ public class DefaultResult implements Result {
         return isProcessingSuccessful() && AcceptRecommendation.ACCEPTABLE.equals(this.acceptRecommendation);
     }
 
+    @Override
+    public boolean isSchemaValid() {
+        return getSchemaViolations() != null && getSchemaViolations().isEmpty();
+    }
+
     /**
      * Extrahiert evtl. im Report vorhandene HTML-Fragmente als String.
      * 

src/main/java/de/kosit/validationtool/impl/RelativeUriResolver.java

@@ -28,6 +28,7 @@ import javax.xml.transform.Source;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
 
+import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 
 import net.sf.saxon.Configuration;
@@ -40,7 +41,7 @@ import net.sf.saxon.trans.XPathException;
  *
  * @author Andreas Penski
  */
-@RequiredArgsConstructor
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 public class RelativeUriResolver implements URIResolver, UnparsedTextURIResolver {
 
     /** the base uri */

src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java

@@ -62,7 +62,7 @@ public class ScenarioRepository {
     private static final String SUPPORTED_MAJOR_VERSION_SCHEMA = "http://www.xoev.de/de/validator/framework/1/scenarios";
 
 
-    @Getter(value = AccessLevel.PRIVATE)
+    @Getter(value = AccessLevel.PACKAGE)
     private final ContentRepository repository;
 
     @Getter

src/main/java/de/kosit/validationtool/impl/tasks/CheckAction.java

@@ -19,6 +19,8 @@
 
 package de.kosit.validationtool.impl.tasks;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -30,6 +32,7 @@ import de.kosit.validationtool.api.AcceptRecommendation;
 import de.kosit.validationtool.api.Input;
 import de.kosit.validationtool.impl.model.Result;
 import de.kosit.validationtool.model.reportInput.CreateReportInput;
+import de.kosit.validationtool.model.reportInput.ProcessingError;
 import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
 import de.kosit.validationtool.model.scenarios.ScenarioType;
 
@@ -84,12 +87,19 @@ public interface CheckAction {
             this.reportInput = reportInput;
         }
 
-
         /**
          * Signalisiert einen vorzeitigen Stop der Vearbeitung.
          */
-        public void stopProcessing() {
+        public void stopProcessing(final String error) {
+            stopProcessing(Collections.singleton(error));
+        }
+
+        public void stopProcessing(final Collection<String> errors) {
             this.stopped = true;
+            if (this.reportInput.getProcessingError() == null) {
+                this.reportInput.setProcessingError(new ProcessingError());
+            }
+            this.reportInput.getProcessingError().getError().addAll(errors);
         }
 
         /**

src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java

@@ -19,8 +19,6 @@
 
 package de.kosit.validationtool.impl.tasks;
 
-import java.net.URI;
-
 import javax.xml.transform.dom.DOMSource;
 
 import org.w3c.dom.Document;
@@ -28,6 +26,7 @@ import org.w3c.dom.Document;
 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.ObjectFactory;
 import de.kosit.validationtool.impl.RelativeUriResolver;
@@ -57,7 +56,9 @@ public class CreateReportAction implements CheckAction {
 
     private final ConversionService conversionService;
 
-    private final URI contentRepository;
+    private final ScenarioRepository scenarioRepository;
+
+    private final ContentRepository contentRepository;
 
     private static XsltExecutable loadFromScenario(final ScenarioType object) {
         return object.getReportTransformation().getExecutable();
@@ -76,7 +77,7 @@ public class CreateReportAction implements CheckAction {
             final XsltTransformer transformer = getTransformation(results).load();
             transformer.setInitialContextNode(root);
             final CollectingErrorEventHandler e = new CollectingErrorEventHandler();
-            final RelativeUriResolver resolver = new RelativeUriResolver(this.contentRepository);
+            final RelativeUriResolver resolver = this.contentRepository.createResolver();
             transformer.setMessageListener(e);
             transformer.setURIResolver(resolver);
             transformer.getUnderlyingController().setUnparsedTextURIResolver(resolver);
@@ -91,9 +92,10 @@ public class CreateReportAction implements CheckAction {
         }
     }
 
-    private static XsltExecutable getTransformation(final Bag results) {
+    private XsltExecutable getTransformation(final Bag results) {
         final Result<ScenarioType, String> scenario = results.getScenarioSelectionResult();
-        return loadFromScenario(scenario.getObject());
+        final ScenarioType reportScenario = scenario.isValid() ? scenario.getObject() : this.scenarioRepository.getFallbackScenario();
+        return loadFromScenario(reportScenario);
     }
 
 }

src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java

@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
+import java.util.stream.Collectors;
 
 import javax.xml.transform.stream.StreamSource;
 
@@ -51,7 +52,8 @@ public class DocumentParseAction implements CheckAction {
 
     /**
      * Parsed und überprüft ein übergebenes Dokument darauf ob es well-formed ist. Dies stellt den ersten
-     * Verarbeitungsschritt des Prüf-Tools dar. Diese Funktion verzichtet explizit auf die Validierung gegenüber einem Schema.
+     * Verarbeitungsschritt des Prüf-Tools dar. Diese Funktion verzichtet explizit auf die Validierung gegenüber einem
+     * Schema.
      * 
      * @param content ein Dokument
      * @return Ergebnis des Parsings inklusive etwaiger Fehler
@@ -86,6 +88,7 @@ public class DocumentParseAction implements CheckAction {
         results.getReportInput().setValidationResultsWellformedness(v);
         if (parserResult.isInvalid()) {
             log.info("Parsing war nicht erfolgreich: {} -> {}", parserResult.getObject(), parserResult.getErrors());
+            results.stopProcessing(parserResult.getErrors().stream().map(XMLSyntaxError::getMessage).collect(Collectors.toList()));
         }
     }
 

src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java

@@ -24,7 +24,6 @@ import lombok.RequiredArgsConstructor;
 import de.kosit.validationtool.impl.ScenarioRepository;
 import de.kosit.validationtool.impl.model.Result;
 import de.kosit.validationtool.model.reportInput.CreateReportInput;
-import de.kosit.validationtool.model.reportInput.ProcessingError;
 import de.kosit.validationtool.model.scenarios.ScenarioType;
 
 /**
@@ -38,23 +37,20 @@ public class ScenarioSelectionAction implements CheckAction {
     private final ScenarioRepository repository;
 
     @Override
-    public void check(Bag results) {
+    public void check(final Bag results) {
         final CreateReportInput report = results.getReportInput();
-        final Result<ScenarioType, String> scenarioTypeResult = repository.selectScenario(results.getParserResult().getObject());
+        final Result<ScenarioType, String> scenarioTypeResult = this.repository.selectScenario(results.getParserResult().getObject());
         results.setScenarioSelectionResult(scenarioTypeResult);
         if (scenarioTypeResult.isValid()) {
             final ScenarioType scenario = scenarioTypeResult.getObject();
             report.setScenario(scenario);
         } else {
-            if (report.getProcessingError() == null) {
-                report.setProcessingError(new ProcessingError());
-            }
-            report.getProcessingError().getError().addAll(scenarioTypeResult.getErrors());
+            results.stopProcessing(scenarioTypeResult.getErrors());
         }
     }
 
     @Override
-    public boolean isSkipped(Bag results) {
+    public boolean isSkipped(final Bag results) {
         return results.getParserResult().isInvalid();
     }
 }

src/main/java/de/kosit/validationtool/impl/tasks/SchematronValidationAction.java

@@ -19,7 +19,6 @@
 
 package de.kosit.validationtool.impl.tasks;
 
-import java.net.URI;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -31,6 +30,7 @@ import org.w3c.dom.Document;
 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.ObjectFactory;
 import de.kosit.validationtool.impl.RelativeUriResolver;
@@ -52,7 +52,7 @@ import net.sf.saxon.s9api.XsltTransformer;
 @RequiredArgsConstructor
 public class SchematronValidationAction implements CheckAction {
 
-    private final URI repository;
+    private final ContentRepository repository;
 
     private final ConversionService conversionService;
 
@@ -64,7 +64,7 @@ public class SchematronValidationAction implements CheckAction {
         try {
             final XsltTransformer transformer = validation.getExecutable().load();
             // resolving nur relative zum Repository
-            final RelativeUriResolver resolver = new RelativeUriResolver(this.repository);
+            final RelativeUriResolver resolver = this.repository.createResolver();
             transformer.setURIResolver(resolver);
             final CollectingErrorEventHandler e = new CollectingErrorEventHandler();
             transformer.setMessageListener(e);

src/main/java/de/kosit/validationtool/impl/tasks/ValidateReportInputAction.java

@@ -49,7 +49,7 @@ public class ValidateReportInputAction implements CheckAction {
         final Result<Boolean, XMLSyntaxError> results = validate(bag.getReportInput());
         if (!results.isValid()) {
             log.error("Report input has errors {}", results.getErrors());
-            bag.stopProcessing();
+            bag.stopProcessing(String.format("Report input has errors %s", results.getErrors()));
         }
     }