Merge pull request wildfly#17866 from michpetrov/wfly-19304

WFLY-19304: update model definition and bump schema
rsearls · Aug 27, 2024 · 8826833 · 8826833
2 parents 70fc7ea + 95eb722
commit 8826833
Show file tree

Hide file tree

Showing 47 changed files with 1,983 additions and 1,019 deletions.
diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/Constants.java b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/Constants.java
@@ -24,8 +24,10 @@
 import org.jboss.as.controller.SimpleOperationDefinitionBuilder;
 import org.jboss.as.controller.access.constraint.SensitivityClassification;
 import org.jboss.as.controller.access.management.SensitiveTargetAccessConstraintDefinition;
+import org.jboss.as.controller.client.helpers.MeasurementUnit;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
 import org.jboss.as.controller.descriptions.NonResolvingResourceDescriptionResolver;
+import org.jboss.as.controller.operations.validation.EnumValidator;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
 import org.jboss.as.controller.registry.AttributeAccess;
 import org.jboss.as.controller.security.CredentialReference;
@@ -39,6 +41,7 @@
 import org.jboss.jca.common.api.metadata.ds.DsPool;
 import org.jboss.jca.common.api.metadata.ds.Statement;
 import org.jboss.jca.common.api.metadata.ds.TimeOut;
+import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
 import org.jboss.jca.common.api.metadata.ds.Validation;
 import org.jboss.jca.common.api.metadata.ds.XaDataSource;
 
@@ -431,7 +434,8 @@ public class Constants {
     static SimpleAttributeDefinition TRACK_STATEMENTS = new SimpleAttributeDefinitionBuilder(TRACKSTATEMENTS_NAME, ModelType.STRING, true)
             .setAllowExpression(true)
             .setXmlName(Statement.Tag.TRACK_STATEMENTS.getLocalName())
-            .setDefaultValue(new ModelNode(Defaults.TRACK_STATEMENTS.name()))
+            .setDefaultValue(new ModelNode(Defaults.TRACK_STATEMENTS.toString()))
+            .setValidator(EnumValidator.create(Statement.TrackStatementsEnum.class))
             .setRestartAllServices()
             .build();
 
@@ -444,6 +448,7 @@ public class Constants {
 
     static SimpleAttributeDefinition ALLOCATION_RETRY_WAIT_MILLIS = new SimpleAttributeDefinitionBuilder(ALLOCATION_RETRY_WAIT_MILLIS_NAME, ModelType.LONG, true)
             .setXmlName(TimeOut.Tag.ALLOCATION_RETRY_WAIT_MILLIS.getLocalName())
+            .setMeasurementUnit(MeasurementUnit.MILLISECONDS)
             .setAllowExpression(true)
             .setRestartAllServices()
             .build();
@@ -472,6 +477,7 @@ public class Constants {
 
     static SimpleAttributeDefinition QUERY_TIMEOUT = new SimpleAttributeDefinitionBuilder(QUERYTIMEOUT_NAME, ModelType.LONG, true)
             .setXmlName(TimeOut.Tag.QUERY_TIMEOUT.getLocalName())
+            .setMeasurementUnit(MeasurementUnit.SECONDS)
             .setAllowExpression(true)
             .setRestartAllServices()
             .build();
@@ -492,6 +498,9 @@ public class Constants {
     static SimpleAttributeDefinition TRANSACTION_ISOLATION = new SimpleAttributeDefinitionBuilder(TRANSACTION_ISOLATION_NAME, ModelType.STRING, true)
             .setXmlName(DataSource.Tag.TRANSACTION_ISOLATION.getLocalName())
             .setAllowExpression(true)
+            .setAllowedValues(TransactionIsolation.TRANSACTION_NONE.name(), TransactionIsolation.TRANSACTION_READ_COMMITTED.name(),
+                    TransactionIsolation.TRANSACTION_READ_UNCOMMITTED.name(), TransactionIsolation.TRANSACTION_REPEATABLE_READ.name(),
+                    TransactionIsolation.TRANSACTION_SERIALIZABLE.name())
             .setRestartAllServices()
             .build();
 
@@ -623,6 +632,7 @@ public class Constants {
 
     static SimpleAttributeDefinition XA_RESOURCE_TIMEOUT = new SimpleAttributeDefinitionBuilder(XA_RESOURCE_TIMEOUT_NAME, ModelType.INT, true)
             .setXmlName(TimeOut.Tag.XA_RESOURCE_TIMEOUT.getLocalName())
+            .setMeasurementUnit(MeasurementUnit.SECONDS)
             .setAllowExpression(true)
             .setRestartAllServices()
             .build();

diff --git a/...tor/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java b/...tor/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java
diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/Namespace.java b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/Namespace.java
@@ -32,12 +32,14 @@ public enum Namespace {
 
     DATASOURCES_7_0("urn:jboss:domain:datasources:7.0"),
 
-    DATASOURCES_7_1("urn:jboss:domain:datasources:7.1");
+    DATASOURCES_7_1("urn:jboss:domain:datasources:7.1"),
+
+    DATASOURCES_7_2("urn:jboss:domain:datasources:7.2");
 
     /**
      * The current namespace version.
      */
-    public static final Namespace CURRENT = DATASOURCES_7_1;
+    public static final Namespace CURRENT = DATASOURCES_7_2;
 
     private final String name;