Merge pull request #26100 from rsvoboda/cli.cleanup.2022-06-13

Minor CLI cleanup
quarkusio · Jun 14, 2022 · 2c2d0ce · 2c2d0ce
2 parents e9d1db1 + d51db86
commit 2c2d0ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/devtools/cli/src/main/java/io/quarkus/cli/common/DebugOptions.java b/devtools/cli/src/main/java/io/quarkus/cli/common/DebugOptions.java
@@ -6,7 +6,7 @@
 
 public class DebugOptions {
     final static String LOCALHOST = "localhost";
-    final static int DEFAULT_PORT = 5005;
+    static final int DEFAULT_PORT = 5005;
 
     public enum DebugMode {
         connect,

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java b/devtools/cli/src/main/java/io/quarkus/cli/common/TargetQuarkusVersionGroup.java
@@ -8,7 +8,7 @@
 import picocli.CommandLine.Model.CommandSpec;
 
 public class TargetQuarkusVersionGroup {
-    final static String FULL_EXAMPLE = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID + ":"
+    static final String FULL_EXAMPLE = ToolsConstants.DEFAULT_PLATFORM_BOM_GROUP_ID + ":"
             + ToolsConstants.DEFAULT_PLATFORM_BOM_ARTIFACT_ID + ":2.2.0.Final";
     PlatformStreamCoords streamCoords = null;
     String validStream = null;
@@ -30,7 +30,7 @@ void setStream(String stream) {
             } catch (IllegalArgumentException iex) {
                 throw new CommandLine.ParameterException(spec.commandLine(),
                         String.format("Invalid value '%s' for option '--stream'. " +
-                                "Value should be specified as 'platformKey:streamId'. %s", iex.getMessage()));
+                                "Value should be specified as 'platformKey:streamId'. %s", stream, iex.getMessage()));
             }
         }
     }

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/create/BaseCreateCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/create/BaseCreateCommand.java
@@ -245,7 +245,7 @@ public Integer call() throws Exception {
     public String toString() {
         return "BaseCreateCommand ["
                 + "outputPath=" + outputPath
-                + ", registryClient" + registryClient
+                + ", registryClient=" + registryClient
                 + ", projectDirName=" + projectDirName
                 + ", projectRootPath=" + projectRootPath
                 + ", targetDirectory=" + targetDirectory

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/create/ExtensionGAVMixin.java b/devtools/cli/src/main/java/io/quarkus/cli/create/ExtensionGAVMixin.java
@@ -7,8 +7,8 @@
 import picocli.CommandLine;
 
 public class ExtensionGAVMixin {
-    final static String DEFAULT_EXTENSION_ID = "custom";
-    final static String DEFAULT_GAV = "io.quarkiverse.custom:"
+    static final String DEFAULT_EXTENSION_ID = "custom";
+    static final String DEFAULT_GAV = "io.quarkiverse.custom:"
             + DEFAULT_EXTENSION_ID + ":"
             + CreateExtension.DEFAULT_VERSION;
 

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/create/TargetGAVGroup.java b/devtools/cli/src/main/java/io/quarkus/cli/create/TargetGAVGroup.java
@@ -4,7 +4,7 @@
 import picocli.CommandLine;
 
 public class TargetGAVGroup {
-    final static String DEFAULT_GAV = CreateProjectHelper.DEFAULT_GROUP_ID + ":"
+    static final String DEFAULT_GAV = CreateProjectHelper.DEFAULT_GROUP_ID + ":"
             + CreateProjectHelper.DEFAULT_ARTIFACT_ID + ":"
             + CreateProjectHelper.DEFAULT_VERSION;
 

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/registry/RegistryClientMixin.java b/devtools/cli/src/main/java/io/quarkus/cli/registry/RegistryClientMixin.java
@@ -21,7 +21,7 @@
 import picocli.CommandLine;
 
 public class RegistryClientMixin {
-    final static boolean VALIDATE = !Boolean.parseBoolean(System.getenv("REGISTRY_CLIENT_TEST"));
+    static final boolean VALIDATE = !Boolean.parseBoolean(System.getenv("REGISTRY_CLIENT_TEST"));
 
     /** @see io.quarkus.cli.registry.ToggleRegistryClientMixin#setRegistryClient */
     public final String getRegistryClientProperty() {