- * This URIResolver is used to dereference the URIs appearing in xsl:import, xsl:include, and
- * xsl:import-schema declarations.
+ * This URIResolver is used to dereference the URIs appearing in xsl:import, xsl:include,
+ * and xsl:import-schema declarations.
*
unparsed-text() function.
+ * Creates a specific implementation for resolving objects referenced via XSLT's unparsed-text()
+ * function.
*
* @param scenarioRepository an optional repository, your implementation might not need this
* @return a preconfigured {@link net.sf.saxon.lib.UnparsedTextURIResolver} or null for using saxons default
@@ -68,8 +69,8 @@ public interface ResolvingConfigurationStrategy {
UnparsedTextURIResolver createUnparsedTextURIResolver(URI scenarioRepository);
/**
- * Creates a preconfigured {@link Validator } instance for a given schema for xml file validation. The implementation
- * takes care about security and reference resolving strategies.
+ * Creates a preconfigured {@link Validator } instance for a given schema for xml file validation. The
+ * implementation takes care about security and reference resolving strategies.
*
* @param schema the scheme to create a {@link Validator} for
* @return a preconfigured {@link Validator}
diff --git a/src/main/java/de/kosit/validationtool/api/Result.java b/src/main/java/de/kosit/validationtool/api/Result.java
index 91617ae..af86a90 100644
--- a/src/main/java/de/kosit/validationtool/api/Result.java
+++ b/src/main/java/de/kosit/validationtool/api/Result.java
@@ -16,8 +16,8 @@ import net.sf.saxon.s9api.XdmNode;
public interface Result {
/**
- * Zeigt an, ob die Verarbeitung durch den Validator erfolgreich durchlaufen wurde. Diese Funktion macht ausdrücklich
- * keine Aussage über die zur Akzeptanz.
+ * Zeigt an, ob die Verarbeitung durch den Validator erfolgreich durchlaufen wurde. Diese Funktion macht
+ * ausdrücklich keine Aussage über die zur Akzeptanz.
*
* @return true, wenn die Verarbeitung komplett und erfolgreich durchlaufen wurde
* @see #getAcceptRecommendation()
@@ -92,7 +92,8 @@ public interface Result {
boolean isWellformed();
/**
- * Returns true, if schematron has been checked and the result does not contain any {@link FailedAssert FailedAsserts}.
+ * Returns true, if schematron has been checked and the result does not contain any {@link FailedAssert
+ * FailedAsserts}.
*
* @return true, if valid
*/
diff --git a/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java b/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java
index 79d4d24..813cf4d 100644
--- a/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java
+++ b/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java
@@ -91,7 +91,6 @@ class CheckAssertionAction implements CheckAction {
return getMapped().entrySet().stream().filter(e -> matches(e.getKey(), name)).map(Map.Entry::getValue).findFirst().orElse(null);
}
-
private boolean check(XdmNode document, AssertionType assertion) {
try {
final XPathSelector selector = createSelector(assertion);
diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
index c7bc6d0..76ab31b 100644
--- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
+++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
@@ -9,34 +9,52 @@ import org.apache.commons.cli.Option;
public class CommandLineOptions {
static final Option HELP = Option.builder("?").longOpt("help").argName("Help").desc("Displays this help").build();
+
static final Option SCENARIOS = Option.builder("s").required().longOpt("scenarios").hasArg().desc("Location of scenarios.xml e.g.")
.build();
+
static final Option REPOSITORY = Option.builder("r").longOpt("repository").hasArg().desc("Directory containing scenario content")
.build();
+
static final Option PRINT = Option.builder("p").longOpt("print").desc("Prints the check result to stdout").build();
+
static final Option OUTPUT = Option.builder("o").longOpt("output-directory")
.desc("Defines the out directory for results. Defaults to cwd").hasArg().build();
+
static final Option EXTRACT_HTML = Option.builder("h").longOpt("html")
.desc("Extract and save any html content within result as a separate file ").build();
+
static final Option DEBUG = Option.builder("d").longOpt("debug").desc("Prints some more debug information").build();
+
static final Option SERIALIZE_REPORT_INPUT = Option.builder("c").longOpt("serialize-report-input")
.desc("Serializes the report input to the cwd").build();
+
static final Option CHECK_ASSERTIONS = Option.builder("c").longOpt("check-assertions").hasArg()
.desc("Check the result using defined assertions").argName("assertions-file").build();
+
static final Option SERVER = Option.builder("D").longOpt("daemon").desc("Starts a daemon listing for validation requests").build();
+
static final Option HOST = Option.builder("H").longOpt("host").hasArg()
.desc("The hostname / IP address to bind the daemon. Default is localhost").build();
+
static final Option PORT = Option.builder("P").longOpt("port").hasArg().desc("The port to bind the daemon. Default is 8080").build();
+
static final Option WORKER_COUNT = Option.builder("T").longOpt("threads").hasArg()
.desc("Number of threads processing validation requests").build();
+
static final Option DISABLE_GUI = Option.builder("G").longOpt("disable-gui").desc("Disables the GUI of the daemon mode").build();
+
static final Option REPORT_POSTFIX = Option.builder(null).longOpt("report-postfix").hasArg()
.desc("Postfix of the generated report name").build();
+
static final Option REPORT_PREFIX = Option.builder(null).longOpt("report-prefix").hasArg().desc("Prefix of the generated report name")
.build();
+
static final Option DEBUG_LOG = Option.builder("X").longOpt("debug-logging").desc("Enables full debug log. Alias for -l debug").build();
+
static final Option LOG_LEVEL = Option.builder("l").longOpt("log-level").hasArg()
.desc("Enables a certain log level for debugging " + "purposes").build();
+
static final Option PRINT_MEM_STATS = Option.builder("m").longOpt("memory-stats").desc("Prints some memory stats").build();
private CommandLineOptions() {
diff --git a/src/main/java/de/kosit/validationtool/cmd/Validator.java b/src/main/java/de/kosit/validationtool/cmd/Validator.java
index bd986ae..522e0c8 100644
--- a/src/main/java/de/kosit/validationtool/cmd/Validator.java
+++ b/src/main/java/de/kosit/validationtool/cmd/Validator.java
@@ -200,7 +200,6 @@ public class Validator {
return check.isSuccessful(results) ? ReturnValue.SUCCESS : ReturnValue.createFailed(check.getNotAcceptableCount(results));
}
-
private static ConfigurationLoader getConfiguration(final CommandLine cmd) {
final URI scenarioLocation = determineDefinition(cmd);
final URI repositoryLocation = determineRepository(cmd);
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 f96b7ef..cffe4ec 100644
--- a/src/main/java/de/kosit/validationtool/cmd/report/Grid.java
+++ b/src/main/java/de/kosit/validationtool/cmd/report/Grid.java
@@ -183,8 +183,6 @@ public class Grid {
return this;
}
-
-
}
private static final Format DEFAULT_FORMAT = new Format();
diff --git a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java
index 7848c6b..5484edf 100644
--- a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java
+++ b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java
@@ -177,6 +177,7 @@ public class ConfigurationLoader {
/**
* Sets actual {@link ResolvingMode}, when the validator needs to resolve stuff on startup.
+ *
* @param mode the resolving mode
* @return this
*/
@@ -188,13 +189,14 @@ public class ConfigurationLoader {
return this;
}
- public ConfigurationLoader setResolvingStrategy(final ResolvingConfigurationStrategy strategy){
+ public ConfigurationLoader setResolvingStrategy(final ResolvingConfigurationStrategy strategy) {
this.resolvingConfigurationStrategy = strategy;
return this;
}
/**
* Add a parameter to the configuration.
+ *
* @param name the name of the parameter
* @param value the parameter value object
* @return this
diff --git a/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java b/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java
index d81b096..41998ca 100644
--- a/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java
+++ b/src/main/java/de/kosit/validationtool/config/FallbackBuilder.java
@@ -48,8 +48,8 @@ public class FallbackBuilder implements Buildertrue wenn der Schritt ausgelassen werden soll
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 83e9554..7e49f76 100644
--- a/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java
+++ b/src/main/java/de/kosit/validationtool/impl/tasks/CreateReportAction.java
@@ -70,8 +70,9 @@ import net.sf.saxon.s9api.XsltTransformer;
public class CreateReportAction implements CheckAction {
/**
- * Wrapper to fix some inconsistencies between sax and saxon. Saxon tries to set some properties which has no effect on
- * {@link JAXBSource}'s XMLReader, but it throws exceptions on unknown properties. This just drops this exceptions.
+ * Wrapper to fix some inconsistencies between sax and saxon. Saxon tries to set some properties which has no effect
+ * on {@link JAXBSource}'s XMLReader, but it throws exceptions on unknown properties. This just drops this
+ * exceptions.
*/
private static class ReaderWrapper implements XMLReader {
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 22cca81..6337641 100644
--- a/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java
+++ b/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java
@@ -103,7 +103,6 @@ public class SchemaValidationAction implements CheckAction {
private static class FileSerializedDocument implements SerializedDocument {
-
private final Path file;
private final Processor processor;
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 5c5d3b0..19c9828 100644
--- a/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java
+++ b/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java
@@ -105,5 +105,4 @@ public class RelativeUriResolver implements URIResolver, UnparsedTextURIResolver
}
}
-
}
\ No newline at end of file
diff --git a/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java b/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java
index b392d27..7b8ccc7 100644
--- a/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java
+++ b/src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java
@@ -44,7 +44,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction;
*/
public class ExtractHtmlActionTest {
-
private ExtractHtmlContentAction action;
private Path tmpDirectory;
diff --git a/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java b/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java
index b5b614d..5f0319c 100644
--- a/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java
+++ b/src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java
@@ -38,7 +38,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction;
*/
public class PrintReportActionTest {
-
private CommandLine commandLine;
private PrintReportAction action;
diff --git a/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java b/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java
index c35d23b..5bb7994 100644
--- a/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java
+++ b/src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java
@@ -42,7 +42,6 @@ import de.kosit.validationtool.impl.tasks.CheckAction;
*/
public class SerializeReportActionTest {
-
private Path tmpDirectory;
private SerializeReportAction action;
@@ -70,9 +69,9 @@ public class SerializeReportActionTest {
assertThat(this.tmpDirectory.toFile().listFiles()).hasSize(1);
}
- //ERPT-83
+ // ERPT-83
@Test
- public void testName(){
+ public void testName() {
final String name = "some.name.with.dots";
final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read("ega".getBytes(), name + ".xml"));
assertThat(b.getName()).isEqualTo(name);
diff --git a/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java b/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java
index 8db79ad..f03d2fd 100644
--- a/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java
+++ b/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java
@@ -26,7 +26,4 @@ public class SimpleConfigTest {
assertThat(result).isNotNull();
}
-
-
-
}
diff --git a/src/test/java/de/kosit/validationtool/daemon/GuiHandlerIT.java b/src/test/java/de/kosit/validationtool/daemon/GuiHandlerIT.java
index bd62201..3d7501c 100644
--- a/src/test/java/de/kosit/validationtool/daemon/GuiHandlerIT.java
+++ b/src/test/java/de/kosit/validationtool/daemon/GuiHandlerIT.java
@@ -1,9 +1,10 @@
package de.kosit.validationtool.daemon;
-import io.restassured.http.ContentType;
+import static io.restassured.RestAssured.given;
+
import org.junit.Test;
-import static io.restassured.RestAssured.given;
+import io.restassured.http.ContentType;
public class GuiHandlerIT extends BaseIT {
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 3bb04b2..4621ea6 100644
--- a/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java
+++ b/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java
@@ -23,6 +23,7 @@ import net.sf.saxon.s9api.XPathExecutable;
public class ComputeAcceptanceActionTest {
private static final String DOESNOT_EXIST = "count(//doesnotExist) = 0";
+
private final ComputeAcceptanceAction action = new ComputeAcceptanceAction();
@Test
@@ -103,7 +104,6 @@ public class ComputeAcceptanceActionTest {
assertThat(bag.getAcceptStatus()).isEqualTo(AcceptRecommendation.REJECT);
}
-
private static XPathExecutable createXpath(final String expression) {
return new ContentRepository(ResolvingMode.STRICT_RELATIVE.getStrategy(), null).createXPath(expression, new HashMap<>());
}
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 6425366..5cb73f6 100644
--- a/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
+++ b/src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
@@ -35,7 +35,6 @@ public class CreateReportActionTest {
private ContentRepository repository;
-
@Before
public void setup() {
this.repository = Simple.createContentRepository();
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 716023f..f8d0c37 100644
--- a/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java
+++ b/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java
@@ -57,13 +57,13 @@ public class TestBagBuilder {
private static Scenario createScenario(final URI schemafile) {
try {
- final ScenarioType t = new ScenarioType();
- final ValidateWithXmlSchema v = new ValidateWithXmlSchema();
- final ResourceType r = new ResourceType();
- r.setLocation(schemafile.getRawPath());
- r.setName("invoice");
- v.getResource().add(r);
- t.setValidateWithXmlSchema(v);
+ final ScenarioType t = new ScenarioType();
+ final ValidateWithXmlSchema v = new ValidateWithXmlSchema();
+ final ResourceType r = new ResourceType();
+ r.setLocation(schemafile.getRawPath());
+ r.setName("invoice");
+ v.getResource().add(r);
+ t.setValidateWithXmlSchema(v);
final Scenario scenario = new Scenario(t);
scenario.setSchema(createSchema(schemafile.toURL()));
return scenario;
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 0a63475..b254022 100644
--- a/src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java
+++ b/src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java
@@ -49,7 +49,6 @@ import net.sf.saxon.s9api.XsltCompiler;
import net.sf.saxon.s9api.XsltExecutable;
import net.sf.saxon.s9api.XsltTransformer;
-
/**
* Testet verschiedene Saxon Security Einstellungen.
*
@@ -77,7 +76,8 @@ public class SaxonSecurityTest {
transformer.setDestination(result);
transformer.transform();
- // wenn der Punkt erreicht wird, sollte wenigstens, das Element evil nicht mit 'bösen' Inhalten gefüllt sein!
+ // wenn der Punkt erreicht wird, sollte wenigstens, das Element evil nicht mit 'bösen' Inhalten gefüllt
+ // sein!
if (StringUtils.isNotBlank(result.getXdmNode().getStringValue())) {
fail(String.format("Saxon configuration should prevent expansion within %s", resource));
}