Merge pull request #5413 from pferraro/WFCORE-6221

WFCORE-6221 Add formal experimental/preview mode to management model

cli/src/main/java/org/jboss/as/cli/embedded/EmbedHostControllerHandler.java

@@ -90,6 +90,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()
         result.stability = new ArgumentWithValue(result, new SimpleTabCompleter(EnumSet.allOf(Stability.class)), "--stability");
         return result;
     }

cli/src/main/java/org/jboss/as/cli/embedded/EmbedServerHandler.java

@@ -81,6 +81,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()
         result.stability = new ArgumentWithValue(result, new SimpleTabCompleter(EnumSet.allOf(Stability.class)), "--stability");
 
         return result;

controller/src/main/java/org/jboss/as/controller/registry/ManagementResourceRegistration.java

@@ -67,7 +67,8 @@ public interface ManagementResourceRegistration extends ImmutableManagementResou
      *
      * @param resourceDefinition source for descriptive information describing this
      *                            portion of the model (must not be {@code null})
-     * @return a resource registration which may be used to add attributes, operations, notifications and sub-models
+     * @return a resource registration which may be used to add attributes, operations, notifications and sub-models,
+     *         or null, if this resource definition is not enabled by the current stability level.
      *
      * @throws IllegalArgumentException if a submodel is already registered at {@code address}
      * @throws IllegalStateException if {@link #isRuntimeOnly()} returns {@code true}
@@ -103,7 +104,7 @@ public interface ManagementResourceRegistration extends ImmutableManagementResou
      * @param name the specific name of the resource. Cannot be {@code null} or {@link PathElement#WILDCARD_VALUE}
      * @param descriptionProvider provider for descriptions of the additional attributes or child types
      *
-     * @return a resource registration which may be used to add attributes, operations and sub-models
+     * @return a resource registration which may be used to add attributes, operations and sub-models.
      *
      * @throws IllegalArgumentException if either parameter is null or if there is already a registration under {@code name}
      * @throws IllegalStateException if {@link #isRuntimeOnly()} returns {@code true} or if {@link #isAllowsOverride()} returns false
@@ -118,7 +119,8 @@ public interface ManagementResourceRegistration extends ImmutableManagementResou
      * @param registration the child registration of this registry that should no longer be available
      * @param descriptionProvider provider for descriptions of the additional attributes or child types
      *
-     * @return a resource registration which may be used to add attributes, operations and sub-models
+     * @return a resource registration which may be used to add attributes, operations and sub-models,
+     *         or null, if this resource definition is not enabled by the current stability level.
      *
      * @throws IllegalArgumentException if either parameter is null or if there is already a registration under {@code name}
      * @throws IllegalStateException if {@link #isRuntimeOnly()} returns {@code true} or if {@link #isAllowsOverride()} returns false

host-controller/src/main/java/org/jboss/as/host/controller/HostControllerEnvironment.java

@@ -485,7 +485,7 @@ public HostControllerEnvironment(Map<String, String> hostSystemProperties, boole
         this.processType = processType;
 
         this.stability = getEnumProperty(hostSystemProperties, STABILITY, this.productConfig.getDefaultStability());
-        if (!this.productConfig.getMinimumStability().enables(this.stability)) {
+        if (!this.productConfig.getStabilitySet().contains(this.stability)) {
             throw HostControllerLogger.ROOT_LOGGER.unsupportedStability(this.stability, this.productConfig.getProductName());
         }
         if (!hostSystemProperties.containsKey(STABILITY)) {

host-controller/src/main/java/org/jboss/as/host/controller/HostControllerEnvironmentWrapper.java

@@ -5,6 +5,8 @@
 
 package org.jboss.as.host.controller;
 
+import org.jboss.as.version.ProductConfig;
+
 /**
  * @author wangc
  *
@@ -18,18 +20,20 @@ enum HostControllerEnvironmentStatus {
 
     private HostControllerEnvironment hostControllerEnvironment;
     private HostControllerEnvironmentStatus hostControllerEnvironmentStatus;
+    private ProductConfig productConfig;
 
-    private HostControllerEnvironmentWrapper(HostControllerEnvironment hostControllerEnvironment, HostControllerEnvironmentStatus hostControllerEnvironmentStatus) {
+    private HostControllerEnvironmentWrapper(HostControllerEnvironment hostControllerEnvironment, HostControllerEnvironmentStatus hostControllerEnvironmentStatus, ProductConfig productConfig) {
         this.hostControllerEnvironment = hostControllerEnvironment;
         this.hostControllerEnvironmentStatus = hostControllerEnvironmentStatus;
+        this.productConfig = productConfig;
     }
 
     HostControllerEnvironmentWrapper(HostControllerEnvironment hostControllerEnvironment) {
-        this(hostControllerEnvironment, null);
+        this(hostControllerEnvironment, null, hostControllerEnvironment.getProductConfig());
     }
 
-    HostControllerEnvironmentWrapper(HostControllerEnvironmentStatus hostControllerEnvironmentStatus) {
-        this(null, hostControllerEnvironmentStatus);
+    HostControllerEnvironmentWrapper(HostControllerEnvironmentStatus hostControllerEnvironmentStatus, ProductConfig productConfig) {
+        this(null, hostControllerEnvironmentStatus, productConfig);
     }
 
     public HostControllerEnvironment getHostControllerEnvironment() {
@@ -39,4 +43,8 @@ public HostControllerEnvironment getHostControllerEnvironment() {
     public HostControllerEnvironmentStatus getHostControllerEnvironmentStatus() {
         return hostControllerEnvironmentStatus;
     }
+
+    public ProductConfig getProductConfig() {
+        return this.productConfig;
+    }
 }