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

10-OptimizeImports

Browse source
This commit is contained in:
Adrian-Devries 2025-04-24 12:54:00 +02:00
parent 386661cfbe
commit d88934e9a5
100 changed files with 724 additions and 924 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/kosit/validationtool/api/Check.java
View file

@ -16,11 +16,11 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import org.w3c.dom.Document;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.w3c.dom.Document;
/** /**
* Main validator interface for checking incoming files. * Main validator interface for checking incoming files.
* *

13
src/main/java/de/kosit/validationtool/api/CheckConfiguration.java
View file

@ -16,18 +16,17 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import java.net.URI; import de.kosit.validationtool.impl.ContentRepository;
import java.util.List; import de.kosit.validationtool.impl.Scenario;
import java.util.Map; import de.kosit.validationtool.impl.xml.ProcessorProvider;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ContentRepository; import java.net.URI;
import de.kosit.validationtool.impl.Scenario; import java.util.List;
import de.kosit.validationtool.impl.xml.ProcessorProvider; import java.util.Map;
/** /**
* Zentrale Konfigration einer Prüf-Instanz. * Zentrale Konfigration einer Prüf-Instanz.

8
src/main/java/de/kosit/validationtool/api/Configuration.java
View file

@ -16,15 +16,15 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import java.net.URI;
import java.util.List;
import java.util.Map;
import de.kosit.validationtool.config.ConfigurationBuilder; import de.kosit.validationtool.config.ConfigurationBuilder;
import de.kosit.validationtool.config.ConfigurationLoader; import de.kosit.validationtool.config.ConfigurationLoader;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import java.net.URI;
import java.util.List;
import java.util.Map;
/** /**
* Configuration of the actual {@link Check} instance. This is an interface and can be implemented by custom * Configuration of the actual {@link Check} instance. This is an interface and can be implemented by custom
* configuration classes. There are two implementations supported out of the box: * configuration classes. There are two implementations supported out of the box:

3
src/main/java/de/kosit/validationtool/api/Input.java
View file

@ -16,9 +16,8 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import java.io.IOException;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import java.io.IOException;
/** /**
* An input for the validator. * An input for the validator.

28
src/main/java/de/kosit/validationtool/api/InputFactory.java
View file

@ -16,8 +16,18 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import static org.apache.commons.lang3.StringUtils.isNotEmpty; import de.kosit.validationtool.impl.input.ByteArrayInput;
import de.kosit.validationtool.impl.input.ResourceInput;
import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.input.StreamHelper;
import de.kosit.validationtool.impl.input.XdmNodeInput;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.XdmNode;
import org.apache.commons.lang3.StringUtils;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -28,21 +38,7 @@ import java.net.URLConnection;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.UUID; import java.util.UUID;
import javax.xml.transform.Source; import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import javax.xml.transform.stream.StreamSource;
import org.apache.commons.lang3.StringUtils;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.input.ByteArrayInput;
import de.kosit.validationtool.impl.input.ResourceInput;
import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.input.StreamHelper;
import de.kosit.validationtool.impl.input.XdmNodeInput;
import net.sf.saxon.s9api.XdmNode;
/** /**
* Service zum Einlesen des Test-Objekts in den Speicher. Beim Einlesen wird gleichzeitig eine Prüfsumme ermittelt und * Service zum Einlesen des Test-Objekts in den Speicher. Beim Einlesen wird gleichzeitig eine Prüfsumme ermittelt und

5
src/main/java/de/kosit/validationtool/api/ResolvingConfigurationStrategy.java
View file

@ -16,14 +16,13 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import java.net.URI; import net.sf.saxon.lib.UnparsedTextURIResolver;
import javax.xml.transform.URIResolver; import javax.xml.transform.URIResolver;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator; import javax.xml.validation.Validator;
import java.net.URI;
import net.sf.saxon.lib.UnparsedTextURIResolver;
/** /**
* Centralized construction and configuration of XML related infrastructure components. This interface allows to use * Centralized construction and configuration of XML related infrastructure components. This interface allows to use

5
src/main/java/de/kosit/validationtool/api/Result.java
View file

@ -16,13 +16,12 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import java.util.List; import net.sf.saxon.s9api.XdmNode;
import org.oclc.purl.dsdl.svrl.FailedAssert; import org.oclc.purl.dsdl.svrl.FailedAssert;
import org.oclc.purl.dsdl.svrl.SchematronOutput; import org.oclc.purl.dsdl.svrl.SchematronOutput;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import net.sf.saxon.s9api.XdmNode; import java.util.List;
/** /**
* API result object holding various information of the validation process results. * API result object holding various information of the validation process results.

23
src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java
View file

@ -16,28 +16,25 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.cmd.assertions.AssertionType; import de.kosit.validationtool.cmd.assertions.AssertionType;
import de.kosit.validationtool.cmd.assertions.Assertions; import de.kosit.validationtool.cmd.assertions.Assertions;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XPathCompiler; import net.sf.saxon.s9api.XPathCompiler;
import net.sf.saxon.s9api.XPathSelector; import net.sf.saxon.s9api.XPathSelector;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* Überprüft den Report mittels bereitgestellter Assertions. Diese {@link CheckAction} dient der Überprüfung der von der * Überprüft den Report mittels bereitgestellter Assertions. Diese {@link CheckAction} dient der Überprüfung der von der

12
src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java
View file

@ -16,19 +16,17 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static de.kosit.validationtool.impl.Printer.writeErr; import de.kosit.validationtool.cmd.report.Line;
import static org.apache.commons.lang3.StringUtils.isNotEmpty; import de.kosit.validationtool.impl.Printer;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.fusesource.jansi.AnsiConsole; import org.fusesource.jansi.AnsiConsole;
import org.fusesource.jansi.AnsiRenderer.Code; import org.fusesource.jansi.AnsiRenderer.Code;
import de.kosit.validationtool.cmd.report.Line;
import de.kosit.validationtool.impl.Printer;
import picocli.CommandLine; import picocli.CommandLine;
import picocli.CommandLine.ParseResult; import picocli.CommandLine.ParseResult;
import static de.kosit.validationtool.impl.Printer.writeErr;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
/** /**
* Commandline interface of the validator. It parses the commandline args and hands over actual execution to * Commandline interface of the validator. It parses the commandline args and hands over actual execution to
* {@link Validator}. * {@link Validator}.

12
src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
View file

@ -16,22 +16,20 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.nio.file.Path; import de.kosit.validationtool.cmd.CommandLineApplication.Level;
import java.util.List;
import java.util.concurrent.Callable;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import de.kosit.validationtool.cmd.CommandLineApplication.Level;
import picocli.CommandLine.ArgGroup; import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command; import picocli.CommandLine.Command;
import picocli.CommandLine.Help.Visibility; import picocli.CommandLine.Help.Visibility;
import picocli.CommandLine.Option; import picocli.CommandLine.Option;
import picocli.CommandLine.Parameters; import picocli.CommandLine.Parameters;
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.Callable;
/** /**
* Commandline Interface definition. * Commandline Interface definition.
* *

9
src/main/java/de/kosit/validationtool/cmd/DefaultNamingStrategy.java
View file

@ -16,14 +16,13 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.apache.commons.io.FilenameUtils.isExtension; import lombok.Setter;
import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import lombok.Setter; import static org.apache.commons.io.FilenameUtils.isExtension;
import static org.apache.commons.lang3.StringUtils.isEmpty;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
/** /**
* A default {@link NamingStrategy} supporting prefix and postfix configurations for generating report names * A default {@link NamingStrategy} supporting prefix and postfix configurations for generating report names

10
src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java
View file

@ -16,14 +16,10 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.nio.file.Path;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.HtmlExtractor; import de.kosit.validationtool.impl.HtmlExtractor;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.QName; import net.sf.saxon.s9api.QName;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
@ -31,6 +27,8 @@ import net.sf.saxon.s9api.Serializer;
import net.sf.saxon.s9api.XdmItem; import net.sf.saxon.s9api.XdmItem;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import java.nio.file.Path;
/** /**
* Extrahiert HTML-Dokumente aus dem Report und persistiert diese im konfigurierten Ausgabe-Verzeichnis. * Extrahiert HTML-Dokumente aus dem Report und persistiert diese im konfigurierten Ausgabe-Verzeichnis.
* *

19
src/main/java/de/kosit/validationtool/cmd/InternalCheck.java
View file

@ -16,16 +16,6 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.io.PrintWriter;
import java.text.MessageFormat;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import org.fusesource.jansi.AnsiRenderer.Code;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.Result; import de.kosit.validationtool.api.Result;
@ -36,8 +26,15 @@ import de.kosit.validationtool.cmd.report.Justify;
import de.kosit.validationtool.cmd.report.Line; import de.kosit.validationtool.cmd.report.Line;
import de.kosit.validationtool.impl.DefaultCheck; import de.kosit.validationtool.impl.DefaultCheck;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import org.fusesource.jansi.AnsiRenderer.Code;
import java.io.PrintWriter;
import java.text.MessageFormat;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
/** /**
* Simple Erweiterung der Klasse {@link DefaultCheck} um das Ergebnis der Assertion-Prüfung auszuwerten und auszugeben. * Simple Erweiterung der Klasse {@link DefaultCheck} um das Ergebnis der Assertion-Prüfung auszuwerten und auszugeben.

4
src/main/java/de/kosit/validationtool/cmd/PrintMemoryStats.java
View file

@ -16,10 +16,10 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.text.NumberFormat;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.text.NumberFormat;
/** /**
* *
* Prints some memory usage information for debugging purposes. * Prints some memory usage information for debugging purposes.

10
src/main/java/de/kosit/validationtool/cmd/PrintReportAction.java
View file

@ -16,18 +16,16 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.io.StringWriter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.Printer; import de.kosit.validationtool.impl.Printer;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.Serializer; import net.sf.saxon.s9api.Serializer;
import java.io.StringWriter;
/** /**
* Gibt das Ergebnis-Document auf std-out aus. * Gibt das Ergebnis-Document auf std-out aus.
* *

8
src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java
View file

@ -16,17 +16,15 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.nio.file.Path; import de.kosit.validationtool.impl.tasks.CheckAction;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.tasks.CheckAction;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.Serializer; import net.sf.saxon.s9api.Serializer;
import java.nio.file.Path;
/** /**
* Schreibt das Prüfergebnis als XML-Dokument an eine definierte Stelle. * Schreibt das Prüfergebnis als XML-Dokument an eine definierte Stelle.
* *

11
src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java
View file

@ -16,15 +16,14 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import java.io.IOException; import de.kosit.validationtool.impl.ConversionService;
import java.nio.file.Files; import de.kosit.validationtool.impl.tasks.CheckAction;
import java.nio.file.Path;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ConversionService; import java.io.IOException;
import de.kosit.validationtool.impl.tasks.CheckAction; import java.nio.file.Files;
import java.nio.file.Path;
/** /**
* Serializes the {@link de.kosit.validationtool.model.reportInput.CreateReportInput report input} document. * Serializes the {@link de.kosit.validationtool.model.reportInput.CreateReportInput report input} document.

13
src/main/java/de/kosit/validationtool/cmd/TypeConverter.java
View file

@ -16,19 +16,18 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.apache.commons.lang3.StringUtils.defaultIfBlank; import de.kosit.validationtool.cmd.CommandLineOptions.Definition;
import de.kosit.validationtool.cmd.CommandLineOptions.RepositoryDefinition;
import de.kosit.validationtool.cmd.CommandLineOptions.ScenarioDefinition;
import de.kosit.validationtool.impl.ScenarioRepository;
import picocli.CommandLine.ITypeConverter;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import de.kosit.validationtool.cmd.CommandLineOptions.Definition; import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import de.kosit.validationtool.cmd.CommandLineOptions.RepositoryDefinition;
import de.kosit.validationtool.cmd.CommandLineOptions.ScenarioDefinition;
import de.kosit.validationtool.impl.ScenarioRepository;
import picocli.CommandLine.ITypeConverter;
/** /**
* Custom type converters for dealing with command line input. * Custom type converters for dealing with command line input.

45
src/main/java/de/kosit/validationtool/cmd/Validator.java
View file

@ -16,29 +16,6 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
import static org.apache.commons.lang3.StringUtils.EMPTY;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.fusesource.jansi.AnsiRenderer.Code;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
@ -55,8 +32,28 @@ import de.kosit.validationtool.impl.EngineInformation;
import de.kosit.validationtool.impl.Printer; import de.kosit.validationtool.impl.Printer;
import de.kosit.validationtool.impl.ScenarioRepository; import de.kosit.validationtool.impl.ScenarioRepository;
import de.kosit.validationtool.impl.xml.ProcessorProvider; import de.kosit.validationtool.impl.xml.ProcessorProvider;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import org.fusesource.jansi.AnsiRenderer.Code;
import java.io.IOException;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
import static org.apache.commons.lang3.StringUtils.EMPTY;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
/** /**
* Actual evaluation and processing of CommandLineOptions argumtens. * Actual evaluation and processing of CommandLineOptions argumtens.

9
src/main/java/de/kosit/validationtool/cmd/report/Format.java
View file

@ -16,6 +16,10 @@
package de.kosit.validationtool.cmd.report; package de.kosit.validationtool.cmd.report;
import lombok.Getter;
import org.apache.commons.lang3.ArrayUtils;
import org.fusesource.jansi.AnsiRenderer.Code;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
@ -25,11 +29,6 @@ import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.ArrayUtils;
import org.fusesource.jansi.AnsiRenderer.Code;
import lombok.Getter;
/** /**
* Simple value holder for ansi formatting codes. * Simple value holder for ansi formatting codes.
* *

12
src/main/java/de/kosit/validationtool/cmd/report/Grid.java
View file

@ -16,6 +16,11 @@
package de.kosit.validationtool.cmd.report; package de.kosit.validationtool.cmd.report;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.fusesource.jansi.AnsiRenderer.Code;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -23,13 +28,6 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.fusesource.jansi.AnsiRenderer.Code;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/** /**
* An text based grid for cli based programs. * An text based grid for cli based programs.

9
src/main/java/de/kosit/validationtool/cmd/report/Line.java
View file

@ -16,14 +16,13 @@
package de.kosit.validationtool.cmd.report; package de.kosit.validationtool.cmd.report;
import java.util.ArrayList; import lombok.NoArgsConstructor;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.fusesource.jansi.AnsiRenderer.Code; import org.fusesource.jansi.AnsiRenderer.Code;
import lombok.NoArgsConstructor; import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/** /**
* Helper for printing a colored lines (with newline at the end) to the console. * Helper for printing a colored lines (with newline at the end) to the console.

5
src/main/java/de/kosit/validationtool/cmd/report/Text.java
View file

@ -16,12 +16,11 @@
package de.kosit.validationtool.cmd.report; package de.kosit.validationtool.cmd.report;
import java.util.Arrays; import lombok.Getter;
import org.fusesource.jansi.AnsiRenderer; import org.fusesource.jansi.AnsiRenderer;
import org.fusesource.jansi.AnsiRenderer.Code; import org.fusesource.jansi.AnsiRenderer.Code;
import lombok.Getter; import java.util.Arrays;
/** /**
* Ansi formatted text for outputting to the console. * Ansi formatted text for outputting to the console.

40
src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java
View file

@ -16,8 +16,24 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static de.kosit.validationtool.impl.DateFactory.createTimestamp; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.ResolvingMode;
import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.scenarios.DescriptionType;
import de.kosit.validationtool.model.scenarios.NoScenarioReportType;
import de.kosit.validationtool.model.scenarios.ObjectFactory;
import de.kosit.validationtool.model.scenarios.Scenarios;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.StringUtils;
import javax.xml.validation.Schema;
import java.net.URI; import java.net.URI;
import java.nio.file.Path; import java.nio.file.Path;
import java.time.LocalDate; import java.time.LocalDate;
@ -29,27 +45,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.xml.validation.Schema; import static de.kosit.validationtool.impl.DateFactory.createTimestamp;
import org.apache.commons.lang3.NotImplementedException;
import org.apache.commons.lang3.StringUtils;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.ResolvingMode;
import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.scenarios.DescriptionType;
import de.kosit.validationtool.model.scenarios.NoScenarioReportType;
import de.kosit.validationtool.model.scenarios.ObjectFactory;
import de.kosit.validationtool.model.scenarios.Scenarios;
import net.sf.saxon.s9api.Processor;
/** /**
* Implements a builder style creation of a {@link Configuration}. * Implements a builder style creation of a {@link Configuration}.

31
src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java
View file

@ -16,22 +16,6 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static org.apache.commons.lang3.StringUtils.startsWith;
import java.net.MalformedURLException;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.xml.validation.Schema;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Check; import de.kosit.validationtool.api.Check;
import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
@ -49,12 +33,25 @@ import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ScenarioType; import de.kosit.validationtool.model.scenarios.ScenarioType;
import de.kosit.validationtool.model.scenarios.Scenarios; import de.kosit.validationtool.model.scenarios.Scenarios;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.QName; import net.sf.saxon.s9api.QName;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import net.sf.saxon.s9api.XdmNodeKind; import net.sf.saxon.s9api.XdmNodeKind;
import javax.xml.validation.Schema;
import java.net.MalformedURLException;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static org.apache.commons.lang3.StringUtils.startsWith;
/** /**
* Configuration class that loads necessary {@link Check} configuration from an existing scenario.xml specification. * Configuration class that loads necessary {@link Check} configuration from an existing scenario.xml specification.
* This is the recommended option when an official configuration exists as is the case with 'xrechnung'. * This is the recommended option when an official configuration exists as is the case with 'xrechnung'.

11
src/main/java/de/kosit/validationtool/config/DefaultConfiguration.java
View file

@ -16,17 +16,16 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import java.util.List; import de.kosit.validationtool.api.Configuration;
import java.util.Map; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Scenario;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration; import java.util.List;
import de.kosit.validationtool.impl.ContentRepository; import java.util.Map;
import de.kosit.validationtool.impl.Scenario;
/** /**
* Default implementation class for {@link Configuration}. This class contains all information to run a * Default implementation class for {@link Configuration}. This class contains all information to run a

9
src/main/java/de/kosit/validationtool/config/FallbackBuilder.java
View file

@ -16,17 +16,16 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import java.net.URI;
import java.nio.file.Path;
import org.apache.commons.lang3.tuple.Pair;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.scenarios.CreateReportType; import de.kosit.validationtool.model.scenarios.CreateReportType;
import de.kosit.validationtool.model.scenarios.ScenarioType; import de.kosit.validationtool.model.scenarios.ScenarioType;
import org.apache.commons.lang3.tuple.Pair;
import java.net.URI;
import java.nio.file.Path;
/** /**
* Create a fallback {@link Scenario} configuration. * Create a fallback {@link Scenario} configuration.

21
src/main/java/de/kosit/validationtool/config/ReportBuilder.java
View file

@ -16,24 +16,21 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
import java.net.URI;
import java.nio.file.Path;
import java.util.Collections;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.scenarios.CreateReportType; import de.kosit.validationtool.model.scenarios.CreateReportType;
import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ResourceType;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.XsltExecutable; import net.sf.saxon.s9api.XsltExecutable;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import java.net.URI;
import java.nio.file.Path;
import java.util.Collections;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
/** /**
* Builder style configuration for the report transformation. * Builder style configuration for the report transformation.

34
src/main/java/de/kosit/validationtool/config/ScenarioBuilder.java
View file

@ -16,24 +16,6 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.xml.validation.Schema;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.Scenario.Transformation;
@ -45,8 +27,22 @@ import de.kosit.validationtool.model.scenarios.ObjectFactory;
import de.kosit.validationtool.model.scenarios.ScenarioType; import de.kosit.validationtool.model.scenarios.ScenarioType;
import de.kosit.validationtool.model.scenarios.ValidateWithSchematron; import de.kosit.validationtool.model.scenarios.ValidateWithSchematron;
import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema; import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.XPathExecutable; import net.sf.saxon.s9api.XPathExecutable;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import javax.xml.validation.Schema;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
/** /**
* Builder for {@link Scenario} configuration. * Builder for {@link Scenario} configuration.

23
src/main/java/de/kosit/validationtool/config/SchemaBuilder.java
View file

@ -16,23 +16,20 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
import java.net.URI;
import java.nio.file.Path;
import java.util.Collections;
import javax.xml.validation.Schema;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema; import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import javax.xml.validation.Schema;
import java.net.URI;
import java.nio.file.Path;
import java.util.Collections;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
/** /**
* Builder for Schema validation configuration. * Builder for Schema validation configuration.

21
src/main/java/de/kosit/validationtool/config/SchematronBuilder.java
View file

@ -16,24 +16,21 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
import java.net.URI;
import java.nio.file.Path;
import java.util.Collections;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ValidateWithSchematron; import de.kosit.validationtool.model.scenarios.ValidateWithSchematron;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.XsltExecutable; import net.sf.saxon.s9api.XsltExecutable;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import java.net.URI;
import java.nio.file.Path;
import java.util.Collections;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
/** /**
* Builder for schematron validation configuration. * Builder for schematron validation configuration.

25
src/main/java/de/kosit/validationtool/config/XPathBuilder.java
View file

@ -16,7 +16,16 @@
package de.kosit.validationtool.config; package de.kosit.validationtool.config;
import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.model.Result;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.XPathExecutable;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -24,19 +33,7 @@ import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.stream.StreamSupport; import java.util.stream.StreamSupport;
import org.apache.commons.lang3.ArrayUtils; import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
import org.apache.commons.lang3.StringUtils;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.model.Result;
import net.sf.saxon.s9api.XPathExecutable;
/** /**
* Internal class to represent xpath configuration. * Internal class to represent xpath configuration.

6
src/main/java/de/kosit/validationtool/daemon/BaseHandler.java
View file

@ -16,12 +16,12 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import java.io.IOException;
import java.io.OutputStream;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpHandler;
import java.io.IOException;
import java.io.OutputStream;
/** /**
* Simple base implemenation for http handlers. Doing I/O stuff. * Simple base implemenation for http handlers. Doing I/O stuff.
* *

22
src/main/java/de/kosit/validationtool/daemon/CheckHandler.java
View file

@ -16,28 +16,24 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URI;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.lang3.StringUtils;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Check; import de.kosit.validationtool.api.Check;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.api.Result; import de.kosit.validationtool.api.Result;
import de.kosit.validationtool.impl.input.SourceInput; import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.input.StreamHelper; import de.kosit.validationtool.impl.input.StreamHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.Serializer; import net.sf.saxon.s9api.Serializer;
import org.apache.commons.lang3.StringUtils;
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URI;
import java.util.concurrent.atomic.AtomicLong;
/** /**
* Wir benötigen einen Handler, der zur Verarbeitung von HTTP-Anforderungen aufgerufen wird um hier die Verarbeitung des * Wir benötigen einen Handler, der zur Verarbeitung von HTTP-Anforderungen aufgerufen wird um hier die Verarbeitung des

21
src/main/java/de/kosit/validationtool/daemon/ConfigHandler.java
View file

@ -16,6 +16,15 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import com.sun.net.httpserver.HttpExchange;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.config.Keys;
import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.model.scenarios.Scenarios;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Reader; import java.io.Reader;
@ -24,18 +33,6 @@ import java.net.URI;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import org.apache.commons.io.IOUtils;
import com.sun.net.httpserver.HttpExchange;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.config.Keys;
import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.model.scenarios.Scenarios;
/** /**
* Handler that returns the actual configuration used for this daemon instance. * Handler that returns the actual configuration used for this daemon instance.
* *

27
src/main/java/de/kosit/validationtool/daemon/Daemon.java
View file

@ -16,27 +16,24 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import static de.kosit.validationtool.impl.Printer.writeOut; import com.sun.net.httpserver.HttpHandler;
import static org.apache.commons.lang3.StringUtils.defaultIfBlank; import com.sun.net.httpserver.HttpServer;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.DefaultCheck;
import de.kosit.validationtool.model.daemon.HealthType;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor;
import java.io.IOException; import java.io.IOException;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import com.sun.net.httpserver.HttpHandler; import static de.kosit.validationtool.impl.Printer.writeOut;
import com.sun.net.httpserver.HttpServer; import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.DefaultCheck;
import de.kosit.validationtool.model.daemon.HealthType;
import net.sf.saxon.s9api.Processor;
/** /**
* HTTP-Daemon für die Bereitstellung der Prüf-Funktionalität via http. * HTTP-Daemon für die Bereitstellung der Prüf-Funktionalität via http.

12
src/main/java/de/kosit/validationtool/daemon/GuiHandler.java
View file

@ -16,18 +16,16 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import com.sun.net.httpserver.HttpExchange;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.IOUtils;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.util.Arrays; import java.util.Arrays;
import org.apache.commons.io.IOUtils;
import com.sun.net.httpserver.HttpExchange;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
public class GuiHandler extends BaseHandler { public class GuiHandler extends BaseHandler {
private static final URL INDEX_HTML = GuiHandler.class.getClassLoader().getResource("ui/index.html"); private static final URL INDEX_HTML = GuiHandler.class.getClassLoader().getResource("ui/index.html");

12
src/main/java/de/kosit/validationtool/daemon/HealthHandler.java
View file

@ -16,20 +16,18 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import java.io.IOException;
import java.util.List;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.EngineInformation; import de.kosit.validationtool.impl.EngineInformation;
import de.kosit.validationtool.model.daemon.ApplicationType; import de.kosit.validationtool.model.daemon.ApplicationType;
import de.kosit.validationtool.model.daemon.HealthType; import de.kosit.validationtool.model.daemon.HealthType;
import de.kosit.validationtool.model.daemon.MemoryType; import de.kosit.validationtool.model.daemon.MemoryType;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.util.List;
/** /**
* Handler that implements a simple health check. Useful for monitoring the service. * Handler that implements a simple health check. Useful for monitoring the service.

5
src/main/java/de/kosit/validationtool/daemon/RoutingHandler.java
View file

@ -16,12 +16,11 @@
package de.kosit.validationtool.daemon; package de.kosit.validationtool.daemon;
import java.io.IOException;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import java.io.IOException;
/** /**
* A simple handler which routes between the {@link CheckHandler} and the {@link GuiHandler} depending on the request. * A simple handler which routes between the {@link CheckHandler} and the {@link GuiHandler} depending on the request.
*/ */

27
src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java
View file

@ -16,28 +16,23 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.util.ArrayList; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import java.util.Collection; import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity;
import java.util.StringJoiner;
import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.ValidationEvent;
import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.ValidationEventHandler;
import javax.xml.transform.ErrorListener; import lombok.Getter;
import javax.xml.transform.SourceLocator; import net.sf.saxon.s9api.MessageListener;
import javax.xml.transform.TransformerException; import net.sf.saxon.s9api.XdmNode;
import org.xml.sax.ErrorHandler; import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException; import org.xml.sax.SAXParseException;
import lombok.Getter; import javax.xml.transform.ErrorListener;
import javax.xml.transform.SourceLocator;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import javax.xml.transform.TransformerException;
import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity; import java.util.ArrayList;
import java.util.Collection;
import net.sf.saxon.s9api.MessageListener; import java.util.StringJoiner;
import net.sf.saxon.s9api.QName;
import net.sf.saxon.s9api.XdmNode;
/** /**
* Sammelt Fehler-Ereignisinformation beim Schema-Validieren und weiteren XML-basierten Aktionen * Sammelt Fehler-Ereignisinformation beim Schema-Validieren und weiteren XML-basierten Aktionen

58
src/main/java/de/kosit/validationtool/impl/ContentRepository.java
View file

@ -16,6 +16,33 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.impl.xml.RelativeUriResolver;
import de.kosit.validationtool.impl.xml.StringTrimAdapter;
import de.kosit.validationtool.model.scenarios.NamespaceType;
import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ScenarioType;
import de.kosit.validationtool.model.scenarios.ValidateWithSchematron;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XPathCompiler;
import net.sf.saxon.s9api.XPathExecutable;
import net.sf.saxon.s9api.XsltCompiler;
import net.sf.saxon.s9api.XsltExecutable;
import org.apache.commons.lang3.StringUtils;
import org.xml.sax.SAXException;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URI; import java.net.URI;
@ -27,37 +54,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import org.apache.commons.lang3.StringUtils;
import org.xml.sax.SAXException;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.impl.xml.RelativeUriResolver;
import de.kosit.validationtool.impl.xml.StringTrimAdapter;
import de.kosit.validationtool.model.scenarios.NamespaceType;
import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ScenarioType;
import de.kosit.validationtool.model.scenarios.ValidateWithSchematron;
import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XPathCompiler;
import net.sf.saxon.s9api.XPathExecutable;
import net.sf.saxon.s9api.XsltCompiler;
import net.sf.saxon.s9api.XsltExecutable;
/** /**
* Repository für verschiedene XML Artefakte zur Vearbeitung der Prüfszenarien. * Repository für verschiedene XML Artefakte zur Vearbeitung der Prüfszenarien.
* *

22
src/main/java/de/kosit/validationtool/impl/ConversionService.java
View file

@ -16,14 +16,6 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.io.IOException;
import java.io.StringWriter;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.StringJoiner;
import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.JAXBException;
@ -32,6 +24,9 @@ import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.ValidationEventHandler; import jakarta.xml.bind.ValidationEventHandler;
import jakarta.xml.bind.annotation.XmlRegistry; import jakarta.xml.bind.annotation.XmlRegistry;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javax.xml.namespace.QName; import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLOutputFactory;
@ -41,10 +36,13 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import java.io.IOException;
import org.apache.commons.lang3.StringUtils; import java.io.StringWriter;
import java.net.URI;
import lombok.extern.slf4j.Slf4j; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.StringJoiner;
/** /**
* JAXB Conversion Utility. * JAXB Conversion Utility.

7
src/main/java/de/kosit/validationtool/impl/DateFactory.java
View file

@ -16,13 +16,12 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.util.Date; import lombok.SneakyThrows;
import java.util.GregorianCalendar;
import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import java.util.Date;
import lombok.SneakyThrows; import java.util.GregorianCalendar;
/** /**
* @author Andreas Penski * @author Andreas Penski

26
src/main/java/de/kosit/validationtool/impl/DefaultCheck.java
View file

@ -16,19 +16,6 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import static de.kosit.validationtool.impl.DateFactory.createTimestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Check; import de.kosit.validationtool.api.Check;
import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
@ -48,9 +35,20 @@ import de.kosit.validationtool.impl.xml.ProcessorProvider;
import de.kosit.validationtool.model.reportInput.CreateReportInput; import de.kosit.validationtool.model.reportInput.CreateReportInput;
import de.kosit.validationtool.model.reportInput.EngineType; import de.kosit.validationtool.model.reportInput.EngineType;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static de.kosit.validationtool.impl.DateFactory.createTimestamp;
/** /**
* The reference implementation for the validation process. After initialisation, instances are threadsafe and should be * The reference implementation for the validation process. After initialisation, instances are threadsafe and should be
* reused since initializing saxon runtime objects is an rather heavyweight process. * reused since initializing saxon runtime objects is an rather heavyweight process.

27
src/main/java/de/kosit/validationtool/impl/DefaultResult.java
View file

@ -16,26 +16,23 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.util.Collections; import de.kosit.validationtool.api.AcceptRecommendation;
import java.util.List; import de.kosit.validationtool.api.Result;
import java.util.stream.Collectors; import de.kosit.validationtool.api.XmlError;
import de.kosit.validationtool.model.reportInput.CreateReportInput;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.s9api.XdmNode;
import org.oclc.purl.dsdl.svrl.FailedAssert; import org.oclc.purl.dsdl.svrl.FailedAssert;
import org.oclc.purl.dsdl.svrl.SchematronOutput; import org.oclc.purl.dsdl.svrl.SchematronOutput;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import lombok.AccessLevel; import java.util.Collections;
import lombok.Getter; import java.util.List;
import lombok.Setter; import java.util.stream.Collectors;
import de.kosit.validationtool.api.AcceptRecommendation;
import de.kosit.validationtool.api.Result;
import de.kosit.validationtool.api.XmlError;
import de.kosit.validationtool.model.reportInput.CreateReportInput;
import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.s9api.XdmNode;
/** /**
* Das Default-{@link Result} für die Rückgabe in der API * Das Default-{@link Result} für die Rückgabe in der API

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

@ -16,17 +16,7 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.Element;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import net.sf.saxon.dom.NodeOverNodeInfo; import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
@ -36,6 +26,14 @@ import net.sf.saxon.s9api.XPathExecutable;
import net.sf.saxon.s9api.XPathSelector; import net.sf.saxon.s9api.XPathSelector;
import net.sf.saxon.s9api.XdmItem; import net.sf.saxon.s9api.XdmItem;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.Element;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* Funktion zum Extrahieren von HTML-Artefakten / Knoten aus einem XML-Dokument. * Funktion zum Extrahieren von HTML-Artefakten / Knoten aus einem XML-Dokument.

5
src/main/java/de/kosit/validationtool/impl/ResolvingMode.java
View file

@ -16,13 +16,12 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.xml.RemoteResolvingStrategy; import de.kosit.validationtool.impl.xml.RemoteResolvingStrategy;
import de.kosit.validationtool.impl.xml.StrictLocalResolvingStrategy; import de.kosit.validationtool.impl.xml.StrictLocalResolvingStrategy;
import de.kosit.validationtool.impl.xml.StrictRelativeResolvingStrategy; import de.kosit.validationtool.impl.xml.StrictRelativeResolvingStrategy;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
/** /**
* Defines how artefacts are resolved internally. * Defines how artefacts are resolved internally.

21
src/main/java/de/kosit/validationtool/impl/Scenario.java
View file

@ -16,27 +16,24 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.util.Collections; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import java.util.List; import de.kosit.validationtool.model.scenarios.ResourceType;
import java.util.Optional; import de.kosit.validationtool.model.scenarios.ScenarioType;
import javax.xml.transform.URIResolver;
import javax.xml.validation.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ScenarioType;
import net.sf.saxon.lib.UnparsedTextURIResolver; import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.s9api.XPathExecutable; import net.sf.saxon.s9api.XPathExecutable;
import net.sf.saxon.s9api.XPathSelector; import net.sf.saxon.s9api.XPathSelector;
import net.sf.saxon.s9api.XsltExecutable; import net.sf.saxon.s9api.XsltExecutable;
import javax.xml.transform.URIResolver;
import javax.xml.validation.Schema;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
/** /**
* @author Andreas Penski * @author Andreas Penski
*/ */

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

@ -16,20 +16,18 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.impl.model.Result;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XPathSelector;
import net.sf.saxon.s9api.XdmNode;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.impl.model.Result;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XPathSelector;
import net.sf.saxon.s9api.XdmNode;
/** /**
* Repository for die aktiven Szenario einer Prüfinstanz. * Repository for die aktiven Szenario einer Prüfinstanz.
* *

14
src/main/java/de/kosit/validationtool/impl/SchemaProvider.java
View file

@ -16,19 +16,17 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import java.io.IOException; import de.kosit.validationtool.impl.xml.ClassPathResourceResolver;
import java.net.URISyntaxException; import org.w3c.dom.ls.LSResourceResolver;
import java.net.URL; import org.xml.sax.SAXException;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import java.io.IOException;
import org.w3c.dom.ls.LSResourceResolver; import java.net.URISyntaxException;
import org.xml.sax.SAXException; import java.net.URL;
import de.kosit.validationtool.impl.xml.ClassPathResourceResolver;
/** /**
* @author Andreas Penski * @author Andreas Penski

11
src/main/java/de/kosit/validationtool/impl/input/AbstractInput.java
View file

@ -16,16 +16,15 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import static de.kosit.validationtool.impl.input.StreamHelper.drain; import de.kosit.validationtool.api.Input;
import java.io.IOException;
import java.io.InputStream;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Input; import java.io.IOException;
import java.io.InputStream;
import static de.kosit.validationtool.impl.input.StreamHelper.drain;
/** /**
* Base class for all {@link Input Inputs}. * Base class for all {@link Input Inputs}.

11
src/main/java/de/kosit/validationtool/impl/input/ByteArrayInput.java
View file

@ -16,15 +16,14 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import java.io.ByteArrayInputStream; import lombok.AllArgsConstructor;
import java.io.IOException; import lombok.Getter;
import java.io.InputStream;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import java.io.ByteArrayInputStream;
import lombok.AllArgsConstructor; import java.io.IOException;
import lombok.Getter; import java.io.InputStream;
/** /**
* Classical in-memory {@link de.kosit.validationtool.api.Input}. It is not memory efficient to read the whole file into * Classical in-memory {@link de.kosit.validationtool.api.Input}. It is not memory efficient to read the whole file into

4
src/main/java/de/kosit/validationtool/impl/input/LazyReadInput.java
View file

@ -16,10 +16,10 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import java.io.InputStream;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import java.io.InputStream;
/** /**
* Internal interface used for lazy generation of the hashcode for document identification. * Internal interface used for lazy generation of the hashcode for document identification.
* *

14
src/main/java/de/kosit/validationtool/impl/input/ResourceInput.java
View file

@ -16,19 +16,17 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import de.kosit.validationtool.api.Input;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import de.kosit.validationtool.api.Input;
/** /**
* An {@link Input} carries an {@link URL} which can be used for all 'locatable' inputs such as {@link File}, * An {@link Input} carries an {@link URL} which can be used for all 'locatable' inputs such as {@link File},
* {@link java.nio.file.Path} and any other {@link URL}. * {@link java.nio.file.Path} and any other {@link URL}.

19
src/main/java/de/kosit/validationtool/impl/input/SourceInput.java
View file

@ -16,22 +16,19 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import java.io.IOException;
import java.nio.charset.Charset;
import jakarta.xml.bind.util.JAXBSource; import jakarta.xml.bind.util.JAXBSource;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.om.TreeInfo;
import org.apache.commons.io.input.ReaderInputStream;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource; import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import java.io.IOException;
import java.nio.charset.Charset;
import org.apache.commons.io.input.ReaderInputStream; import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.om.TreeInfo;
/** /**
* A validator {@link de.kosit.validationtool.api.Input} based on a {@link Source}. * A validator {@link de.kosit.validationtool.api.Input} based on a {@link Source}.

10
src/main/java/de/kosit/validationtool/impl/input/StreamHelper.java
View file

@ -16,6 +16,10 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import de.kosit.validationtool.api.Input;
import org.apache.commons.io.input.BoundedInputStream;
import javax.xml.transform.stream.StreamSource;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.FilterInputStream; import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
@ -24,12 +28,6 @@ import java.security.DigestInputStream;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import javax.xml.transform.stream.StreamSource;
import org.apache.commons.io.input.BoundedInputStream;
import de.kosit.validationtool.api.Input;
/** /**
* Helper for stream handling. * Helper for stream handling.
* *

8
src/main/java/de/kosit/validationtool/impl/input/XdmNodeInput.java
View file

@ -16,15 +16,13 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import javax.xml.transform.Source; import de.kosit.validationtool.api.Input;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import de.kosit.validationtool.api.Input;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import javax.xml.transform.Source;
/** /**
* An {@link Input} implementation holding saxon's {@link XdmNode} object. * An {@link Input} implementation holding saxon's {@link XdmNode} object.
* *

8
src/main/java/de/kosit/validationtool/impl/model/BaseOutput.java
View file

@ -16,15 +16,15 @@
package de.kosit.validationtool.impl.model; package de.kosit.validationtool.impl.model;
import org.oclc.purl.dsdl.svrl.ActivePattern;
import org.oclc.purl.dsdl.svrl.FailedAssert;
import org.oclc.purl.dsdl.svrl.FiredRule;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.oclc.purl.dsdl.svrl.ActivePattern;
import org.oclc.purl.dsdl.svrl.FailedAssert;
import org.oclc.purl.dsdl.svrl.FiredRule;
/** /**
* Basis-Klasse um spezifische Erweiterungen an der generierten Klasse {@link org.oclc.purl.dsdl.svrl.SchematronOutput} * Basis-Klasse um spezifische Erweiterungen an der generierten Klasse {@link org.oclc.purl.dsdl.svrl.SchematronOutput}
* umzusetzen. * umzusetzen.

3
src/main/java/de/kosit/validationtool/impl/model/BaseXMLSyntaxError.java
View file

@ -16,10 +16,9 @@
package de.kosit.validationtool.impl.model; package de.kosit.validationtool.impl.model;
import org.slf4j.Logger;
import de.kosit.validationtool.api.XmlError; import de.kosit.validationtool.api.XmlError;
import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity; import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity;
import org.slf4j.Logger;
/** /**
* Basis-Klasse für Syntax-Error. Wird über die JAXB-generierte Klasse * Basis-Klasse für Syntax-Error. Wird über die JAXB-generierte Klasse

8
src/main/java/de/kosit/validationtool/impl/model/Result.java
View file

@ -16,14 +16,14 @@
package de.kosit.validationtool.impl.model; package de.kosit.validationtool.impl.model;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
/** /**
* Ein Ergebnisobjekt, dass das eigentliche Ergebnis hält und optional auch verschiedene Fehlerobjekte. * Ein Ergebnisobjekt, dass das eigentliche Ergebnis hält und optional auch verschiedene Fehlerobjekte.
* *

17
src/main/java/de/kosit/validationtool/impl/tasks/CheckAction.java
View file

@ -16,15 +16,6 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.util.Collection;
import java.util.Collections;
import org.apache.commons.io.FilenameUtils;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import de.kosit.validationtool.api.AcceptRecommendation; import de.kosit.validationtool.api.AcceptRecommendation;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
@ -32,8 +23,14 @@ import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.CreateReportInput; import de.kosit.validationtool.model.reportInput.CreateReportInput;
import de.kosit.validationtool.model.reportInput.ProcessingError; import de.kosit.validationtool.model.reportInput.ProcessingError;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.apache.commons.io.FilenameUtils;
import java.util.Collection;
import java.util.Collections;
/** /**
* Interface, welches von allen Prüfschritten implementiert wird. Der Parameter vom Typ {@link Bag} dient dabei sowohl * Interface, welches von allen Prüfschritten implementiert wird. Der Parameter vom Typ {@link Bag} dient dabei sowohl

11
src/main/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceAction.java
View file

@ -16,17 +16,14 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.util.Optional; import de.kosit.validationtool.api.AcceptRecommendation;
import org.oclc.purl.dsdl.svrl.FailedAssert;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.AcceptRecommendation;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XPathSelector; import net.sf.saxon.s9api.XPathSelector;
import org.oclc.purl.dsdl.svrl.FailedAssert;
import java.util.Optional;
/** /**
* Computes a {@link AcceptRecommendation} for this instance. This is either based on an 'acceptMatch'-configuration of * Computes a {@link AcceptRecommendation} for this instance. This is either based on an 'acceptMatch'-configuration of

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

@ -16,33 +16,16 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.io.IOException;
import java.util.Collection;
import java.util.stream.Collectors;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.util.JAXBSource;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.CollectingErrorEventHandler; import de.kosit.validationtool.impl.CollectingErrorEventHandler;
import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.EngineInformation; import de.kosit.validationtool.impl.EngineInformation;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.util.JAXBSource;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.DocumentBuilder; import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.QName; import net.sf.saxon.s9api.QName;
@ -53,6 +36,19 @@ import net.sf.saxon.s9api.XsltExecutable;
import net.sf.saxon.s9api.XsltTransformer; import net.sf.saxon.s9api.XsltTransformer;
import net.sf.saxon.sapling.SaplingDocument; import net.sf.saxon.sapling.SaplingDocument;
import net.sf.saxon.sapling.Saplings; import net.sf.saxon.sapling.Saplings;
import org.xml.sax.ContentHandler;
import org.xml.sax.DTDHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
import java.io.IOException;
import java.util.Collection;
import java.util.stream.Collectors;
/** /**
* Erzeugt den Report auf Basis der gesammelten Informationen über den Prüfling. Sollte kein Szenario identifiziert * Erzeugt den Report auf Basis der gesammelten Informationen über den Prüfling. Sollte kein Szenario identifiziert

14
src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java
View file

@ -16,25 +16,23 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.io.IOException;
import java.util.Collections;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.impl.input.XdmNodeInput; import de.kosit.validationtool.impl.input.XdmNodeInput;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.ValidationResultsWellformedness; import de.kosit.validationtool.model.reportInput.ValidationResultsWellformedness;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity; import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.DocumentBuilder; import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import java.io.IOException;
import java.util.Collections;
import java.util.stream.Collectors;
/** /**
* Setzt Parsing-Funktionalitäten um. Prüft auf well-formedness * Setzt Parsing-Funktionalitäten um. Prüft auf well-formedness
* *

6
src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java
View file

@ -16,14 +16,12 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.ScenarioRepository; import de.kosit.validationtool.impl.ScenarioRepository;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.CreateReportInput; import de.kosit.validationtool.model.reportInput.CreateReportInput;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
/** /**

40
src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java
View file

@ -16,27 +16,6 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Validator;
import org.apache.commons.io.FileUtils;
import org.xml.sax.SAXException;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.impl.CollectingErrorEventHandler; import de.kosit.validationtool.impl.CollectingErrorEventHandler;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
@ -45,11 +24,28 @@ import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.CreateReportInput; import de.kosit.validationtool.model.reportInput.CreateReportInput;
import de.kosit.validationtool.model.reportInput.ValidationResultsXmlSchema; import de.kosit.validationtool.model.reportInput.ValidationResultsXmlSchema;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.Serializer; import net.sf.saxon.s9api.Serializer;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.apache.commons.io.FileUtils;
import org.xml.sax.SAXException;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Validator;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
/** /**
* Schema valiation of the {@link Input} with the schema of the supplied scenario. This implementation is based on JDK * Schema valiation of the {@link Input} with the schema of the supplied scenario. This implementation is based on JDK

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

@ -16,16 +16,6 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.util.List;
import java.util.stream.Collectors;
import javax.xml.transform.dom.DOMSource;
import org.oclc.purl.dsdl.svrl.SchematronOutput;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.CollectingErrorEventHandler; import de.kosit.validationtool.impl.CollectingErrorEventHandler;
import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
@ -33,12 +23,18 @@ import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.model.reportInput.CreateReportInput; import de.kosit.validationtool.model.reportInput.CreateReportInput;
import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron; import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron;
import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron.Results; import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron.Results;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.dom.NodeOverNodeInfo; import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmDestination; import net.sf.saxon.s9api.XdmDestination;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import net.sf.saxon.s9api.XsltTransformer; import net.sf.saxon.s9api.XsltTransformer;
import org.oclc.purl.dsdl.svrl.SchematronOutput;
import javax.xml.transform.dom.DOMSource;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* Ausführung von konfigurierten Schematron Validierungen eines Szenarios. * Ausführung von konfigurierten Schematron Validierungen eines Szenarios.

12
src/main/java/de/kosit/validationtool/impl/tasks/ValidateReportInputAction.java
View file

@ -16,17 +16,15 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import javax.xml.validation.Schema;
import org.apache.commons.lang3.StringUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.impl.CollectingErrorEventHandler; import de.kosit.validationtool.impl.CollectingErrorEventHandler;
import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import javax.xml.validation.Schema;
/** /**
* Validiert die gesammelten Informationen über den Prüfling. Zusätzlich Check. * Validiert die gesammelten Informationen über den Prüfling. Zusätzlich Check.

10
src/main/java/de/kosit/validationtool/impl/xml/BaseResolvingStrategy.java
View file

@ -16,17 +16,15 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import static java.lang.String.format; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import lombok.extern.slf4j.Slf4j;
import org.xml.sax.SAXException;
import javax.xml.XMLConstants; import javax.xml.XMLConstants;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator; import javax.xml.validation.Validator;
import org.xml.sax.SAXException; import static java.lang.String.format;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
/** /**
* @author Andreas Penski * @author Andreas Penski

17
src/main/java/de/kosit/validationtool/impl/xml/ClassPathResourceResolver.java
View file

@ -16,21 +16,20 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.Reader; import java.io.Reader;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import org.apache.commons.lang3.StringUtils;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
/** /**
* {@link LSResourceResolver} der objekte relativ zu einem Basis-Pfad aus dem Classpath der Anwendung laden kann. * {@link LSResourceResolver} der objekte relativ zu einem Basis-Pfad aus dem Classpath der Anwendung laden kann.
* *

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

@ -16,17 +16,7 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import java.io.Reader;
import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import javax.xml.XMLConstants;
import javax.xml.transform.Result;
import javax.xml.transform.TransformerException;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import net.sf.saxon.Configuration; import net.sf.saxon.Configuration;
import net.sf.saxon.expr.XPathContext; import net.sf.saxon.expr.XPathContext;
import net.sf.saxon.lib.CollectionFinder; import net.sf.saxon.lib.CollectionFinder;
@ -38,6 +28,14 @@ import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.trans.XPathException; import net.sf.saxon.trans.XPathException;
import javax.xml.XMLConstants;
import javax.xml.transform.Result;
import javax.xml.transform.TransformerException;
import java.io.Reader;
import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
/** /**
* @author Andreas Penski * @author Andreas Penski
*/ */

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

@ -16,21 +16,19 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import java.io.IOException; import lombok.RequiredArgsConstructor;
import java.io.Reader; import net.sf.saxon.Configuration;
import java.net.URI; import net.sf.saxon.lib.StandardUnparsedTextResolver;
import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.trans.XPathException;
import javax.xml.transform.Source; import javax.xml.transform.Source;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver; import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamSource; import javax.xml.transform.stream.StreamSource;
import java.io.IOException;
import lombok.RequiredArgsConstructor; import java.io.Reader;
import java.net.URI;
import net.sf.saxon.Configuration;
import net.sf.saxon.lib.StandardUnparsedTextResolver;
import net.sf.saxon.lib.UnparsedTextURIResolver;
import net.sf.saxon.trans.XPathException;
/** /**
* {@link URIResolver} that resolves artifacts relative to a given base uri. The resolved URI must be resolving as child * {@link URIResolver} that resolves artifacts relative to a given base uri. The resolved URI must be resolving as child

5
src/main/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingStrategy.java
View file

@ -16,14 +16,13 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import java.net.URI; import lombok.extern.slf4j.Slf4j;
import javax.xml.transform.URIResolver; import javax.xml.transform.URIResolver;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator; import javax.xml.validation.Validator;
import java.net.URI;
import lombok.extern.slf4j.Slf4j;
/** /**
* This is a slightly more open implementation that allows resolving artifacts from local filesystems. Your are not * This is a slightly more open implementation that allows resolving artifacts from local filesystems. Your are not

8
src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java
View file

@ -16,17 +16,15 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import java.net.URI; import lombok.RequiredArgsConstructor;
import net.sf.saxon.lib.UnparsedTextURIResolver;
import javax.xml.XMLConstants; import javax.xml.XMLConstants;
import javax.xml.transform.URIResolver; import javax.xml.transform.URIResolver;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator; import javax.xml.validation.Validator;
import java.net.URI;
import lombok.RequiredArgsConstructor;
import net.sf.saxon.lib.UnparsedTextURIResolver;
/** /**
* @author Andreas Penski * @author Andreas Penski

5
src/test/java/de/kosit/validationtool/api/CheckConfigurationTest.java
View file

@ -16,11 +16,10 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.impl.Helper.Simple;
import org.junit.Test; import org.junit.Test;
import de.kosit.validationtool.impl.Helper.Simple; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Test {@link CheckConfiguration }. * Test {@link CheckConfiguration }.

45
src/test/java/de/kosit/validationtool/api/InputFactoryTest.java
View file

@ -16,11 +16,24 @@
package de.kosit.validationtool.api; package de.kosit.validationtool.api;
import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID; import de.kosit.validationtool.impl.Helper;
import static de.kosit.validationtool.impl.input.StreamHelper.drain; import de.kosit.validationtool.impl.Helper.Simple;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.impl.TestObjectFactory;
import static org.junit.Assert.assertThrows; import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.s9api.BuildingContentHandler;
import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmNode;
import org.junit.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -30,26 +43,10 @@ import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import javax.xml.transform.dom.DOMSource; import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID;
import javax.xml.transform.stream.StreamSource; import static de.kosit.validationtool.impl.input.StreamHelper.drain;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test; import static org.junit.Assert.assertThrows;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.dom.NodeOverNodeInfo;
import net.sf.saxon.s9api.BuildingContentHandler;
import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmNode;
/** /**
* Testet den Hashcode-Service. * Testet den Hashcode-Service.

17
src/test/java/de/kosit/validationtool/cmd/CheckAssertionActionTest.java
View file

@ -16,21 +16,20 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.cmd.assertions.Assertions; import de.kosit.validationtool.cmd.assertions.Assertions;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.TestObjectFactory; import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
import de.kosit.validationtool.model.reportInput.CreateReportInput; import de.kosit.validationtool.model.reportInput.CreateReportInput;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Testet das Assertion-Feature. * Testet das Assertion-Feature.

11
src/test/java/de/kosit/validationtool/cmd/CommandLine.java
View file

@ -16,6 +16,11 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.TeeOutputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
@ -26,12 +31,6 @@ import java.io.PrintStream;
import java.io.Reader; import java.io.Reader;
import java.util.List; import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.TeeOutputStream;
import lombok.Getter;
import lombok.Setter;
/** /**
* Helferlein um Ausgaben auf der Kommandozeile zu testen. * Helferlein um Ausgaben auf der Kommandozeile zu testen.
* *

20
src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java
View file

@ -16,15 +16,8 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static de.kosit.validationtool.impl.Helper.ASSERTIONS; import de.kosit.validationtool.impl.Helper.Simple;
import static org.assertj.core.api.Assertions.assertThat; import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.assertj.core.api.Condition; import org.assertj.core.api.Condition;
@ -32,9 +25,14 @@ import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import lombok.extern.slf4j.Slf4j; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import de.kosit.validationtool.impl.Helper.Simple; import static de.kosit.validationtool.impl.Helper.ASSERTIONS;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Testet die Parameter des Kommandozeilen-Tools. * Testet die Parameter des Kommandozeilen-Tools.

4
src/test/java/de/kosit/validationtool/cmd/DefaultNamingStrategyTest.java
View file

@ -16,10 +16,10 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test; import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests {@link DefaultNamingStrategy} * Tests {@link DefaultNamingStrategy}
* *

21
src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java
View file

@ -16,23 +16,22 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils; import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
/** /**
* Testet die HTML-Extrkation des Kommondazeilenprogramms. * Testet die HTML-Extrkation des Kommondazeilenprogramms.

15
src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java
View file

@ -16,19 +16,18 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat;
import java.net.MalformedURLException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory; import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction; import de.kosit.validationtool.impl.tasks.CheckAction;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.net.MalformedURLException;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Andreas Penski * @author Andreas Penski

21
src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java
View file

@ -16,23 +16,22 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import org.apache.commons.io.FileUtils; import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
/** /**
* @author Andreas Penski * @author Andreas Penski

17
src/test/java/de/kosit/validationtool/cmd/SerializeReportInputActionTest.java
View file

@ -16,20 +16,19 @@
package de.kosit.validationtool.cmd; package de.kosit.validationtool.cmd;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.ConversionService;
import java.io.IOException; import de.kosit.validationtool.impl.tasks.CheckAction;
import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import java.io.IOException;
import de.kosit.validationtool.impl.ConversionService; import java.nio.file.Files;
import de.kosit.validationtool.impl.tasks.CheckAction; import java.nio.file.Path;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* @author Andreas Penski * @author Andreas Penski

37
src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java
View file

@ -16,36 +16,27 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import static de.kosit.validationtool.api.InputFactory.read;
import static de.kosit.validationtool.impl.Helper.Simple.FOO_SCHEMATRON_INVALID;
import static de.kosit.validationtool.impl.Helper.Simple.GARBAGE;
import static de.kosit.validationtool.impl.Helper.Simple.NOT_WELLFORMED;
import static de.kosit.validationtool.impl.Helper.Simple.REJECTED;
import static de.kosit.validationtool.impl.Helper.Simple.SCHEMATRON_INVALID;
import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID;
import static de.kosit.validationtool.impl.Helper.Simple.UNKNOWN;
import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.Assertions.assertThat;
import java.net.URISyntaxException;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.xml.transform.stream.StreamSource;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
import de.kosit.validationtool.api.AcceptRecommendation; import de.kosit.validationtool.api.AcceptRecommendation;
import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.api.Result; import de.kosit.validationtool.api.Result;
import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Helper.Simple;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.junit.Before;
import org.junit.Test;
import org.w3c.dom.Document;
import javax.xml.transform.stream.StreamSource;
import java.net.URISyntaxException;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import static de.kosit.validationtool.api.InputFactory.read;
import static de.kosit.validationtool.impl.Helper.Simple.*;
import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Test das Check-Interface * Test das Check-Interface

26
src/test/java/de/kosit/validationtool/impl/Helper.java
View file

@ -16,6 +16,18 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.impl.tasks.DocumentParseAction;
import de.kosit.validationtool.impl.xml.ProcessorProvider;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.Serializer;
import net.sf.saxon.s9api.XdmNode;
import javax.xml.transform.stream.StreamSource;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.StringWriter; import java.io.StringWriter;
@ -24,20 +36,6 @@ import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import java.nio.file.Paths; import java.nio.file.Paths;
import javax.xml.transform.stream.StreamSource;
import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.impl.tasks.DocumentParseAction;
import de.kosit.validationtool.impl.xml.ProcessorProvider;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.Serializer;
import net.sf.saxon.s9api.XdmNode;
/** /**
* Helferlein für Test-Artefakte * Helferlein für Test-Artefakte
* *

13
src/test/java/de/kosit/validationtool/impl/VersioningTest.java
View file

@ -16,17 +16,16 @@
package de.kosit.validationtool.impl; package de.kosit.validationtool.impl;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.impl.Helper.Simple;
import static org.junit.Assert.assertThrows; import de.kosit.validationtool.model.scenarios.Scenarios;
import org.junit.Before;
import org.junit.Test;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URL; import java.net.URL;
import org.junit.Before; import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test; import static org.junit.Assert.assertThrows;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.model.scenarios.Scenarios;
/** /**
* Testet die Versionierung von Scenario-Dateien aka Konfigurationsdaten. * Testet die Versionierung von Scenario-Dateien aka Konfigurationsdaten.

6
src/test/java/de/kosit/validationtool/impl/input/StreamHelperTest.java
View file

@ -16,7 +16,8 @@
package de.kosit.validationtool.impl.input; package de.kosit.validationtool.impl.input;
import static org.assertj.core.api.Assertions.assertThat; import org.apache.commons.io.IOUtils;
import org.junit.Test;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -25,8 +26,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import org.apache.commons.io.IOUtils; import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
/** /**
* @author Andreas Penski * @author Andreas Penski

16
src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java
View file

@ -16,21 +16,19 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collections;
import java.util.HashMap;
import org.junit.Test;
import de.kosit.validationtool.api.AcceptRecommendation; import de.kosit.validationtool.api.AcceptRecommendation;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.ResolvingMode; import de.kosit.validationtool.impl.ResolvingMode;
import de.kosit.validationtool.impl.tasks.CheckAction.Bag; import de.kosit.validationtool.impl.tasks.CheckAction.Bag;
import net.sf.saxon.s9api.XPathExecutable; import net.sf.saxon.s9api.XPathExecutable;
import org.junit.Test;
import java.util.Collections;
import java.util.HashMap;
import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests the 'acceptMatch' functionality. * Tests the 'acceptMatch' functionality.

24
src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
View file

@ -16,18 +16,6 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import static de.kosit.validationtool.config.TestConfigurationFactory.createScenario;
import static de.kosit.validationtool.impl.Helper.serialize;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import javax.xml.transform.Source;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.ConversionService;
@ -35,10 +23,20 @@ import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.impl.tasks.CheckAction.Bag; import de.kosit.validationtool.impl.tasks.CheckAction.Bag;
import net.sf.saxon.s9api.DocumentBuilder; import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import org.junit.Before;
import org.junit.Test;
import javax.xml.transform.Source;
import static de.kosit.validationtool.config.TestConfigurationFactory.createScenario;
import static de.kosit.validationtool.impl.Helper.serialize;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/** /**
* Test for {@link CreateReportAction}. * Test for {@link CreateReportAction}.

14
src/test/java/de/kosit/validationtool/impl/tasks/DocumentParseActionTest.java
View file

@ -16,19 +16,17 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import static de.kosit.validationtool.api.InputFactory.read;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.junit.Before;
import org.junit.Test;
import static de.kosit.validationtool.api.InputFactory.read;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
/** /**
* Testet die Document Parsing-Funktionalitäten. * Testet die Document Parsing-Funktionalitäten.

38
src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java
View file

@ -16,27 +16,6 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.MalformedURLException;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.Validator;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.SAXException;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.api.XmlError.Severity; import de.kosit.validationtool.api.XmlError.Severity;
@ -47,6 +26,23 @@ import de.kosit.validationtool.impl.SchemaProvider;
import de.kosit.validationtool.impl.TestObjectFactory; import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.input.SourceInput; import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.tasks.CheckAction.Bag; import de.kosit.validationtool.impl.tasks.CheckAction.Bag;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.SAXException;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.Validator;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.MalformedURLException;
import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
/** /**
* Tests die {@link SchemaValidationAction}. * Tests die {@link SchemaValidationAction}.

22
src/test/java/de/kosit/validationtool/impl/tasks/SchematronValidationActionTest.java
View file

@ -16,28 +16,24 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario;
import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.Scenario.Transformation;
import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ResourceType;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XsltExecutable; import net.sf.saxon.s9api.XsltExecutable;
import net.sf.saxon.s9api.XsltTransformer; import net.sf.saxon.s9api.XsltTransformer;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.util.Collections;
import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.*;
/** /**
* Tests {@link SchematronValidationAction}. * Tests {@link SchematronValidationAction}.

23
src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java
View file

@ -16,18 +16,6 @@
package de.kosit.validationtool.impl.tasks; package de.kosit.validationtool.impl.tasks;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.xml.validation.Schema;
import org.oclc.purl.dsdl.svrl.FailedAssert;
import org.oclc.purl.dsdl.svrl.SchematronOutput;
import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.Input;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
@ -44,8 +32,17 @@ import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ResourceType;
import de.kosit.validationtool.model.scenarios.ScenarioType; import de.kosit.validationtool.model.scenarios.ScenarioType;
import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema; import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema;
import net.sf.saxon.s9api.XdmNode; import net.sf.saxon.s9api.XdmNode;
import org.oclc.purl.dsdl.svrl.FailedAssert;
import org.oclc.purl.dsdl.svrl.SchematronOutput;
import javax.xml.validation.Schema;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/** /**
* Utilities for creating test objects. * Utilities for creating test objects.

18
src/test/java/de/kosit/validationtool/impl/xml/BaseResolverConfigurationTest.java
View file

@ -16,21 +16,17 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import static org.junit.Assert.assertThrows; import lombok.RequiredArgsConstructor;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import javax.xml.XMLConstants;
import javax.xml.validation.SchemaFactory;
import org.junit.Test; import org.junit.Test;
import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXNotSupportedException;
import lombok.RequiredArgsConstructor; import javax.xml.XMLConstants;
import javax.xml.validation.SchemaFactory;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
/** /**
* *

9
src/test/java/de/kosit/validationtool/impl/xml/RemoteResolvingStrategyTest.java
View file

@ -16,15 +16,14 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
import org.junit.Test;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
/** /**
* Tests {@link RemoteResolvingStrategy}. * Tests {@link RemoteResolvingStrategy}.

28
src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java
View file

@ -16,28 +16,13 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.URL;
import java.util.stream.Collectors;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import lombok.extern.slf4j.Slf4j;
import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory; import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import lombok.extern.slf4j.Slf4j;
import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmDestination; import net.sf.saxon.s9api.XdmDestination;
@ -45,6 +30,17 @@ import net.sf.saxon.s9api.XdmNode;
import net.sf.saxon.s9api.XsltCompiler; import net.sf.saxon.s9api.XsltCompiler;
import net.sf.saxon.s9api.XsltExecutable; import net.sf.saxon.s9api.XsltExecutable;
import net.sf.saxon.s9api.XsltTransformer; import net.sf.saxon.s9api.XsltTransformer;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import java.io.IOException;
import java.net.URL;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
/** /**
* Testet verschiedene Saxon Security Einstellungen. * Testet verschiedene Saxon Security Einstellungen.

4
src/test/java/de/kosit/validationtool/impl/xml/SchemaProviderTest.java
View file

@ -16,10 +16,10 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import javax.xml.validation.SchemaFactory;
import de.kosit.validationtool.impl.ResolvingMode; import de.kosit.validationtool.impl.ResolvingMode;
import javax.xml.validation.SchemaFactory;
/** /**
* @author Andreas Penski * @author Andreas Penski
*/ */

13
src/test/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingTest.java
View file

@ -16,17 +16,16 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import static org.junit.Assert.assertThrows; import de.kosit.validationtool.impl.Helper.Resolving;
import org.junit.Test;
import org.xml.sax.SAXParseException;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat;
import org.xml.sax.SAXParseException; import static org.junit.Assert.assertThrows;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
/** /**
* Tests {@link StrictLocalResolvingStrategy} * Tests {@link StrictLocalResolvingStrategy}

13
src/test/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingTest.java
View file

@ -16,17 +16,16 @@
package de.kosit.validationtool.impl.xml; package de.kosit.validationtool.impl.xml;
import static org.assertj.core.api.Assertions.assertThat; import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import static org.junit.Assert.assertThrows; import de.kosit.validationtool.impl.Helper.Resolving;
import org.junit.Test;
import org.xml.sax.SAXParseException;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat;
import org.xml.sax.SAXParseException; import static org.junit.Assert.assertThrows;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
/** /**
* Tests {@link StrictRelativeResolvingStrategy}. * Tests {@link StrictRelativeResolvingStrategy}.