diff --git a/pom.xml b/pom.xml index fb79609..4ec1e15 100644 --- a/pom.xml +++ b/pom.xml @@ -99,12 +99,12 @@ 1.0.2 4.7.7 7.13.0 - 5.5.1 + 5.5.2 3.8.0 3.9.0 2.9.0 3.8.0 - 12.6 + 12.7 2.0.17 2.0.17 @@ -137,7 +137,7 @@ 3.21.0 3.3.1 3.5.3 - 6.8.0 + 6.8.1 4.9.3.0 2.18.0 diff --git a/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java b/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java index 91b6dcb..b5a8a9d 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/CheckAssertionAction.java @@ -59,7 +59,9 @@ class CheckAssertionAction implements CheckAction { @Override public void check(Bag results) { - log.info("Checking assertions for {}", results.getInput().getName()); + if (log.isInfoEnabled()) { + log.info("Checking assertions for {}", results.getInput().getName()); + } final List toCheck = findAssertions(results.getName()); final List errors = new ArrayList<>(); if (toCheck != null && !toCheck.isEmpty()) { @@ -71,7 +73,9 @@ class CheckAssertionAction implements CheckAction { } }); if (errors.isEmpty()) { - log.info("{} assertions successfully verified for {}", toCheck.size(), results.getName()); + if (log.isInfoEnabled()) { + log.info("{} assertions successfully verified for {}", toCheck.size(), results.getName()); + } } else { log.warn("{} assertion of {} failed while checking {}", errors.size(), toCheck.size(), results.getName()); } diff --git a/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java b/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java index 1454773..cbd8df1 100644 --- a/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/ExtractHtmlContentAction.java @@ -63,7 +63,9 @@ class ExtractHtmlContentAction implements CheckAction { final Path file = this.outputDirectory.resolve(name + ".html"); final Serializer serializer = this.processor.newSerializer(file.toFile()); try { - log.info("Writing report html '{}' to {}", name, file.toAbsolutePath()); + if (log.isInfoEnabled()) { + log.info("Writing report html '{}' to {}", name, file.toAbsolutePath()); + } serializer.serializeNode(node); } catch (final SaxonApiException e) { log.error("Error extracting html content to {}", file.toAbsolutePath(), e); diff --git a/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java b/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java index 1530367..23f5117 100644 --- a/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/SerializeReportAction.java @@ -44,7 +44,9 @@ class SerializeReportAction implements CheckAction { public void check(final Bag results) { final Path file = this.outputDirectory.resolve(this.namingStrategy.createName(results.getName())); try { - log.info("Serializing result to {}", file.toAbsolutePath()); + if (log.isInfoEnabled()) { + log.info("Serializing result to {}", file.toAbsolutePath()); + } final Serializer serializer = this.processor.newSerializer(file.toFile()); serializer.serializeNode(results.getReport()); } catch (final SaxonApiException e) { diff --git a/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java b/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java index fb4ebc2..25c2ed6 100644 --- a/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java +++ b/src/main/java/de/kosit/validationtool/cmd/SerializeReportInputAction.java @@ -42,7 +42,9 @@ public class SerializeReportInputAction implements CheckAction { public void check(final Bag results) { final Path file = this.outputDirectory.resolve(results.getName() + "-reportInput.xml"); try { - log.info("Serializing result to {}", file.toAbsolutePath()); + if (log.isInfoEnabled()) { + log.info("Serializing result to {}", file.toAbsolutePath()); + } final String xml = this.conversionService.writeXml(results.getReportInput()); Files.write(file, xml.getBytes()); } catch (final IOException e) { diff --git a/src/main/java/de/kosit/validationtool/cmd/Validator.java b/src/main/java/de/kosit/validationtool/cmd/Validator.java index b006351..bf5ba41 100644 --- a/src/main/java/de/kosit/validationtool/cmd/Validator.java +++ b/src/main/java/de/kosit/validationtool/cmd/Validator.java @@ -167,7 +167,9 @@ public class Validator { Printer.writeOut("Processing of {0} objects completed in {1}ms", targets.size(), processingTime); check.printResults(results); - log.info("Processing {} object(s) completed in {}ms", targets.size(), processingTime); + if (log.isInfoEnabled()) { + log.info("Processing {} object(s) completed in {}ms", targets.size(), processingTime); + } return check.isSuccessful(results) ? ReturnValue.SUCCESS : ReturnValue.createFailed(check.getNotAcceptableCount(results)); } diff --git a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java index 38b330d..da49e3a 100644 --- a/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java +++ b/src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java @@ -187,7 +187,9 @@ public class ConfigurationLoader { final ConversionService conversionService = new ConversionService(); final Scenarios scenarios = conversionService.readXml(this.scenarioDefinition, Scenarios.class, scenarioSchema, handler); if (!handler.hasErrors()) { - log.info("Loading scenario content from {}", this.getScenarioRepository()); + if (log.isInfoEnabled()) { + log.info("Loading scenario content from {}", this.getScenarioRepository()); + } } else { throw new IllegalStateException( String.format("Can not load scenarios from %s due to %s", getScenarioDefinition(), handler.getErrorDescription())); diff --git a/src/main/java/de/kosit/validationtool/daemon/Daemon.java b/src/main/java/de/kosit/validationtool/daemon/Daemon.java index 6aee9ec..74e3c37 100644 --- a/src/main/java/de/kosit/validationtool/daemon/Daemon.java +++ b/src/main/java/de/kosit/validationtool/daemon/Daemon.java @@ -89,7 +89,9 @@ public class Daemon { server.createContext("/server/config", new ConfigHandler(check.getConfiguration(), converter)); server.setExecutor(createExecutor()); server.start(); - log.info("Server {} started", server.getAddress()); + if (log.isInfoEnabled()) { + log.info("Server {} started", server.getAddress()); + } writeOut("Daemon started. Visit http://{0}", this.bindAddress + ":" + this.port); } catch (final IOException e) { log.error("Error starting HttpServer for Validator: {}", e.getMessage(), e); diff --git a/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java b/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java index c6c18ef..53da291 100644 --- a/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java +++ b/src/main/java/de/kosit/validationtool/impl/DefaultCheck.java @@ -114,16 +114,22 @@ public class DefaultCheck implements Check { protected Result runCheckInternal(final CheckAction.Bag t) { final long started = System.currentTimeMillis(); - log.info("Checking content of {}", t.getInput().getName()); + if (log.isInfoEnabled()) { + log.info("Checking content of {}", t.getInput().getName()); + } for (final CheckAction action : this.checkSteps) { final long start = System.currentTimeMillis(); if (!action.isSkipped(t)) { action.check(t); } - log.debug("Step {} finished in {}ms", action.getClass().getSimpleName(), System.currentTimeMillis() - start); + if (log.isDebugEnabled()) { + log.debug("Step {} finished in {}ms", action.getClass().getSimpleName(), System.currentTimeMillis() - start); + } } t.setFinished(true); - log.info("Finished check of {} in {}ms\n", t.getInput().getName(), System.currentTimeMillis() - started); + if (log.isInfoEnabled()) { + log.info("Finished check of {} in {}ms\n", t.getInput().getName(), System.currentTimeMillis() - started); + } return createResult(t); } diff --git a/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java b/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java index 95b6439..5e0c394 100644 --- a/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java +++ b/src/main/java/de/kosit/validationtool/impl/ScenarioRepository.java @@ -49,7 +49,9 @@ public final class ScenarioRepository { } this.configuration = Arrays.asList(configuration); this.configuration.forEach(v -> log.info("Loaded scenarios for {} by {} from {}.", v.getName(), v.getAuthor(), v.getDate())); - log.info("The following scenarios are available:\n{}", summarizeScenarios()); + if (log.isInfoEnabled()) { + log.info("The following scenarios are available:\n{}", summarizeScenarios()); + } } public Scenario getFallbackScenario() { 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 3554b53..9cb3e5b 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/ScenarioSelectionAction.java @@ -49,9 +49,13 @@ public class ScenarioSelectionAction implements CheckAction { results.setScenarioSelectionResult(scenarioTypeResult); if (!scenarioTypeResult.getObject().isFallback()) { report.setScenario(scenarioTypeResult.getObject().getConfiguration()); - log.info("Scenario {} identified for {}", scenarioTypeResult.getObject().getName(), results.getInput().getName()); + if (log.isInfoEnabled()) { + log.info("Scenario {} identified for {}", scenarioTypeResult.getObject().getName(), results.getInput().getName()); + } } else { - log.info("No valid scenario configuration found for {}", results.getInput().getName()); + if (log.isInfoEnabled()) { + log.info("No valid scenario configuration found for {}", results.getInput().getName()); + } } } 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 2df878c..98b7a35 100644 --- a/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java +++ b/src/main/java/de/kosit/validationtool/impl/tasks/SchemaValidationAction.java @@ -136,7 +136,9 @@ public class SchemaValidationAction implements CheckAction { private long inMemoryLimit = Long.parseLong(System.getProperty(LIMIT_PARAMETER, BA_LIMIT.toString())) * FileUtils.ONE_MB; private Result validate(final Bag results, final Scenario scenario) { - log.debug("Validating document using scenario {}", scenario.getConfiguration().getName()); + if (log.isDebugEnabled()) { + log.debug("Validating document using scenario {}", scenario.getConfiguration().getName()); + } final CollectingErrorEventHandler errorHandler = new CollectingErrorEventHandler(); try ( final SourceProvider validateInput = resolveSource(results) ) {