[WFCORE-7317] Promote management interface attributes for backlog, no-read-timeout, connection-high-water, connection-low-water from community to default stability level

yersan · yersan · commit 3205aeac3d28 · 2025-09-19T14:12:12.000+01:00
Jira issue: https://issues.redhat.com/browse/WFCORE-7317 Signed-off-by: Yeray Borges <yborgess@redhat.com>
diff --git a/controller/src/main/java/org/jboss/as/controller/management/BaseHttpInterfaceAddStepHandler.java b/controller/src/main/java/org/jboss/as/controller/management/BaseHttpInterfaceAddStepHandler.java
@@ -33,9 +33,14 @@
 public abstract class BaseHttpInterfaceAddStepHandler extends ManagementInterfaceAddStepHandler {
 
     private static final String PROPERTY_BASE = "org.wildfly.management.";
+    // Do not use the system properties, use the management API to configure them in the model
+    @Deprecated(since = "30.0.0",  forRemoval = true)
     private static final String BACKLOG_PROPERTY = PROPERTY_BASE + "backlog";
+    @Deprecated(since = "30.0.0",  forRemoval = true)
     private static final String CONNECTION_HIGH_WATER_PROPERTY = PROPERTY_BASE + "connection-high-water";
+    @Deprecated(since = "30.0.0",  forRemoval = true)
     private static final String CONNECTION_LOW_WATER_PROPERTY = PROPERTY_BASE + "connection-low-water";
+    @Deprecated(since = "30.0.0",  forRemoval = true)
     private static final String NO_REQUEST_TIMEOUT_PROPERTY = PROPERTY_BASE + "no-request-timeout";
 
     protected static final String HTTP_AUTHENTICATION_FACTORY_CAPABILITY = "org.wildfly.security.http-authentication-factory";
diff --git a/controller/src/main/java/org/jboss/as/controller/management/BaseHttpInterfaceResourceDefinition.java b/controller/src/main/java/org/jboss/as/controller/management/BaseHttpInterfaceResourceDefinition.java
@@ -45,7 +45,6 @@
 import org.jboss.as.controller.parsing.Attribute;
 import org.jboss.as.controller.registry.AttributeAccess;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
-import org.jboss.as.version.Stability;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
 
@@ -187,29 +186,25 @@ public void validateParameter(String parameterName, ModelNode value) throws Oper
             .setAllowExpression(true)
             .setDefaultValue(new ModelNode(50))
             .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
-            .setStability(Stability.COMMUNITY)
             .build();
 
     public static final SimpleAttributeDefinition NO_REQUEST_TIMEOUT = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.NO_REQUEST_TIMEOUT, ModelType.INT, true)
             .setAllowExpression(true)
             .setMeasurementUnit(MeasurementUnit.MILLISECONDS)
             .setDefaultValue(new ModelNode(60000))
             .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
-            .setStability(Stability.COMMUNITY)
             .build();
 
     public static final SimpleAttributeDefinition CONNECTION_HIGH_WATER = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.CONNECTION_HIGH_WATER, ModelType.INT, true)
             .setAllowExpression(true)
             .setDefaultValue(new ModelNode(100))
             .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
-            .setStability(Stability.COMMUNITY)
             .build();
 
     public static final SimpleAttributeDefinition CONNECTION_LOW_WATER = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.CONNECTION_LOW_WATER, ModelType.INT, true)
             .setAllowExpression(true)
             .setDefaultValue(new ModelNode(75))
             .setFlags(AttributeAccess.Flag.RESTART_RESOURCE_SERVICES)
-            .setStability(Stability.COMMUNITY)
             .build();
 
     protected static final AttributeDefinition[] COMMON_ATTRIBUTES = new AttributeDefinition[] { HTTP_AUTHENTICATION_FACTORY, SSL_CONTEXT, CONSOLE_ENABLED, HTTP_UPGRADE_ENABLED,
diff --git a/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/mgmt_interfaces/HostMgmtInterfacesTestCase.java b/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/mgmt_interfaces/HostMgmtInterfacesTestCase.java
@@ -31,9 +31,9 @@ public void testEmptyAllowedOriginsConfiguration() throws Exception {
     }
 
     @Test
-    public void testResourceConstraints_Community() throws Exception {
-        // Test for https://issues.redhat.com/browse/WFCORE-6830
-        testConfiguration("host_resource_constraints_community.xml", Stability.COMMUNITY);
+    public void testResourceConstraints() throws Exception {
+        // Test for https://issues.redhat.com/browse/WFCORE-7317
+        testConfiguration("host_resource_constraints.xml");
     }
 
     private void testConfiguration(String fileName) throws Exception {
diff --git a/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/mgmt_interfaces/StandaloneMgmtInterfacesTestCase.java b/core-model-test/tests/src/test/java/org/jboss/as/core/model/test/mgmt_interfaces/StandaloneMgmtInterfacesTestCase.java
@@ -31,11 +31,12 @@ public void testEmptyAllowedOriginsConfiguration() throws Exception {
     }
 
     @Test
-    public void testResourceConstraints_Community() throws Exception {
-        // Test for https://issues.redhat.com/browse/WFCORE-6830
-        testConfiguration("standalone_resource_constraints_community.xml", Stability.COMMUNITY);
+    public void testResourceConstraints() throws Exception {
+        // Test for https://issues.redhat.com/browse/WFCORE-7317
+        testConfiguration("standalone_resource_constraints.xml");
     }
 
+
     public void testConfiguration(String fileName) throws Exception {
         testConfiguration(fileName, Stability.DEFAULT);
     }
diff --git a/core-model-test/tests/src/test/resources/org/jboss/as/core/model/test/mgmt_interfaces/host_resource_constraints.xml b/core-model-test/tests/src/test/resources/org/jboss/as/core/model/test/mgmt_interfaces/host_resource_constraints.xml
@@ -5,12 +5,12 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<host name="primary" xmlns="urn:jboss:domain:community:20.0">
+<host name="primary" xmlns="urn:jboss:domain:21.0">
 
     <management>
         <management-interfaces>
             <http-interface http-authentication-factory="management-http" allowed-origins="http://www.example.com http://localhost"
-                backlog="44" connection-high-water="111" connection-low-water="77" no-request-timeout="66666">
+                            backlog="44" connection-high-water="111" connection-low-water="77" no-request-timeout="66666">
                 <http-upgrade enabled="true" sasl-authentication-factory="management-sasl" />
                 <socket interface="management" port="${jboss.management.http.port:9990}"/>
             </http-interface>
diff --git a/core-model-test/tests/src/test/resources/org/jboss/as/core/model/test/mgmt_interfaces/standalone_resource_constraints.xml b/core-model-test/tests/src/test/resources/org/jboss/as/core/model/test/mgmt_interfaces/standalone_resource_constraints.xml
@@ -5,11 +5,11 @@
   ~ SPDX-License-Identifier: Apache-2.0
   -->
 
-<server xmlns="urn:jboss:domain:community:20.0">
+<server xmlns="urn:jboss:domain:21.0">
     <management>
         <management-interfaces>
             <http-interface http-authentication-factory="management-http" allowed-origins="http://www.example.com http://localhost"
-                backlog="44" connection-high-water="111" connection-low-water="77" no-request-timeout="66666">
+                            backlog="44" connection-high-water="111" connection-low-water="77" no-request-timeout="66666">
                 <http-upgrade enabled="true" sasl-authentication-factory="managament-sasl" />
                 <socket-binding http="management-http"/>
             </http-interface>
diff --git a/testsuite/manualmode/src/test/java/org/wildfly/core/test/standalone/mgmt/ManagementInterfaceResourcesTestCase.java b/testsuite/manualmode/src/test/java/org/wildfly/core/test/standalone/mgmt/ManagementInterfaceResourcesTestCase.java
@@ -53,7 +53,6 @@ public class ManagementInterfaceResourcesTestCase {
     /*
      * Command Templates
      */
-    private static final String HTTP_INTERFACE_READ_ATTRIBUTE = "/core-service=management/management-interface=http-interface:read-attribute(name=%s)";
     private static final String HTTP_INTERFACE_WRITE_ATTRIBUTE = "/core-service=management/management-interface=http-interface:write-attribute(name=%s, value=%d)";
     private static final String HTTP_INTERFACE_UNDEFINE_ATTRIBUTE = "/core-service=management/management-interface=http-interface:undefine-attribute(name=%s)";
     private static final String SYSTEM_PROPERTY_ADD = "/system-property=%s:add(value=%d)";
@@ -159,13 +158,6 @@ private void runTest(boolean useSystemProperties, int noRequestTimeout, Exceptio
                 cli.sendLine(String.format(SYSTEM_PROPERTY_ADD, CONNECTION_LOW_WATER_PROPERTY, 3));
                 cli.sendLine(String.format(SYSTEM_PROPERTY_ADD, NO_REQUEST_TIMEOUT_PROPERTY, noRequestTimeout));
             } else {
-                cli.sendLine(String.format(HTTP_INTERFACE_READ_ATTRIBUTE, BACKLOG_ATTRIBUTE), true);
-                String response = cli.readOutput();
-                if (response.contains("WFLYCTL0201")) {
-                    LOG.info("Attribute \"backlog\" not found - assuming the attributes are not available at the server's stability level" );
-                    controller.stop();
-                    return;
-                }
                 cli.sendLine(String.format(HTTP_INTERFACE_WRITE_ATTRIBUTE, BACKLOG_ATTRIBUTE, 2));
                 cli.sendLine(String.format(HTTP_INTERFACE_WRITE_ATTRIBUTE, CONNECTION_HIGH_WATER_ATTRIBUTE, 6));
                 cli.sendLine(String.format(HTTP_INTERFACE_WRITE_ATTRIBUTE, CONNECTION_LOW_WATER_ATTRIBUTE, 3));

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public void testEmptyAllowedOriginsConfiguration() throws Exception {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Test`
`34`		`- public void testResourceConstraints_Community() throws Exception {`
`35`		`- // Test for https://issues.redhat.com/browse/WFCORE-6830`
`36`		`- testConfiguration("host_resource_constraints_community.xml", Stability.COMMUNITY);`
	`34`	`+ public void testResourceConstraints() throws Exception {`
	`35`	`+ // Test for https://issues.redhat.com/browse/WFCORE-7317`
	`36`	`+ testConfiguration("host_resource_constraints.xml");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private void testConfiguration(String fileName) throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,12 @@ public void testEmptyAllowedOriginsConfiguration() throws Exception {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Test`
`34`		`- public void testResourceConstraints_Community() throws Exception {`
`35`		`- // Test for https://issues.redhat.com/browse/WFCORE-6830`
`36`		`- testConfiguration("standalone_resource_constraints_community.xml", Stability.COMMUNITY);`
	`34`	`+ public void testResourceConstraints() throws Exception {`
	`35`	`+ // Test for https://issues.redhat.com/browse/WFCORE-7317`
	`36`	`+ testConfiguration("standalone_resource_constraints.xml");`
`37`	`37`	`}`
`38`	`38`
	`39`	`+`
`39`	`40`	`public void testConfiguration(String fileName) throws Exception {`
`40`	`41`	`testConfiguration(fileName, Stability.DEFAULT);`
`41`	`42`	`}`