[WFCORE-7124] Remove use of server-side Stability type from the CLI

wildfly · Jan 14, 2025 · 349b32d · 349b32d
1 parent 55e18a0
commit 349b32d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 9 deletions.
diff --git a/cli/pom.xml b/cli/pom.xml
@@ -273,10 +273,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-version</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-auth-server</artifactId>

diff --git a/cli/src/main/java/org/jboss/as/cli/embedded/EmbedHostControllerHandler.java b/cli/src/main/java/org/jboss/as/cli/embedded/EmbedHostControllerHandler.java
@@ -28,7 +28,6 @@
 import org.jboss.as.cli.operation.ParsedCommandLine;
 import org.jboss.as.controller.client.ModelControllerClient;
 import org.jboss.as.controller.client.helpers.ClientConstants;
-import org.jboss.as.version.Stability;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logmanager.LogContext;
 import org.jboss.modules.ModuleLoader;
@@ -90,7 +89,7 @@ static EmbedHostControllerHandler create(final AtomicReference<EmbeddedProcessLa
         result.removeExistingDomainConfig = new ArgumentWithoutValue(result, REMOVE_EXISTING_DOMAIN_CONFIG);
         result.emptyHostConfig = new ArgumentWithoutValue(result, EMPTY_HOST_CONFIG);
         result.removeExistingHostConfig = new ArgumentWithoutValue(result, REMOVE_EXISTING_HOST_CONFIG);
-        // TODO: Use ProductConfig.getStabilitySet()
+        // We must use our own Stability for tab completion choices as the client-side CLI can't depend on the server-side type
         result.stability = new ArgumentWithValue(result, new SimpleTabCompleter(EnumSet.allOf(Stability.class)), "--stability");
         return result;
     }

diff --git a/cli/src/main/java/org/jboss/as/cli/embedded/EmbedServerHandler.java b/cli/src/main/java/org/jboss/as/cli/embedded/EmbedServerHandler.java
@@ -28,7 +28,6 @@
 import org.jboss.as.cli.operation.ParsedCommandLine;
 import org.jboss.as.controller.client.ModelControllerClient;
 import org.jboss.as.controller.client.helpers.ClientConstants;
-import org.jboss.as.version.Stability;
 import org.jboss.dmr.ModelNode;
 import org.jboss.logmanager.LogContext;
 import org.jboss.modules.ModuleLoader;
@@ -81,7 +80,7 @@ static EmbedServerHandler create(final AtomicReference<EmbeddedProcessLaunch> se
         result.removeExisting = new ArgumentWithoutValue(result, "--remove-existing");
         result.removeExisting.addRequiredPreceding(result.emptyConfig);
         result.timeout = new ArgumentWithValue(result, "--timeout");
-        // TODO: Use ProductConfig.getStabilitySet()
+        // We must use our own Stability for tab completion choices as the client-side CLI can't depend on the server-side type
         result.stability = new ArgumentWithValue(result, new SimpleTabCompleter(EnumSet.allOf(Stability.class)), "--stability");
 
         return result;

diff --git a/cli/src/main/java/org/jboss/as/cli/embedded/Stability.java b/cli/src/main/java/org/jboss/as/cli/embedded/Stability.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright The WildFly Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.jboss.as.cli.embedded;
+
+/**
+ * Counterpart to the server-side {@code org.jboss.as.version.Stability}.
+ * We cannot depend on the server-side type in the strictly client-side CLI.
+ * <p/>
+ * <strong>This must only be used for tab completion suggestions. The CLI does not
+ * control the valid stability levels for a server, so if this class is out of sync
+ * with what a server allows, the only acceptable effect is incorrect suggestions.</strong>
+ * The alternative to this restriction is to not suggest values at all and remove this type.
+ */
+enum Stability {
+
+    DEFAULT("default"),
+    COMMUNITY("community"),
+    PREVIEW("preview"),
+    EXPERIMENTAL("experimental"),
+    ;
+    private final String value;
+
+    Stability(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return this.value;
+    }
+}
diff --git a/...ack/common/src/main/resources/modules/system/layers/base/org/jboss/as/cli/main/module.xml b/...ack/common/src/main/resources/modules/system/layers/base/org/jboss/as/cli/main/module.xml
@@ -34,7 +34,6 @@
         <module name="org.jboss.modules"/>
         <module name="org.jboss.as.controller-client"/>
         <module name="org.jboss.as.protocol"/>
-        <module name="org.jboss.as.version"/>
         <module name="org.wildfly.security.elytron-private" services="import"/>
         <!-- optional dep that we will remove when galleon patching is used-->
         <module name="org.jboss.as.patching.cli" optional="true" services="import"/>