diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e74fdb..416fca6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 # 1.5.0 (to be released) +### Fixed + +- [#93](https://projekte.kosit.org/kosit/validator/-/issues/93) Remove usage information, when validation failed (CLI) + ### Added - Support for multiple configurations and multiple repositories. See [cli documentation](docs/cli.md) for details @@ -18,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 removed. - Bump [Saxon HE](https://www.saxonica.com/documentation11/documentation.xml) to 11.4 - Bump [jaxb-ri](https://github.com/eclipse-ee4j/jaxb-ri) to 2.3.7 + - [INTERNAL] CLI parsing based on pico-cli, commons-cli is removed ## 1.4.2 diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java index 89a9faa..c99f63e 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineApplication.java @@ -20,7 +20,6 @@ import static de.kosit.validationtool.impl.Printer.writeErr; import org.apache.commons.lang3.ObjectUtils; import org.fusesource.jansi.AnsiConsole; -import org.fusesource.jansi.AnsiConsole; import org.fusesource.jansi.AnsiRenderer.Code; import de.kosit.validationtool.cmd.report.Line; @@ -84,8 +83,7 @@ public class CommandLineApplication { resultStatus = ReturnValue.HELP_REQUEST; } else { resultStatus = ObjectUtils.defaultIfNull(commandLine.getExecutionResult(), ReturnValue.PARSING_ERROR); - if (resultStatus.getCode() != ReturnValue.PARSING_ERROR.getCode() - && resultStatus.getCode() != ReturnValue.SUCCESS.getCode()) { + if (resultStatus.getCode() < 0) { commandLine.usage(System.out); } } diff --git a/src/main/java/de/kosit/validationtool/cmd/ReturnValue.java b/src/main/java/de/kosit/validationtool/cmd/ReturnValue.java index 9d292b3..b060633 100644 --- a/src/main/java/de/kosit/validationtool/cmd/ReturnValue.java +++ b/src/main/java/de/kosit/validationtool/cmd/ReturnValue.java @@ -20,7 +20,8 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; /** - * CLI return codes. + * CLI return codes. Codes > 0 indicate a processing error. Codes < indicates a configuration error. Code 0 indicates a + * successful processing. * * @author Andreas Penski */