Merge pull request wildfly#6047 from pferraro/WFCORE-6865

WFCORE-6865 DefaultResourceAddDescriptionProvider omits the stability of the operation from its generated description
darranl · Jun 25, 2024 · 98d3c35 · 98d3c35
2 parents b9ffd51 + 63e94d4
commit 98d3c35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/controller/src/main/java/org/jboss/as/controller/SimpleResourceDefinition.java b/controller/src/main/java/org/jboss/as/controller/SimpleResourceDefinition.java
@@ -217,6 +217,7 @@ protected void registerAddOperation(final ManagementResourceRegistration registr
                 .setParameters(this.getAddOperationParameters(registration))
                 .setDescriptionProvider(descriptionProvider)
                 .setEntryType(OperationEntry.EntryType.PUBLIC)
+                .setStability(registration.getStability())
                 .withFlags(flags)
                 .build();
         registration.registerOperationHandler(definition, handler);
@@ -234,6 +235,7 @@ protected void registerRemoveOperation(final ManagementResourceRegistration regi
         OperationDefinition definition = new SimpleOperationDefinitionBuilder(ModelDescriptionConstants.REMOVE, this.descriptionResolver)
                 .setDescriptionProvider(descriptionProvider)
                 .setEntryType(OperationEntry.EntryType.PUBLIC)
+                .setStability(registration.getStability())
                 .withFlags(flags)
                 .build();
         registration.registerOperationHandler(definition, handler);

diff --git a/...main/java/org/jboss/as/controller/descriptions/DefaultResourceAddDescriptionProvider.java b/...main/java/org/jboss/as/controller/descriptions/DefaultResourceAddDescriptionProvider.java
@@ -10,6 +10,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_NAME;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REPLY_PROPERTIES;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REQUEST_PROPERTIES;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STABILITY;
 
 import java.util.Locale;
 import java.util.Map;
@@ -92,7 +93,8 @@ public ModelNode getModelDescription(Locale locale) {
         //This is auto-generated so don't add any access constraints
 
         result.get(REPLY_PROPERTIES).setEmptyObject();
-
+        // Use the stability level of the resource
+        result.get(STABILITY).set(this.registration.getStability().toString());
 
         return result;
     }

diff --git a/subsystem/src/main/java/org/wildfly/subsystem/resource/ResourceDescriptorRegistrar.java b/subsystem/src/main/java/org/wildfly/subsystem/resource/ResourceDescriptorRegistrar.java
@@ -132,13 +132,15 @@ public void register(ManagementResourceRegistration registration) {
         OperationDefinition addDefinition = new SimpleOperationDefinitionBuilder(ModelDescriptionConstants.ADD, this.descriptor.getResourceDescriptionResolver())
                 .setParameters(attributes.toArray(AttributeDefinition[]::new))
                 .setDescriptionProvider(new DefaultResourceAddDescriptionProvider(registration, this.descriptor.getResourceDescriptionResolver(), ordered))
+                .setStability(registration.getStability())
                 .withFlag(this.descriptor.getAddOperationRestartFlag())
                 .build();
         registration.registerOperationHandler(addDefinition, this.descriptor.getAddOperationTransformation().apply(new AddResourceOperationStepHandler(this.descriptor)));
 
         // Register remove resource operation handler
         OperationDefinition removeDefinition = new SimpleOperationDefinitionBuilder(ModelDescriptionConstants.REMOVE, this.descriptor.getResourceDescriptionResolver())
                 .setDescriptionProvider(new DefaultResourceRemoveDescriptionProvider(this.descriptor.getResourceDescriptionResolver()))
+                .setStability(registration.getStability())
                 .withFlag(this.descriptor.getRemoveOperationRestartFlag())
                 .build();
         registration.registerOperationHandler(removeDefinition, this.descriptor.getResourceOperationTransformation().apply(new RemoveResourceOperationStepHandler(this.descriptor)));