From f4509fd097d6ec6d77532c32512948a856990ab4 Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Thu, 13 Aug 2020 15:23:59 +0200 Subject: [PATCH] cleanup --- .../cmd/CommandLineOptions.java | 23 ++++--------------- .../kosit/validationtool/cmd/Validator.java | 4 ++++ .../de/kosit/validationtool/impl/Printer.java | 5 ++++ 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java index c871b5f..992e083 100644 --- a/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java +++ b/src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java @@ -9,56 +9,41 @@ 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(); - public static final int DAEMON_SIGNAL = 100; - static final Option PRINT_MEM_STATS = Option.builder("m").longOpt("memory-stats").desc("Prints some memory stats").build(); + private CommandLineOptions() { + // hide + } + static org.apache.commons.cli.Options createOptions() { final org.apache.commons.cli.Options options = new org.apache.commons.cli.Options(); options.addOption(HELP); diff --git a/src/main/java/de/kosit/validationtool/cmd/Validator.java b/src/main/java/de/kosit/validationtool/cmd/Validator.java index 64d743d..c66015a 100644 --- a/src/main/java/de/kosit/validationtool/cmd/Validator.java +++ b/src/main/java/de/kosit/validationtool/cmd/Validator.java @@ -66,6 +66,10 @@ import net.sf.saxon.s9api.Processor; @SuppressWarnings("squid:S3725") public class Validator { + private Validator() { + // hide + } + /** * Hauptprogramm für die Kommandozeilen-Applikation. * diff --git a/src/main/java/de/kosit/validationtool/impl/Printer.java b/src/main/java/de/kosit/validationtool/impl/Printer.java index d1f726c..87bdf8d 100644 --- a/src/main/java/de/kosit/validationtool/impl/Printer.java +++ b/src/main/java/de/kosit/validationtool/impl/Printer.java @@ -7,8 +7,13 @@ import java.text.MessageFormat; * * @author Andreas Penski */ +@SuppressWarnings("squid:S106") public class Printer { + private Printer() { + // hide + } + /** * Writes to standard output channel. *