diff --git a/src/main/java/de/kosit/validationtool/api/Check.java b/src/main/java/de/kosit/validationtool/api/Check.java index 4cc6163..386fb8f 100644 --- a/src/main/java/de/kosit/validationtool/api/Check.java +++ b/src/main/java/de/kosit/validationtool/api/Check.java @@ -16,11 +16,11 @@ package de.kosit.validationtool.api; +import org.w3c.dom.Document; + import java.util.List; import java.util.stream.Collectors; -import org.w3c.dom.Document; - /** * Main validator interface for checking incoming files. * diff --git a/src/main/java/de/kosit/validationtool/api/CheckConfiguration.java b/src/main/java/de/kosit/validationtool/api/CheckConfiguration.java index 372e972..64b75f1 100644 --- a/src/main/java/de/kosit/validationtool/api/CheckConfiguration.java +++ b/src/main/java/de/kosit/validationtool/api/CheckConfiguration.java @@ -16,18 +16,17 @@ package de.kosit.validationtool.api; -import java.net.URI; -import java.util.List; -import java.util.Map; - +import de.kosit.validationtool.impl.ContentRepository; +import de.kosit.validationtool.impl.Scenario; +import de.kosit.validationtool.impl.xml.ProcessorProvider; 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.Scenario; -import de.kosit.validationtool.impl.xml.ProcessorProvider; +import java.net.URI; +import java.util.List; +import java.util.Map; /** * Zentrale Konfigration einer Prüf-Instanz. diff --git a/src/main/java/de/kosit/validationtool/api/Configuration.java b/src/main/java/de/kosit/validationtool/api/Configuration.java index 039bf2a..932fe67 100644 --- a/src/main/java/de/kosit/validationtool/api/Configuration.java +++ b/src/main/java/de/kosit/validationtool/api/Configuration.java @@ -16,15 +16,15 @@ 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.ConfigurationLoader; import de.kosit.validationtool.impl.ContentRepository; 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 classes. There are two implementations supported out of the box: diff --git a/src/main/java/de/kosit/validationtool/api/Input.java b/src/main/java/de/kosit/validationtool/api/Input.java index b552712..7b3f598 100644 --- a/src/main/java/de/kosit/validationtool/api/Input.java +++ b/src/main/java/de/kosit/validationtool/api/Input.java @@ -16,9 +16,8 @@ package de.kosit.validationtool.api; -import java.io.IOException; - import javax.xml.transform.Source; +import java.io.IOException; /** * An input for the validator. diff --git a/src/main/java/de/kosit/validationtool/api/InputFactory.java b/src/main/java/de/kosit/validationtool/api/InputFactory.java index 672669b..5339cf1 100644 --- a/src/main/java/de/kosit/validationtool/api/InputFactory.java +++ b/src/main/java/de/kosit/validationtool/api/InputFactory.java @@ -16,8 +16,18 @@ 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.IOException; import java.io.InputStream; @@ -28,21 +38,7 @@ import java.net.URLConnection; import java.nio.file.Path; import java.util.UUID; -import javax.xml.transform.Source; -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; +import static org.apache.commons.lang3.StringUtils.isNotEmpty; /** * Service zum Einlesen des Test-Objekts in den Speicher. Beim Einlesen wird gleichzeitig eine Prüfsumme ermittelt und diff --git a/src/main/java/de/kosit/validationtool/api/ResolvingConfigurationStrategy.java b/src/main/java/de/kosit/validationtool/api/ResolvingConfigurationStrategy.java index 5807d31..d9c5718 100644 --- a/src/main/java/de/kosit/validationtool/api/ResolvingConfigurationStrategy.java +++ b/src/main/java/de/kosit/validationtool/api/ResolvingConfigurationStrategy.java @@ -16,14 +16,13 @@ package de.kosit.validationtool.api; -import java.net.URI; +import net.sf.saxon.lib.UnparsedTextURIResolver; import javax.xml.transform.URIResolver; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; - -import net.sf.saxon.lib.UnparsedTextURIResolver; +import java.net.URI; /** * Centralized construction and configuration of XML related infrastructure components. This interface allows to use diff --git a/src/main/java/de/kosit/validationtool/api/Result.java b/src/main/java/de/kosit/validationtool/api/Result.java index 4c04ab4..0aff251 100644 --- a/src/main/java/de/kosit/validationtool/api/Result.java +++ b/src/main/java/de/kosit/validationtool/api/Result.java @@ -16,13 +16,12 @@ 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.SchematronOutput; 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. diff --git a/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java b/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java index efaac64..1970a6e 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java @@ -16,28 +16,25 @@ 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.Assertions; import de.kosit.validationtool.impl.model.Result; 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.SaxonApiException; import net.sf.saxon.s9api.XPathCompiler; import net.sf.saxon.s9api.XPathSelector; 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 diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java index 8a786b1..98c4485 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java @@ -16,19 +16,17 @@ package de.kosit.validationtool.cmd; -import static de.kosit.validationtool.impl.Printer.writeErr; -import static org.apache.commons.lang3.StringUtils.isNotEmpty; - +import de.kosit.validationtool.cmd.report.Line; +import de.kosit.validationtool.impl.Printer; import org.apache.commons.lang3.ObjectUtils; import org.fusesource.jansi.AnsiConsole; 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.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 * {@link Validator}. diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java index f66e4cd..484948c 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java @@ -16,22 +16,20 @@ package de.kosit.validationtool.cmd; -import java.nio.file.Path; -import java.util.List; -import java.util.concurrent.Callable; - +import de.kosit.validationtool.cmd.CommandLineApplication.Level; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import de.kosit.validationtool.cmd.CommandLineApplication.Level; - import picocli.CommandLine.ArgGroup; import picocli.CommandLine.Command; import picocli.CommandLine.Help.Visibility; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; +import java.nio.file.Path; +import java.util.List; +import java.util.concurrent.Callable; + /** * Commandline Interface definition. * diff --git a/src/main/java/de/kosit/validationtool/cmd/DefaultNamingStrategy.java b/src/main/java/de/kosit/validationtool/cmd/DefaultNamingStrategy.java index a886ed8..7b3753d 100644 --- a/src/main/java/de/kosit/validationtool/cmd/DefaultNamingStrategy.java +++ b/src/main/java/de/kosit/validationtool/cmd/DefaultNamingStrategy.java @@ -16,14 +16,13 @@ package de.kosit.validationtool.cmd; -import static org.apache.commons.io.FilenameUtils.isExtension; -import static org.apache.commons.lang3.StringUtils.isEmpty; -import static org.apache.commons.lang3.StringUtils.isNotEmpty; - +import lombok.Setter; import org.apache.commons.io.FilenameUtils; 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 diff --git a/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java b/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java index 6c1af30..1454773 100644 --- a/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java @@ -16,14 +16,10 @@ 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.tasks.CheckAction; - +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.QName; 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.XdmNode; +import java.nio.file.Path; + /** * Extrahiert HTML-Dokumente aus dem Report und persistiert diese im konfigurierten Ausgabe-Verzeichnis. * diff --git a/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java b/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java index 203fb0e..400b402 100644 --- a/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java +++ b/src/main/java/de/kosit/validationtool/cmd/InternalCheck.java @@ -16,16 +16,6 @@ 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.Input; 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.impl.DefaultCheck; import de.kosit.validationtool.impl.tasks.CheckAction; - +import lombok.extern.slf4j.Slf4j; 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. diff --git a/src/main/java/de/kosit/validationtool/cmd/PrintMemoryStats.java b/src/main/java/de/kosit/validationtool/cmd/PrintMemoryStats.java index df74d98..7720886 100644 --- a/src/main/java/de/kosit/validationtool/cmd/PrintMemoryStats.java +++ b/src/main/java/de/kosit/validationtool/cmd/PrintMemoryStats.java @@ -16,10 +16,10 @@ package de.kosit.validationtool.cmd; -import java.text.NumberFormat; - import lombok.extern.slf4j.Slf4j; +import java.text.NumberFormat; + /** * * Prints some memory usage information for debugging purposes. diff --git a/src/main/java/de/kosit/validationtool/cmd/PrintReportAction.java b/src/main/java/de/kosit/validationtool/cmd/PrintReportAction.java index b257a88..72b8490 100644 --- a/src/main/java/de/kosit/validationtool/cmd/PrintReportAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/PrintReportAction.java @@ -16,18 +16,16 @@ 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.tasks.CheckAction; - +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.Serializer; +import java.io.StringWriter; + /** * Gibt das Ergebnis-Document auf std-out aus. * diff --git a/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java b/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java index ce96302..1530367 100644 --- a/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java @@ -16,17 +16,15 @@ package de.kosit.validationtool.cmd; -import java.nio.file.Path; - +import de.kosit.validationtool.impl.tasks.CheckAction; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - -import de.kosit.validationtool.impl.tasks.CheckAction; - import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.Serializer; +import java.nio.file.Path; + /** * Schreibt das Prüfergebnis als XML-Dokument an eine definierte Stelle. * diff --git a/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java b/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java index 506c612..fb4ebc2 100644 --- a/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java @@ -16,15 +16,14 @@ package de.kosit.validationtool.cmd; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - +import de.kosit.validationtool.impl.ConversionService; +import de.kosit.validationtool.impl.tasks.CheckAction; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import de.kosit.validationtool.impl.ConversionService; -import de.kosit.validationtool.impl.tasks.CheckAction; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; /** * Serializes the {@link de.kosit.validationtool.model.reportInput.CreateReportInput report input} document. diff --git a/src/main/java/de/kosit/validationtool/cmd/TypeConverter.java b/src/main/java/de/kosit/validationtool/cmd/TypeConverter.java index 3fbc583..96e67d0 100644 --- a/src/main/java/de/kosit/validationtool/cmd/TypeConverter.java +++ b/src/main/java/de/kosit/validationtool/cmd/TypeConverter.java @@ -16,19 +16,18 @@ 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.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -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 static org.apache.commons.lang3.StringUtils.defaultIfBlank; /** * Custom type converters for dealing with command line input. diff --git a/src/main/java/de/kosit/validationtool/cmd/Validator.java b/src/main/java/de/kosit/validationtool/cmd/Validator.java index 000bb2c..51010f4 100644 --- a/src/main/java/de/kosit/validationtool/cmd/Validator.java +++ b/src/main/java/de/kosit/validationtool/cmd/Validator.java @@ -16,29 +16,6 @@ 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.Input; 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.ScenarioRepository; import de.kosit.validationtool.impl.xml.ProcessorProvider; - +import lombok.extern.slf4j.Slf4j; 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. diff --git a/src/main/java/de/kosit/validationtool/cmd/report/Format.java b/src/main/java/de/kosit/validationtool/cmd/report/Format.java index 01d93ce..6d5141f 100644 --- a/src/main/java/de/kosit/validationtool/cmd/report/Format.java +++ b/src/main/java/de/kosit/validationtool/cmd/report/Format.java @@ -16,6 +16,10 @@ 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.Collection; import java.util.HashSet; @@ -25,11 +29,6 @@ import java.util.Optional; import java.util.Set; 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. * diff --git a/src/main/java/de/kosit/validationtool/cmd/report/Grid.java b/src/main/java/de/kosit/validationtool/cmd/report/Grid.java index d2bc716..35c4f2d 100644 --- a/src/main/java/de/kosit/validationtool/cmd/report/Grid.java +++ b/src/main/java/de/kosit/validationtool/cmd/report/Grid.java @@ -16,6 +16,11 @@ 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.Arrays; import java.util.Collection; @@ -23,13 +28,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; 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. diff --git a/src/main/java/de/kosit/validationtool/cmd/report/Line.java b/src/main/java/de/kosit/validationtool/cmd/report/Line.java index c8233a0..0416575 100644 --- a/src/main/java/de/kosit/validationtool/cmd/report/Line.java +++ b/src/main/java/de/kosit/validationtool/cmd/report/Line.java @@ -16,14 +16,13 @@ package de.kosit.validationtool.cmd.report; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - +import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; 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. diff --git a/src/main/java/de/kosit/validationtool/cmd/report/Text.java b/src/main/java/de/kosit/validationtool/cmd/report/Text.java index 99aafff..aad4f83 100644 --- a/src/main/java/de/kosit/validationtool/cmd/report/Text.java +++ b/src/main/java/de/kosit/validationtool/cmd/report/Text.java @@ -16,12 +16,11 @@ package de.kosit.validationtool.cmd.report; -import java.util.Arrays; - +import lombok.Getter; import org.fusesource.jansi.AnsiRenderer; import org.fusesource.jansi.AnsiRenderer.Code; -import lombok.Getter; +import java.util.Arrays; /** * Ansi formatted text for outputting to the console. diff --git a/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java b/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java index faa69c0..12b26b3 100644 --- a/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java @@ -16,8 +16,24 @@ 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.nio.file.Path; import java.time.LocalDate; @@ -29,27 +45,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import javax.xml.validation.Schema; - -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; +import static de.kosit.validationtool.impl.DateFactory.createTimestamp; /** * Implements a builder style creation of a {@link Configuration}. diff --git a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java index 5acbbaf..798db4f 100644 --- a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java +++ b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java @@ -16,22 +16,6 @@ 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.Configuration; 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.ScenarioType; 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.QName; import net.sf.saxon.s9api.XdmNode; 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. * This is the recommended option when an official configuration exists as is the case with 'xrechnung'. diff --git a/src/main/java/de/kosit/validationtool/config/DefaultConfiguration.java b/src/main/java/de/kosit/validationtool/config/DefaultConfiguration.java index f053887..c9c2038 100644 --- a/src/main/java/de/kosit/validationtool/config/DefaultConfiguration.java +++ b/src/main/java/de/kosit/validationtool/config/DefaultConfiguration.java @@ -16,17 +16,16 @@ package de.kosit.validationtool.config; -import java.util.List; -import java.util.Map; - +import de.kosit.validationtool.api.Configuration; +import de.kosit.validationtool.impl.ContentRepository; +import de.kosit.validationtool.impl.Scenario; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import de.kosit.validationtool.api.Configuration; -import de.kosit.validationtool.impl.ContentRepository; -import de.kosit.validationtool.impl.Scenario; +import java.util.List; +import java.util.Map; /** * Default implementation class for {@link Configuration}. This class contains all information to run a diff --git a/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java b/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java index 9ac678d..71151e7 100644 --- a/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java @@ -16,17 +16,16 @@ 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.Scenario; import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.scenarios.CreateReportType; 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. diff --git a/src/main/java/de/kosit/validationtool/config/ReportBuilder.java b/src/main/java/de/kosit/validationtool/config/ReportBuilder.java index c1992b9..8158037 100644 --- a/src/main/java/de/kosit/validationtool/config/ReportBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/ReportBuilder.java @@ -16,24 +16,21 @@ 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.Scenario.Transformation; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.scenarios.CreateReportType; import de.kosit.validationtool.model.scenarios.ResourceType; - +import lombok.extern.slf4j.Slf4j; 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. diff --git a/src/main/java/de/kosit/validationtool/config/ScenarioBuilder.java b/src/main/java/de/kosit/validationtool/config/ScenarioBuilder.java index 434ac29..b1e2836 100644 --- a/src/main/java/de/kosit/validationtool/config/ScenarioBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/ScenarioBuilder.java @@ -16,24 +16,6 @@ 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.Scenario; 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.ValidateWithSchematron; 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 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. diff --git a/src/main/java/de/kosit/validationtool/config/SchemaBuilder.java b/src/main/java/de/kosit/validationtool/config/SchemaBuilder.java index cdfa093..4cff609 100644 --- a/src/main/java/de/kosit/validationtool/config/SchemaBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/SchemaBuilder.java @@ -16,23 +16,20 @@ 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.model.Result; import de.kosit.validationtool.model.scenarios.ResourceType; 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. diff --git a/src/main/java/de/kosit/validationtool/config/SchematronBuilder.java b/src/main/java/de/kosit/validationtool/config/SchematronBuilder.java index 1cd7369..0513777 100644 --- a/src/main/java/de/kosit/validationtool/config/SchematronBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/SchematronBuilder.java @@ -16,24 +16,21 @@ 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.Scenario.Transformation; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ValidateWithSchematron; - +import lombok.extern.slf4j.Slf4j; 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. diff --git a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java index 5b16e4f..efe42c9 100644 --- a/src/main/java/de/kosit/validationtool/config/XPathBuilder.java +++ b/src/main/java/de/kosit/validationtool/config/XPathBuilder.java @@ -16,7 +16,16 @@ 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.HashMap; @@ -24,19 +33,7 @@ import java.util.Iterator; import java.util.Map; import java.util.stream.StreamSupport; -import org.apache.commons.lang3.ArrayUtils; -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; +import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; /** * Internal class to represent xpath configuration. diff --git a/src/main/java/de/kosit/validationtool/daemon/BaseHandler.java b/src/main/java/de/kosit/validationtool/daemon/BaseHandler.java index 2e589f3..516b794 100644 --- a/src/main/java/de/kosit/validationtool/daemon/BaseHandler.java +++ b/src/main/java/de/kosit/validationtool/daemon/BaseHandler.java @@ -16,12 +16,12 @@ package de.kosit.validationtool.daemon; -import java.io.IOException; -import java.io.OutputStream; - import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; +import java.io.IOException; +import java.io.OutputStream; + /** * Simple base implemenation for http handlers. Doing I/O stuff. * diff --git a/src/main/java/de/kosit/validationtool/daemon/CheckHandler.java b/src/main/java/de/kosit/validationtool/daemon/CheckHandler.java index 5b44872..2ac9444 100644 --- a/src/main/java/de/kosit/validationtool/daemon/CheckHandler.java +++ b/src/main/java/de/kosit/validationtool/daemon/CheckHandler.java @@ -16,28 +16,24 @@ 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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - import de.kosit.validationtool.api.Check; import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.Result; import de.kosit.validationtool.impl.input.SourceInput; 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.SaxonApiException; 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 diff --git a/src/main/java/de/kosit/validationtool/daemon/ConfigHandler.java b/src/main/java/de/kosit/validationtool/daemon/ConfigHandler.java index 859250d..b363851 100644 --- a/src/main/java/de/kosit/validationtool/daemon/ConfigHandler.java +++ b/src/main/java/de/kosit/validationtool/daemon/ConfigHandler.java @@ -16,6 +16,15 @@ 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.InputStreamReader; import java.io.Reader; @@ -24,18 +33,6 @@ import java.net.URI; import java.util.List; 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. * diff --git a/src/main/java/de/kosit/validationtool/daemon/Daemon.java b/src/main/java/de/kosit/validationtool/daemon/Daemon.java index 236698c..4be4151 100644 --- a/src/main/java/de/kosit/validationtool/daemon/Daemon.java +++ b/src/main/java/de/kosit/validationtool/daemon/Daemon.java @@ -16,27 +16,24 @@ package de.kosit.validationtool.daemon; -import static de.kosit.validationtool.impl.Printer.writeOut; -import static org.apache.commons.lang3.StringUtils.defaultIfBlank; +import com.sun.net.httpserver.HttpHandler; +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.net.InetSocketAddress; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; - -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; +import static de.kosit.validationtool.impl.Printer.writeOut; +import static org.apache.commons.lang3.StringUtils.defaultIfBlank; /** * HTTP-Daemon für die Bereitstellung der Prüf-Funktionalität via http. diff --git a/src/main/java/de/kosit/validationtool/daemon/GuiHandler.java b/src/main/java/de/kosit/validationtool/daemon/GuiHandler.java index ce56bac..d0d411f 100644 --- a/src/main/java/de/kosit/validationtool/daemon/GuiHandler.java +++ b/src/main/java/de/kosit/validationtool/daemon/GuiHandler.java @@ -16,18 +16,16 @@ 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.net.URL; import java.nio.charset.Charset; 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 { private static final URL INDEX_HTML = GuiHandler.class.getClassLoader().getResource("ui/index.html"); diff --git a/src/main/java/de/kosit/validationtool/daemon/HealthHandler.java b/src/main/java/de/kosit/validationtool/daemon/HealthHandler.java index c8ed91f..291f513 100644 --- a/src/main/java/de/kosit/validationtool/daemon/HealthHandler.java +++ b/src/main/java/de/kosit/validationtool/daemon/HealthHandler.java @@ -16,20 +16,18 @@ package de.kosit.validationtool.daemon; -import java.io.IOException; -import java.util.List; - import com.sun.net.httpserver.HttpExchange; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - import de.kosit.validationtool.api.Configuration; import de.kosit.validationtool.impl.ConversionService; import de.kosit.validationtool.impl.EngineInformation; import de.kosit.validationtool.model.daemon.ApplicationType; import de.kosit.validationtool.model.daemon.HealthType; 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. diff --git a/src/main/java/de/kosit/validationtool/daemon/RoutingHandler.java b/src/main/java/de/kosit/validationtool/daemon/RoutingHandler.java index 1e6a81d..cf6f5d8 100644 --- a/src/main/java/de/kosit/validationtool/daemon/RoutingHandler.java +++ b/src/main/java/de/kosit/validationtool/daemon/RoutingHandler.java @@ -16,12 +16,11 @@ package de.kosit.validationtool.daemon; -import java.io.IOException; - import com.sun.net.httpserver.HttpExchange; - import lombok.RequiredArgsConstructor; +import java.io.IOException; + /** * A simple handler which routes between the {@link CheckHandler} and the {@link GuiHandler} depending on the request. */ diff --git a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java index 5f188c6..cd82167 100644 --- a/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java +++ b/src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java @@ -16,28 +16,23 @@ package de.kosit.validationtool.impl; -import java.util.ArrayList; -import java.util.Collection; -import java.util.StringJoiner; - +import de.kosit.validationtool.model.reportInput.XMLSyntaxError; +import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity; import jakarta.xml.bind.ValidationEvent; import jakarta.xml.bind.ValidationEventHandler; -import javax.xml.transform.ErrorListener; -import javax.xml.transform.SourceLocator; -import javax.xml.transform.TransformerException; - +import lombok.Getter; +import net.sf.saxon.s9api.MessageListener; +import net.sf.saxon.s9api.XdmNode; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import lombok.Getter; - -import de.kosit.validationtool.model.reportInput.XMLSyntaxError; -import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity; - -import net.sf.saxon.s9api.MessageListener; -import net.sf.saxon.s9api.QName; -import net.sf.saxon.s9api.XdmNode; +import javax.xml.transform.ErrorListener; +import javax.xml.transform.SourceLocator; +import javax.xml.transform.TransformerException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.StringJoiner; /** * Sammelt Fehler-Ereignisinformation beim Schema-Validieren und weiteren XML-basierten Aktionen diff --git a/src/main/java/de/kosit/validationtool/impl/ContentRepository.java b/src/main/java/de/kosit/validationtool/impl/ContentRepository.java index 46eff7b..7b66a15 100644 --- a/src/main/java/de/kosit/validationtool/impl/ContentRepository.java +++ b/src/main/java/de/kosit/validationtool/impl/ContentRepository.java @@ -16,6 +16,33 @@ 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.InputStream; import java.net.URI; @@ -27,37 +54,6 @@ import java.util.List; import java.util.Map; 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. * diff --git a/src/main/java/de/kosit/validationtool/impl/ConversionService.java b/src/main/java/de/kosit/validationtool/impl/ConversionService.java index 6439e42..a29946d 100644 --- a/src/main/java/de/kosit/validationtool/impl/ConversionService.java +++ b/src/main/java/de/kosit/validationtool/impl/ConversionService.java @@ -16,14 +16,6 @@ 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.JAXBElement; import jakarta.xml.bind.JAXBException; @@ -32,6 +24,9 @@ import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; import jakarta.xml.bind.ValidationEventHandler; 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.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; @@ -41,10 +36,13 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; - -import org.apache.commons.lang3.StringUtils; - -import lombok.extern.slf4j.Slf4j; +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; /** * JAXB Conversion Utility. diff --git a/src/main/java/de/kosit/validationtool/impl/DateFactory.java b/src/main/java/de/kosit/validationtool/impl/DateFactory.java index 2e9bb9a..00aff99 100644 --- a/src/main/java/de/kosit/validationtool/impl/DateFactory.java +++ b/src/main/java/de/kosit/validationtool/impl/DateFactory.java @@ -16,13 +16,12 @@ package de.kosit.validationtool.impl; -import java.util.Date; -import java.util.GregorianCalendar; +import lombok.SneakyThrows; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; - -import lombok.SneakyThrows; +import java.util.Date; +import java.util.GregorianCalendar; /** * @author Andreas Penski diff --git a/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java b/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java index a8cc332..e134874 100644 --- a/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java +++ b/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java @@ -16,19 +16,6 @@ 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.Configuration; 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.EngineType; import de.kosit.validationtool.model.reportInput.XMLSyntaxError; - +import lombok.Getter; +import lombok.extern.slf4j.Slf4j; 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 * reused since initializing saxon runtime objects is an rather heavyweight process. diff --git a/src/main/java/de/kosit/validationtool/impl/DefaultResult.java b/src/main/java/de/kosit/validationtool/impl/DefaultResult.java index e96eb80..69264b9 100644 --- a/src/main/java/de/kosit/validationtool/impl/DefaultResult.java +++ b/src/main/java/de/kosit/validationtool/impl/DefaultResult.java @@ -16,26 +16,23 @@ package de.kosit.validationtool.impl; -import java.util.Collections; -import java.util.List; -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 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.SchematronOutput; import org.w3c.dom.Document; import org.w3c.dom.Element; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.Setter; - -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; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; /** * Das Default-{@link Result} für die Rückgabe in der API diff --git a/src/main/java/de/kosit/validationtool/impl/HtmlExtractor.java b/src/main/java/de/kosit/validationtool/impl/HtmlExtractor.java index f2df488..60b03a0 100644 --- a/src/main/java/de/kosit/validationtool/impl/HtmlExtractor.java +++ b/src/main/java/de/kosit/validationtool/impl/HtmlExtractor.java @@ -16,17 +16,7 @@ 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 net.sf.saxon.dom.NodeOverNodeInfo; import net.sf.saxon.s9api.Processor; 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.XdmItem; 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. diff --git a/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java b/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java index 39fb130..194de34 100644 --- a/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java +++ b/src/main/java/de/kosit/validationtool/impl/ResolvingMode.java @@ -16,13 +16,12 @@ package de.kosit.validationtool.impl; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - import de.kosit.validationtool.api.ResolvingConfigurationStrategy; import de.kosit.validationtool.impl.xml.RemoteResolvingStrategy; import de.kosit.validationtool.impl.xml.StrictLocalResolvingStrategy; import de.kosit.validationtool.impl.xml.StrictRelativeResolvingStrategy; +import lombok.Getter; +import lombok.RequiredArgsConstructor; /** * Defines how artefacts are resolved internally. diff --git a/src/main/java/de/kosit/validationtool/impl/Scenario.java b/src/main/java/de/kosit/validationtool/impl/Scenario.java index 23deb7d..1380191 100644 --- a/src/main/java/de/kosit/validationtool/impl/Scenario.java +++ b/src/main/java/de/kosit/validationtool/impl/Scenario.java @@ -16,27 +16,24 @@ package de.kosit.validationtool.impl; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -import javax.xml.transform.URIResolver; -import javax.xml.validation.Schema; - +import de.kosit.validationtool.api.ResolvingConfigurationStrategy; +import de.kosit.validationtool.model.scenarios.ResourceType; +import de.kosit.validationtool.model.scenarios.ScenarioType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; 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.s9api.XPathExecutable; import net.sf.saxon.s9api.XPathSelector; 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 */ diff --git a/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java b/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java index 4c83c89..95b6439 100644 --- a/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java +++ b/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java @@ -16,20 +16,18 @@ 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.Collections; import java.util.List; 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. * diff --git a/src/main/java/de/kosit/validationtool/impl/SchemaProvider.java b/src/main/java/de/kosit/validationtool/impl/SchemaProvider.java index 4798bff..ce72ad5 100644 --- a/src/main/java/de/kosit/validationtool/impl/SchemaProvider.java +++ b/src/main/java/de/kosit/validationtool/impl/SchemaProvider.java @@ -16,19 +16,17 @@ package de.kosit.validationtool.impl; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; +import de.kosit.validationtool.impl.xml.ClassPathResourceResolver; +import org.w3c.dom.ls.LSResourceResolver; +import org.xml.sax.SAXException; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; - -import org.w3c.dom.ls.LSResourceResolver; -import org.xml.sax.SAXException; - -import de.kosit.validationtool.impl.xml.ClassPathResourceResolver; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; /** * @author Andreas Penski diff --git a/src/main/java/de/kosit/validationtool/impl/input/AbstractInput.java b/src/main/java/de/kosit/validationtool/impl/input/AbstractInput.java index 7624cac..6ded107 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/AbstractInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/AbstractInput.java @@ -16,16 +16,15 @@ package de.kosit.validationtool.impl.input; -import static de.kosit.validationtool.impl.input.StreamHelper.drain; - -import java.io.IOException; -import java.io.InputStream; - +import de.kosit.validationtool.api.Input; import lombok.Getter; import lombok.Setter; 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}. diff --git a/src/main/java/de/kosit/validationtool/impl/input/ByteArrayInput.java b/src/main/java/de/kosit/validationtool/impl/input/ByteArrayInput.java index 30581c2..92659ff 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/ByteArrayInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/ByteArrayInput.java @@ -16,15 +16,14 @@ package de.kosit.validationtool.impl.input; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; +import lombok.AllArgsConstructor; +import lombok.Getter; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; - -import lombok.AllArgsConstructor; -import lombok.Getter; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; /** * Classical in-memory {@link de.kosit.validationtool.api.Input}. It is not memory efficient to read the whole file into diff --git a/src/main/java/de/kosit/validationtool/impl/input/LazyReadInput.java b/src/main/java/de/kosit/validationtool/impl/input/LazyReadInput.java index 71e9bf3..f2c1760 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/LazyReadInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/LazyReadInput.java @@ -16,10 +16,10 @@ package de.kosit.validationtool.impl.input; -import java.io.InputStream; - import de.kosit.validationtool.api.Input; +import java.io.InputStream; + /** * Internal interface used for lazy generation of the hashcode for document identification. * diff --git a/src/main/java/de/kosit/validationtool/impl/input/ResourceInput.java b/src/main/java/de/kosit/validationtool/impl/input/ResourceInput.java index 4c7c6fd..4952474 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/ResourceInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/ResourceInput.java @@ -16,19 +16,17 @@ 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.IOException; import java.io.InputStream; 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}, * {@link java.nio.file.Path} and any other {@link URL}. diff --git a/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java b/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java index 23af168..2ea0c3d 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/SourceInput.java @@ -16,22 +16,19 @@ 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 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.dom.DOMSource; import javax.xml.transform.stream.StreamSource; +import java.io.IOException; +import java.nio.charset.Charset; -import org.apache.commons.io.input.ReaderInputStream; - -import lombok.Getter; -import lombok.extern.slf4j.Slf4j; - -import net.sf.saxon.om.TreeInfo; +import static org.apache.commons.lang3.StringUtils.defaultIfBlank; /** * A validator {@link de.kosit.validationtool.api.Input} based on a {@link Source}. diff --git a/src/main/java/de/kosit/validationtool/impl/input/StreamHelper.java b/src/main/java/de/kosit/validationtool/impl/input/StreamHelper.java index 04e975c..06dd8c9 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/StreamHelper.java +++ b/src/main/java/de/kosit/validationtool/impl/input/StreamHelper.java @@ -16,6 +16,10 @@ 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.FilterInputStream; import java.io.IOException; @@ -24,12 +28,6 @@ import java.security.DigestInputStream; import java.security.MessageDigest; 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. * diff --git a/src/main/java/de/kosit/validationtool/impl/input/XdmNodeInput.java b/src/main/java/de/kosit/validationtool/impl/input/XdmNodeInput.java index 786f68f..0083f5d 100644 --- a/src/main/java/de/kosit/validationtool/impl/input/XdmNodeInput.java +++ b/src/main/java/de/kosit/validationtool/impl/input/XdmNodeInput.java @@ -16,15 +16,13 @@ package de.kosit.validationtool.impl.input; -import javax.xml.transform.Source; - +import de.kosit.validationtool.api.Input; import lombok.Getter; import lombok.RequiredArgsConstructor; - -import de.kosit.validationtool.api.Input; - import net.sf.saxon.s9api.XdmNode; +import javax.xml.transform.Source; + /** * An {@link Input} implementation holding saxon's {@link XdmNode} object. * diff --git a/src/main/java/de/kosit/validationtool/impl/model/BaseOutput.java b/src/main/java/de/kosit/validationtool/impl/model/BaseOutput.java index 06da49c..3773329 100644 --- a/src/main/java/de/kosit/validationtool/impl/model/BaseOutput.java +++ b/src/main/java/de/kosit/validationtool/impl/model/BaseOutput.java @@ -16,15 +16,15 @@ 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.util.List; import java.util.Optional; 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} * umzusetzen. diff --git a/src/main/java/de/kosit/validationtool/impl/model/BaseXMLSyntaxError.java b/src/main/java/de/kosit/validationtool/impl/model/BaseXMLSyntaxError.java index 09feb88..2cdb9ec 100644 --- a/src/main/java/de/kosit/validationtool/impl/model/BaseXMLSyntaxError.java +++ b/src/main/java/de/kosit/validationtool/impl/model/BaseXMLSyntaxError.java @@ -16,10 +16,9 @@ package de.kosit.validationtool.impl.model; -import org.slf4j.Logger; - import de.kosit.validationtool.api.XmlError; import de.kosit.validationtool.model.reportInput.XMLSyntaxErrorSeverity; +import org.slf4j.Logger; /** * Basis-Klasse für Syntax-Error. Wird über die JAXB-generierte Klasse diff --git a/src/main/java/de/kosit/validationtool/impl/model/Result.java b/src/main/java/de/kosit/validationtool/impl/model/Result.java index a4296f3..a120c9a 100644 --- a/src/main/java/de/kosit/validationtool/impl/model/Result.java +++ b/src/main/java/de/kosit/validationtool/impl/model/Result.java @@ -16,14 +16,14 @@ package de.kosit.validationtool.impl.model; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; - import lombok.AllArgsConstructor; import lombok.Getter; 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. * diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/CheckAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/CheckAction.java index cefe293..74d5492 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/CheckAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/CheckAction.java @@ -16,15 +16,6 @@ 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.Input; 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.ProcessingError; import de.kosit.validationtool.model.reportInput.XMLSyntaxError; - +import lombok.AccessLevel; +import lombok.Getter; +import lombok.Setter; 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 diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceAction.java index b377829..3c76a68 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceAction.java @@ -16,17 +16,14 @@ package de.kosit.validationtool.impl.tasks; -import java.util.Optional; - -import org.oclc.purl.dsdl.svrl.FailedAssert; - +import de.kosit.validationtool.api.AcceptRecommendation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - -import de.kosit.validationtool.api.AcceptRecommendation; - import net.sf.saxon.s9api.SaxonApiException; 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 diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java index 8c4fc9b..2c274ce 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java @@ -16,33 +16,16 @@ 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.ConversionService; import de.kosit.validationtool.impl.EngineInformation; import de.kosit.validationtool.impl.Scenario; 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.Processor; 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.sapling.SaplingDocument; 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 diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java index 15a3ac7..63ec08d 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java @@ -16,25 +16,23 @@ 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.impl.input.XdmNodeInput; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.reportInput.ValidationResultsWellformedness; import de.kosit.validationtool.model.reportInput.XMLSyntaxError; 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.Processor; import net.sf.saxon.s9api.SaxonApiException; 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 * diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java index d707881..3554b53 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java @@ -16,14 +16,12 @@ 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.ScenarioRepository; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.reportInput.CreateReportInput; - +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import net.sf.saxon.s9api.XdmNode; /** diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java index 06e402b..ff6b2f7 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java @@ -16,27 +16,6 @@ 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.impl.CollectingErrorEventHandler; 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.ValidationResultsXmlSchema; 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.SaxonApiException; import net.sf.saxon.s9api.Serializer; 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 diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/SchematronValidationAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/SchematronValidationAction.java index cb27684..d9a5165 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/SchematronValidationAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/SchematronValidationAction.java @@ -16,16 +16,6 @@ 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.ConversionService; 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.ValidationResultsSchematron; 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.s9api.SaxonApiException; import net.sf.saxon.s9api.XdmDestination; import net.sf.saxon.s9api.XdmNode; 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. diff --git a/src/main/java/de/kosit/validationtool/impl/tasks/ValidateReportInputAction.java b/src/main/java/de/kosit/validationtool/impl/tasks/ValidateReportInputAction.java index 413583b..13d301a 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/ValidateReportInputAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/ValidateReportInputAction.java @@ -16,17 +16,15 @@ 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.ConversionService; import de.kosit.validationtool.impl.model.Result; 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. diff --git a/src/main/java/de/kosit/validationtool/impl/xml/BaseResolvingStrategy.java b/src/main/java/de/kosit/validationtool/impl/xml/BaseResolvingStrategy.java index bb5ec15..5b0146c 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/BaseResolvingStrategy.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/BaseResolvingStrategy.java @@ -16,17 +16,15 @@ 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.validation.SchemaFactory; import javax.xml.validation.Validator; -import org.xml.sax.SAXException; - -import lombok.extern.slf4j.Slf4j; - -import de.kosit.validationtool.api.ResolvingConfigurationStrategy; +import static java.lang.String.format; /** * @author Andreas Penski diff --git a/src/main/java/de/kosit/validationtool/impl/xml/ClassPathResourceResolver.java b/src/main/java/de/kosit/validationtool/impl/xml/ClassPathResourceResolver.java index 74e884b..e9f2ed9 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/ClassPathResourceResolver.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/ClassPathResourceResolver.java @@ -16,21 +16,20 @@ 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.InputStream; import java.io.Reader; import java.net.URI; 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. * diff --git a/src/main/java/de/kosit/validationtool/impl/xml/ProcessorProvider.java b/src/main/java/de/kosit/validationtool/impl/xml/ProcessorProvider.java index 66a17c4..1c99e92 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/ProcessorProvider.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/ProcessorProvider.java @@ -16,17 +16,7 @@ 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 net.sf.saxon.Configuration; import net.sf.saxon.expr.XPathContext; 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.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 */ diff --git a/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java b/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java index b3b79e6..cb51b68 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java @@ -16,21 +16,19 @@ package de.kosit.validationtool.impl.xml; -import java.io.IOException; -import java.io.Reader; -import java.net.URI; +import lombok.RequiredArgsConstructor; +import net.sf.saxon.Configuration; +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.TransformerException; import javax.xml.transform.URIResolver; import javax.xml.transform.stream.StreamSource; - -import lombok.RequiredArgsConstructor; - -import net.sf.saxon.Configuration; -import net.sf.saxon.lib.StandardUnparsedTextResolver; -import net.sf.saxon.lib.UnparsedTextURIResolver; -import net.sf.saxon.trans.XPathException; +import java.io.IOException; +import java.io.Reader; +import java.net.URI; /** * {@link URIResolver} that resolves artifacts relative to a given base uri. The resolved URI must be resolving as child diff --git a/src/main/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingStrategy.java b/src/main/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingStrategy.java index 6cf69d8..0a57914 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingStrategy.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingStrategy.java @@ -16,14 +16,13 @@ package de.kosit.validationtool.impl.xml; -import java.net.URI; +import lombok.extern.slf4j.Slf4j; import javax.xml.transform.URIResolver; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; - -import lombok.extern.slf4j.Slf4j; +import java.net.URI; /** * This is a slightly more open implementation that allows resolving artifacts from local filesystems. Your are not diff --git a/src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java b/src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java index fadc42e..988af84 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingStrategy.java @@ -16,17 +16,15 @@ 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.transform.URIResolver; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; - -import lombok.RequiredArgsConstructor; - -import net.sf.saxon.lib.UnparsedTextURIResolver; +import java.net.URI; /** * @author Andreas Penski diff --git a/src/test/java/de/kosit/validationtool/api/CheckConfigurationTest.java b/src/test/java/de/kosit/validationtool/api/CheckConfigurationTest.java index 54f469f..d3c3885 100644 --- a/src/test/java/de/kosit/validationtool/api/CheckConfigurationTest.java +++ b/src/test/java/de/kosit/validationtool/api/CheckConfigurationTest.java @@ -16,11 +16,10 @@ 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 de.kosit.validationtool.impl.Helper.Simple; +import static org.assertj.core.api.Assertions.assertThat; /** * Test {@link CheckConfiguration }. diff --git a/src/test/java/de/kosit/validationtool/api/InputFactoryTest.java b/src/test/java/de/kosit/validationtool/api/InputFactoryTest.java index cad0b2f..fa2fcc6 100644 --- a/src/test/java/de/kosit/validationtool/api/InputFactoryTest.java +++ b/src/test/java/de/kosit/validationtool/api/InputFactoryTest.java @@ -16,11 +16,24 @@ package de.kosit.validationtool.api; -import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID; -import static de.kosit.validationtool.impl.input.StreamHelper.drain; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThrows; +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; +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.File; import java.io.IOException; @@ -30,26 +43,10 @@ import java.net.URISyntaxException; import java.net.URL; import java.nio.file.Paths; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamSource; - -import org.junit.Test; -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; +import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID; +import static de.kosit.validationtool.impl.input.StreamHelper.drain; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertThrows; /** * Testet den Hashcode-Service. diff --git a/src/test/java/de/kosit/validationtool/cmd/CheckAssertionActionTest.java b/src/test/java/de/kosit/validationtool/cmd/CheckAssertionActionTest.java index 33a4989..bf51580 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CheckAssertionActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CheckAssertionActionTest.java @@ -16,21 +16,20 @@ 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.cmd.assertions.Assertions; import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.TestObjectFactory; import de.kosit.validationtool.impl.tasks.CheckAction; 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. diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandLine.java b/src/test/java/de/kosit/validationtool/cmd/CommandLine.java index 6088056..e1b5a5c 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandLine.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandLine.java @@ -16,6 +16,11 @@ 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.ByteArrayOutputStream; import java.io.IOException; @@ -26,12 +31,6 @@ import java.io.PrintStream; import java.io.Reader; 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. * diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java index 5df8a3c..ef2d163 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java @@ -16,15 +16,8 @@ package de.kosit.validationtool.cmd; -import static de.kosit.validationtool.impl.Helper.ASSERTIONS; -import static org.assertj.core.api.Assertions.assertThat; - -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 lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.assertj.core.api.Condition; @@ -32,9 +25,14 @@ import org.junit.After; import org.junit.Before; 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. diff --git a/src/test/java/de/kosit/validationtool/cmd/DefaultNamingStrategyTest.java b/src/test/java/de/kosit/validationtool/cmd/DefaultNamingStrategyTest.java index eee1973..e7004e8 100644 --- a/src/test/java/de/kosit/validationtool/cmd/DefaultNamingStrategyTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/DefaultNamingStrategyTest.java @@ -16,10 +16,10 @@ package de.kosit.validationtool.cmd; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests {@link DefaultNamingStrategy} * diff --git a/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java b/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java index ae16977..2d04e55 100644 --- a/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java @@ -16,23 +16,22 @@ 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.nio.file.Files; import java.nio.file.Path; import java.util.stream.Collectors; -import org.apache.commons.io.FileUtils; -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; +import static org.assertj.core.api.Assertions.assertThat; /** * Testet die HTML-Extrkation des Kommondazeilenprogramms. diff --git a/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java b/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java index 63c2732..dd28113 100644 --- a/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java @@ -16,19 +16,18 @@ 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.impl.Helper; import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.TestObjectFactory; 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 diff --git a/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java b/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java index b0e574e..a6117fc 100644 --- a/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java @@ -16,23 +16,22 @@ 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.net.MalformedURLException; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.commons.io.FileUtils; -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; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Andreas Penski diff --git a/src/test/java/de/kosit/validationtool/cmd/SerializeReportInputActionTest.java b/src/test/java/de/kosit/validationtool/cmd/SerializeReportInputActionTest.java index 802a052..c0d2c23 100644 --- a/src/test/java/de/kosit/validationtool/cmd/SerializeReportInputActionTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/SerializeReportInputActionTest.java @@ -16,20 +16,19 @@ package de.kosit.validationtool.cmd; -import static org.assertj.core.api.Assertions.assertThat; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - +import de.kosit.validationtool.api.InputFactory; +import de.kosit.validationtool.impl.ConversionService; +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 de.kosit.validationtool.api.InputFactory; -import de.kosit.validationtool.impl.ConversionService; -import de.kosit.validationtool.impl.tasks.CheckAction; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import static org.assertj.core.api.Assertions.assertThat; /** * @author Andreas Penski diff --git a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java index 10ff04f..dc105f7 100644 --- a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java +++ b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java @@ -16,36 +16,27 @@ 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.Configuration; import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.Result; import de.kosit.validationtool.impl.Helper.Simple; - 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 diff --git a/src/test/java/de/kosit/validationtool/impl/Helper.java b/src/test/java/de/kosit/validationtool/impl/Helper.java index c3402fa..d833dd8 100644 --- a/src/test/java/de/kosit/validationtool/impl/Helper.java +++ b/src/test/java/de/kosit/validationtool/impl/Helper.java @@ -16,6 +16,18 @@ 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.InputStream; import java.io.StringWriter; @@ -24,20 +36,6 @@ import java.net.URISyntaxException; import java.net.URL; 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 * diff --git a/src/test/java/de/kosit/validationtool/impl/VersioningTest.java b/src/test/java/de/kosit/validationtool/impl/VersioningTest.java index 64b2a4f..4aa1bce 100644 --- a/src/test/java/de/kosit/validationtool/impl/VersioningTest.java +++ b/src/test/java/de/kosit/validationtool/impl/VersioningTest.java @@ -16,17 +16,16 @@ package de.kosit.validationtool.impl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThrows; +import de.kosit.validationtool.impl.Helper.Simple; +import de.kosit.validationtool.model.scenarios.Scenarios; +import org.junit.Before; +import org.junit.Test; import java.net.URISyntaxException; import java.net.URL; -import org.junit.Before; -import org.junit.Test; - -import de.kosit.validationtool.impl.Helper.Simple; -import de.kosit.validationtool.model.scenarios.Scenarios; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertThrows; /** * Testet die Versionierung von Scenario-Dateien aka Konfigurationsdaten. diff --git a/src/test/java/de/kosit/validationtool/impl/input/StreamHelperTest.java b/src/test/java/de/kosit/validationtool/impl/input/StreamHelperTest.java index 46ecac2..9773bf5 100644 --- a/src/test/java/de/kosit/validationtool/impl/input/StreamHelperTest.java +++ b/src/test/java/de/kosit/validationtool/impl/input/StreamHelperTest.java @@ -16,7 +16,8 @@ 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.ByteArrayInputStream; @@ -25,8 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import org.apache.commons.io.IOUtils; -import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * @author Andreas Penski diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java index 09888bc..27075f9 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java @@ -16,21 +16,19 @@ 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.impl.ContentRepository; import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.ResolvingMode; import de.kosit.validationtool.impl.tasks.CheckAction.Bag; - 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. diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java index 4706e90..f80b227 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java @@ -16,18 +16,6 @@ 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.impl.ContentRepository; 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.model.Result; import de.kosit.validationtool.impl.tasks.CheckAction.Bag; - import net.sf.saxon.s9api.DocumentBuilder; import net.sf.saxon.s9api.Processor; 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}. diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/DocumentParseActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/DocumentParseActionTest.java index dbc2802..6111dcd 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/DocumentParseActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/DocumentParseActionTest.java @@ -16,19 +16,17 @@ 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.Simple; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.reportInput.XMLSyntaxError; - 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. diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java index b793ebc..af4b84b 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java @@ -16,27 +16,6 @@ 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.InputFactory; 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.input.SourceInput; 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}. diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/SchematronValidationActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/SchematronValidationActionTest.java index 1f7c746..d9f8ec1 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/SchematronValidationActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/SchematronValidationActionTest.java @@ -16,28 +16,24 @@ 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.impl.ConversionService; import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Scenario; import de.kosit.validationtool.impl.Scenario.Transformation; import de.kosit.validationtool.model.scenarios.ResourceType; - import net.sf.saxon.s9api.SaxonApiException; import net.sf.saxon.s9api.XsltExecutable; 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}. diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java b/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java index 0ed10e7..446c3fe 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java @@ -16,18 +16,6 @@ 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.InputFactory; 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.ScenarioType; import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema; - 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. diff --git a/src/test/java/de/kosit/validationtool/impl/xml/BaseResolverConfigurationTest.java b/src/test/java/de/kosit/validationtool/impl/xml/BaseResolverConfigurationTest.java index 17cb40d..2cb9dcf 100644 --- a/src/test/java/de/kosit/validationtool/impl/xml/BaseResolverConfigurationTest.java +++ b/src/test/java/de/kosit/validationtool/impl/xml/BaseResolverConfigurationTest.java @@ -16,21 +16,17 @@ package de.kosit.validationtool.impl.xml; -import static org.junit.Assert.assertThrows; -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 lombok.RequiredArgsConstructor; import org.junit.Test; import org.xml.sax.SAXNotRecognizedException; 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.*; /** * diff --git a/src/test/java/de/kosit/validationtool/impl/xml/RemoteResolvingStrategyTest.java b/src/test/java/de/kosit/validationtool/impl/xml/RemoteResolvingStrategyTest.java index 0da9eac..c0278d9 100644 --- a/src/test/java/de/kosit/validationtool/impl/xml/RemoteResolvingStrategyTest.java +++ b/src/test/java/de/kosit/validationtool/impl/xml/RemoteResolvingStrategyTest.java @@ -16,15 +16,14 @@ 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.SchemaFactory; -import org.junit.Test; - -import de.kosit.validationtool.api.ResolvingConfigurationStrategy; -import de.kosit.validationtool.impl.Helper.Resolving; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests {@link RemoteResolvingStrategy}. diff --git a/src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java b/src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java index 99756a7..d6fc742 100644 --- a/src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java +++ b/src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java @@ -16,28 +16,13 @@ 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.impl.Helper; import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.TestObjectFactory; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.model.reportInput.XMLSyntaxError; - +import lombok.extern.slf4j.Slf4j; import net.sf.saxon.s9api.Processor; import net.sf.saxon.s9api.SaxonApiException; 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.XsltExecutable; 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. diff --git a/src/test/java/de/kosit/validationtool/impl/xml/SchemaProviderTest.java b/src/test/java/de/kosit/validationtool/impl/xml/SchemaProviderTest.java index 6e50378..fb2b61a 100644 --- a/src/test/java/de/kosit/validationtool/impl/xml/SchemaProviderTest.java +++ b/src/test/java/de/kosit/validationtool/impl/xml/SchemaProviderTest.java @@ -16,10 +16,10 @@ package de.kosit.validationtool.impl.xml; -import javax.xml.validation.SchemaFactory; - import de.kosit.validationtool.impl.ResolvingMode; +import javax.xml.validation.SchemaFactory; + /** * @author Andreas Penski */ diff --git a/src/test/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingTest.java b/src/test/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingTest.java index 07652fb..21f9d3e 100644 --- a/src/test/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingTest.java +++ b/src/test/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingTest.java @@ -16,17 +16,16 @@ package de.kosit.validationtool.impl.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThrows; +import de.kosit.validationtool.api.ResolvingConfigurationStrategy; +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.SchemaFactory; -import org.junit.Test; -import org.xml.sax.SAXParseException; - -import de.kosit.validationtool.api.ResolvingConfigurationStrategy; -import de.kosit.validationtool.impl.Helper.Resolving; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertThrows; /** * Tests {@link StrictLocalResolvingStrategy} diff --git a/src/test/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingTest.java b/src/test/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingTest.java index 4c2751a..d595c0c 100644 --- a/src/test/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingTest.java +++ b/src/test/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingTest.java @@ -16,17 +16,16 @@ package de.kosit.validationtool.impl.xml; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThrows; +import de.kosit.validationtool.api.ResolvingConfigurationStrategy; +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.SchemaFactory; -import org.junit.Test; -import org.xml.sax.SAXParseException; - -import de.kosit.validationtool.api.ResolvingConfigurationStrategy; -import de.kosit.validationtool.impl.Helper.Resolving; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertThrows; /** * Tests {@link StrictRelativeResolvingStrategy}.