chore: Fix sonarqube issues

ludovicianul · ludovicianul · commit 8cb7234ef879 · 2025-09-02T21:16:26.000+03:00
diff --git a/src/main/java/dev/dochia/cli/core/DochiaMain.java b/src/main/java/dev/dochia/cli/core/DochiaMain.java
@@ -54,7 +54,7 @@ public int run(String... args) {
         commandLine.getCommandSpec().usageMessage().abbreviateSynopsis(true);
         commandLine.setExecutionStrategy(parseResult -> {
             if (commandLine.isUsageHelpRequested() || (parseResult.subcommand() != null && parseResult.subcommand().isUsageHelpRequested())) {
-                commandLine.getOut().println(ConsoleUtils.getShortVersionOfHelp());
+                commandLine.getOut().println(ConsoleUtils.SHORT_HELP);
                 return CommandLine.ExitCode.OK;
             }
             if (parseResult.subcommand() != null && parseResult.subcommand().hasMatchedOption("--help-full")) {
diff --git a/src/main/java/dev/dochia/cli/core/command/DochiaCommand.java b/src/main/java/dev/dochia/cli/core/command/DochiaCommand.java
@@ -81,7 +81,7 @@ public void run() {
         if (licenses) {
             System.exit(displayLicenses());
         }
-        System.out.println(ConsoleUtils.getShortVersionOfHelp());
+        System.out.println(ConsoleUtils.SHORT_HELP);
     }
 
     private int displayLicenses() {
diff --git a/src/main/java/dev/dochia/cli/core/command/ShortErrorMessageHandler.java b/src/main/java/dev/dochia/cli/core/command/ShortErrorMessageHandler.java
@@ -31,7 +31,7 @@ public int handleParseException(CommandLine.ParameterException ex, String[] args
         err.println(cmd.getColorScheme().errorText(ex.getMessage())); // bold red
         CommandLine.UnmatchedArgumentException.printSuggestions(ex, err);
         ConsoleUtils.emptyLine();
-        err.println(ConsoleUtils.getShortVersionOfHelp());
+        err.println(ConsoleUtils.SHORT_HELP);
 
         CommandLine.Model.CommandSpec spec = cmd.getCommandSpec();
 
diff --git a/src/main/java/dev/dochia/cli/core/command/TestCommand.java b/src/main/java/dev/dochia/cli/core/command/TestCommand.java
@@ -167,7 +167,7 @@ public void run() {
 
     private void checkIfNotArgs() {
         if (apiArguments.getContract() == null && apiArguments.getServer() == null) {
-            System.out.println(ConsoleUtils.getShortVersionOfHelp());
+            System.out.println(ConsoleUtils.SHORT_HELP);
             System.exit(0);
         }
     }
diff --git a/src/main/java/dev/dochia/cli/core/io/ServiceCaller.java b/src/main/java/dev/dochia/cli/core/io/ServiceCaller.java
@@ -15,11 +15,11 @@
 import dev.dochia.cli.core.context.GlobalContext;
 import dev.dochia.cli.core.dsl.DSLParser;
 import dev.dochia.cli.core.dsl.api.Parser;
-import dev.dochia.cli.core.playbook.api.DryRun;
 import dev.dochia.cli.core.http.HttpMethod;
 import dev.dochia.cli.core.io.util.FormEncoder;
 import dev.dochia.cli.core.model.HttpRequest;
 import dev.dochia.cli.core.model.HttpResponse;
+import dev.dochia.cli.core.playbook.api.DryRun;
 import dev.dochia.cli.core.report.TestCaseListener;
 import dev.dochia.cli.core.strategy.FuzzingStrategy;
 import dev.dochia.cli.core.util.*;
@@ -465,10 +465,7 @@ private HttpResponse.HttpResponseBuilder populateDochiaResponseFromHttpResponse(
 
     private String getResponseContentType(Response response) {
         MediaType defaultResponseMediaType = MediaType.parse(HttpResponse.unknownContentType());
-        if (response.body() != null) {
-            return String.valueOf(Optional.ofNullable(response.body().contentType()).orElse(defaultResponseMediaType));
-        }
-        return String.valueOf(defaultResponseMediaType);
+        return String.valueOf(Optional.ofNullable(response.body().contentType()).orElse(defaultResponseMediaType));
     }
 
     private void addBasicAuth(List<KeyValuePair<String, Object>> headers) {
@@ -547,11 +544,7 @@ private List<KeyValuePair<String, String>> buildQueryParameters(String payload,
      * @throws IOException If an I/O error occurs while reading the response body.
      */
     public String getAsRawString(Response response) throws IOException {
-        if (response.body() != null) {
-            return response.body().string();
-        }
-
-        return "";
+        return Optional.ofNullable(response.body().string()).orElse("");
     }
 
     private void recordServiceData(ServiceData serviceData) {
diff --git a/src/main/java/dev/dochia/cli/core/util/CommonUtils.java b/src/main/java/dev/dochia/cli/core/util/CommonUtils.java
@@ -283,7 +283,7 @@ public static String check(String[] pathElements, Predicate<String> checkFunctio
       }
     }
 
-    if (!result.toString().isEmpty()) {
+    if (!result.isEmpty()) {
       return StringUtils.stripStart(result.toString().trim(), ", ");
     }
 
diff --git a/src/main/java/dev/dochia/cli/core/util/ConsoleUtils.java b/src/main/java/dev/dochia/cli/core/util/ConsoleUtils.java
@@ -21,6 +21,41 @@ public abstract class ConsoleUtils {
 
     private static final Pattern ANSI_REMOVE_PATTERN = Pattern.compile("\u001B\\[[;\\d]*m");
     public static final String SEPARATOR = "  ";
+    public static final String SHORT_HELP =
+            """
+                    dochia – Bringing chaos with love!
+                    
+                    Description:
+                      dochia automatically generates and executes negative and boundary testing
+                      so you can focus on creative problem-solving.
+                    
+                      dochia is designed to work with OpenAPI specifications and can be run in various modes.
+                      The simplest way to run dochia is to provide the OpenAPI spec and the server URL.
+                    
+                    Examples:
+                      dochia test -c api.yml -s http://localhost:8080 -H 'Authorization=Bearer TOKEN'
+                    
+                    Usage:
+                      dochia test -c <contract> -s <server> [OPTIONS]
+                      dochia (test | fuzz | replay | list | info | explain) [OPTIONS]
+                    
+                    Common Options:
+                      -h, --help                     Show help and exit.
+                      -V, --version                  Print version and exit.
+                      -c, --contract=<contract>      API contract or spec.
+                      -s, --server=<server>          Base URL of the service.
+                      -H=<name=value>                Custom headers applicable to all paths(e.g., auth tokens)
+                          --headers=<file>           YAML file with custom headers specific per path (e.g., auth tokens).
+                      -R=<name=value>                Fixed field values applicable to all paths.
+                          --reference-data=<file>          YAML file with fixed field values specific per path.
+                      -f, --playbooks=<list>           Playbook names to run.
+                      -p, --paths=<list>             Specific paths to test.
+                      -d, --dry-run                  Simulate tests without executing.
+                    
+                    For full commands and options, run:
+                      dochia (test | fuzz | replay | list | info | explain) --help-full
+                    
+                    """;
 
     /**
      * Get the width of the terminal.
@@ -178,41 +213,4 @@ public static void renderSameRowAndMoveToNextLine(String message) {
     public static void emptyLine() {
         LOGGER.noFormat(" ");
     }
-
-    public static String getShortVersionOfHelp() {
-        return """
-                dochia – Bringing chaos with love!
-                
-                Description:
-                  dochia automatically generates and executes negative and boundary testing
-                  so you can focus on creative problem-solving.
-                
-                  dochia is designed to work with OpenAPI specifications and can be run in various modes.
-                  The simplest way to run dochia is to provide the OpenAPI spec and the server URL.
-                
-                Examples:
-                  dochia test -c api.yml -s http://localhost:8080 -H 'Authorization=Bearer TOKEN'
-                
-                Usage:
-                  dochia test -c <contract> -s <server> [OPTIONS]
-                  dochia (test | fuzz | replay | list | info | explain) [OPTIONS]
-                
-                Common Options:
-                  -h, --help                     Show help and exit.
-                  -V, --version                  Print version and exit.
-                  -c, --contract=<contract>      API contract or spec.
-                  -s, --server=<server>          Base URL of the service.
-                  -H=<name=value>                Custom headers applicable to all paths(e.g., auth tokens)
-                      --headers=<file>           YAML file with custom headers specific per path (e.g., auth tokens).
-                  -R=<name=value>                Fixed field values applicable to all paths.
-                      --reference-data=<file>          YAML file with fixed field values specific per path.
-                  -f, --playbooks=<list>           Playbook names to run.
-                  -p, --paths=<list>             Specific paths to test.
-                  -d, --dry-run                  Simulate tests without executing.
-                
-                For full commands and options, run:
-                  dochia (test | fuzz | replay | list | info | explain) --help-full
-                
-                """;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public int run(String... args) {`
`54`	`54`	`commandLine.getCommandSpec().usageMessage().abbreviateSynopsis(true);`
`55`	`55`	`commandLine.setExecutionStrategy(parseResult -> {`
`56`	`56`	`if (commandLine.isUsageHelpRequested() \|\| (parseResult.subcommand() != null && parseResult.subcommand().isUsageHelpRequested())) {`
`57`		`- commandLine.getOut().println(ConsoleUtils.getShortVersionOfHelp());`
	`57`	`+ commandLine.getOut().println(ConsoleUtils.SHORT_HELP);`
`58`	`58`	`return CommandLine.ExitCode.OK;`
`59`	`59`	`}`
`60`	`60`	`if (parseResult.subcommand() != null && parseResult.subcommand().hasMatchedOption("--help-full")) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void run() {`
`81`	`81`	`if (licenses) {`
`82`	`82`	`System.exit(displayLicenses());`
`83`	`83`	`}`
`84`		`- System.out.println(ConsoleUtils.getShortVersionOfHelp());`
	`84`	`+ System.out.println(ConsoleUtils.SHORT_HELP);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private int displayLicenses() {`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ public void run() {`
`167`	`167`
`168`	`168`	`private void checkIfNotArgs() {`
`169`	`169`	`if (apiArguments.getContract() == null && apiArguments.getServer() == null) {`
`170`		`- System.out.println(ConsoleUtils.getShortVersionOfHelp());`
	`170`	`+ System.out.println(ConsoleUtils.SHORT_HELP);`
`171`	`171`	`System.exit(0);`
`172`	`172`	`}`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ public static String check(String[] pathElements, Predicate<String> checkFunctio`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`286`		`- if (!result.toString().isEmpty()) {`
	`286`	`+ if (!result.isEmpty()) {`
`287`	`287`	`return StringUtils.stripStart(result.toString().trim(), ", ");`
`288`	`288`	`}`
`289`	`289`