From 7a81f0c0429e07251c8843601b6ccb3d0cbd67a8 Mon Sep 17 00:00:00 2001 From: Adrian-Devries Date: Thu, 24 Apr 2025 12:54:02 +0200 Subject: [PATCH] 13-FixCodeStyleIssues --- .../de/kosit/validationtool/api/XmlError.java | 2 +- .../cmd/CommandLineApplication.java | 2 +- .../kosit/validationtool/cmd/Validator.java | 2 +- .../kosit/validationtool/cmd/report/Grid.java | 4 +- .../validationtool/daemon/HttpStatus.java | 2 +- .../impl/ConversionService.java | 2 +- .../impl/xml/RelativeUriResolver.java | 2 +- .../cmd/CommandlineApplicationTest.java | 37 +++++++++---------- 8 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/main/java/de/kosit/validationtool/api/XmlError.java b/src/main/java/de/kosit/validationtool/api/XmlError.java index 1b01cbd..7b67ceb 100644 --- a/src/main/java/de/kosit/validationtool/api/XmlError.java +++ b/src/main/java/de/kosit/validationtool/api/XmlError.java @@ -53,7 +53,7 @@ public interface XmlError { Integer getColumnNumber(); enum Severity { - SEVERITY_WARNING, SEVERITY_ERROR, SEVERITY_FATAL_ERROR; + SEVERITY_WARNING, SEVERITY_ERROR, SEVERITY_FATAL_ERROR } } diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java index 98c4485..588b88e 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java @@ -102,7 +102,7 @@ public class CommandLineApplication { enum Level { - INFO, WARN, DEBUG, TRACE, ERROR, OFF; + INFO, WARN, DEBUG, TRACE, ERROR, OFF } diff --git a/src/main/java/de/kosit/validationtool/cmd/Validator.java b/src/main/java/de/kosit/validationtool/cmd/Validator.java index b621e0c..1b391f7 100644 --- a/src/main/java/de/kosit/validationtool/cmd/Validator.java +++ b/src/main/java/de/kosit/validationtool/cmd/Validator.java @@ -257,7 +257,7 @@ public class Validator { if (cmd.getOutputPath() != null) { dir = cmd.getOutputPath(); if ((!Files.exists(dir) && !dir.toFile().mkdirs()) || !Files.isDirectory(dir)) { - throw new IllegalStateException(String.format("Invalid target directory %s specified", dir.toString())); + throw new IllegalStateException(String.format("Invalid target directory %s specified", dir)); } } else { dir = Paths.get(""/* cwd */); 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 35c4f2d..c0a9ed7 100644 --- a/src/main/java/de/kosit/validationtool/cmd/report/Grid.java +++ b/src/main/java/de/kosit/validationtool/cmd/report/Grid.java @@ -310,7 +310,7 @@ public class Grid { if (isEmpty(current) || virtualLine >= getMaxVirtualLine()) { break; } - b.append(current.toString()); + b.append(current); virtualLine++; b.append("\n"); } @@ -319,7 +319,7 @@ public class Grid { } private static boolean isEmpty(final StringBuilder current) { - return current.toString().replaceAll("\\|", "").trim().length() == 0; + return current.toString().replaceAll("\\|", "").trim().isEmpty(); } private int getMaxVirtualLine() { diff --git a/src/main/java/de/kosit/validationtool/daemon/HttpStatus.java b/src/main/java/de/kosit/validationtool/daemon/HttpStatus.java index 4b95ef6..243265f 100644 --- a/src/main/java/de/kosit/validationtool/daemon/HttpStatus.java +++ b/src/main/java/de/kosit/validationtool/daemon/HttpStatus.java @@ -40,7 +40,7 @@ public interface HttpStatus { int SC_NOT_ACCEPTABLE = 406; /** {@code 422 Unprocessable Entity} (WebDAV - RFC 2518) */ - public static final int SC_UNPROCESSABLE_ENTITY = 422; + int SC_UNPROCESSABLE_ENTITY = 422; /** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */ int SC_INTERNAL_SERVER_ERROR = 500; diff --git a/src/main/java/de/kosit/validationtool/impl/ConversionService.java b/src/main/java/de/kosit/validationtool/impl/ConversionService.java index a29946d..96d219a 100644 --- a/src/main/java/de/kosit/validationtool/impl/ConversionService.java +++ b/src/main/java/de/kosit/validationtool/impl/ConversionService.java @@ -189,7 +189,7 @@ public class ConversionService { return value; } catch (final JAXBException | XMLStreamException e) { - throw new ConversionException(String.format("Can not unmarshal to type %s from %s", type.getSimpleName(), xml.toString()), e); + throw new ConversionException(String.format("Can not unmarshal to type %s from %s", type.getSimpleName(), xml), e); } } 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 cb51b68..db9d4f3 100644 --- a/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java +++ b/src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java @@ -69,7 +69,7 @@ public class RelativeUriResolver implements URIResolver, UnparsedTextURIResolver final boolean jarURI = isJarURI(base); final URI tmpBase = jarURI ? URI.create(base.toASCIIString().substring(4)) : base; final URI result = tmpBase.resolve(href); - return jarURI ? URI.create("jar:" + result.toString()) : result; + return jarURI ? URI.create("jar:" + result) : result; } static boolean isJarURI(final URI uri) { diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java index 4600eb0..247c0ff 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java @@ -243,27 +243,26 @@ public class CommandlineApplicationTest { @Test public void loadMultipleScenarios() { - final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s", - "s2=" + Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r", - "s2=" + Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() }; - CommandLineApplication.mainProgram(args); - assertThat(CommandLine.getOutput()).contains("Processing of 1 objects completed"); - } - - @Test - public void loadMultipleScenariosSingleRepository() { - final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s", - "s2=" + Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(), + final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-s", "s2=" + Paths.get(Simple.OTHER_SCENARIOS), + "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI), "-r", "s2=" + Paths.get(Simple.REPOSITORY_URI), Paths.get(Simple.SIMPLE_VALID).toString() }; CommandLineApplication.mainProgram(args); assertThat(CommandLine.getOutput()).contains("Processing of 1 objects completed"); } + @Test + public void loadMultipleScenariosSingleRepository() { + final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-s", "s2=" + Paths.get(Simple.OTHER_SCENARIOS), + "-r", Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() }; + CommandLineApplication.mainProgram(args); + assertThat(CommandLine.getOutput()).contains("Processing of 1 objects completed"); + } + @Test public void loadMultipleScenariosMissingRepository() { - final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-s", - "s2=" + Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r", - "typo=" + Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() }; + final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-s", "s2=" + Paths.get(Simple.OTHER_SCENARIOS), + "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI), "-r", "typo=" + Paths.get(Simple.REPOSITORY_URI), + Paths.get(Simple.SIMPLE_VALID).toString() }; CommandLineApplication.mainProgram(args); assertThat(CommandLine.getErrorOutput()).contains("No repository location for scenario definition 's2' specified"); } @@ -279,9 +278,8 @@ public class CommandlineApplicationTest { @Test public void checkUnusedRepository() { - final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-r", - "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r", "unused=" + Paths.get(Simple.REPOSITORY_URI).toString(), - Paths.get(Simple.SIMPLE_VALID).toString() }; + final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI), + "-r", "unused=" + Paths.get(Simple.REPOSITORY_URI), Paths.get(Simple.SIMPLE_VALID).toString() }; CommandLineApplication.mainProgram(args); assertThat(CommandLine.getOutput()).contains("Processing of 1 objects completed"); assertThat(CommandLine.getErrorOutput()).contains("Warning: repository definition \"unused\" is not used"); @@ -289,9 +287,8 @@ public class CommandlineApplicationTest { @Test public void checkDuplicationScenarioDefinition() { - final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS).toString(), "-r", - "s1=" + Paths.get(Simple.REPOSITORY_URI).toString(), "-r", "unused=" + Paths.get(Simple.REPOSITORY_URI).toString(), - Paths.get(Simple.SIMPLE_VALID).toString() }; + final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-r", "s1=" + Paths.get(Simple.REPOSITORY_URI), + "-r", "unused=" + Paths.get(Simple.REPOSITORY_URI), Paths.get(Simple.SIMPLE_VALID).toString() }; CommandLineApplication.mainProgram(args); assertThat(CommandLine.getOutput()).contains("Processing of 1 objects completed"); assertThat(CommandLine.getErrorOutput()).contains("Warning: repository definition \"unused\" is not used");