Merge pull request #12237 from soul2zimate/WFLY-12006-master

WFLY-12006 EJB3 IIOP attributes enable-by-default and use-qualified-name should be required
wildfly · Apr 24, 2019 · 216a6815130737d47962ef3f5665bf0aff9f8e0f · 216a681
2 parents 0483463 + bac1a1f
commit 216a6815130737d47962ef3f5665bf0aff9f8e0f
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPAdd.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPAdd.java
@@ -47,8 +47,8 @@ private EJB3IIOPAdd() {
 
     @Override
     protected void performBoottime(final OperationContext context, final ModelNode operation, final ModelNode model) throws OperationFailedException {
-        final Boolean enableByDefault = EJB3IIOPResourceDefinition.ENABLE_BY_DEFAULT.resolveModelAttribute(context, model).asBoolean();
-        final Boolean useQualifiedName = EJB3IIOPResourceDefinition.USE_QUALIFIED_NAME.resolveModelAttribute(context, model).asBoolean();
+        final boolean enableByDefault = EJB3IIOPResourceDefinition.ENABLE_BY_DEFAULT.resolveModelAttribute(context, model).asBoolean();
+        final boolean useQualifiedName = EJB3IIOPResourceDefinition.USE_QUALIFIED_NAME.resolveModelAttribute(context, model).asBoolean();
         final IIOPSettingsService settingsService = new IIOPSettingsService(enableByDefault, useQualifiedName);
         context.addStep(new AbstractDeploymentChainStep() {
             protected void execute(DeploymentProcessorTarget processorTarget) {

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPResourceDefinition.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPResourceDefinition.java
@@ -54,15 +54,17 @@
 
 
     static final SimpleAttributeDefinition USE_QUALIFIED_NAME =
-            new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.USE_QUALIFIED_NAME, ModelType.BOOLEAN, true)
+            new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.USE_QUALIFIED_NAME, ModelType.BOOLEAN)
                     .setAllowExpression(true)
                     .setFlags(AttributeAccess.Flag.RESTART_NONE)
+                    .setRequired(true)
                     .build();
 
     static final SimpleAttributeDefinition ENABLE_BY_DEFAULT =
-            new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.ENABLE_BY_DEFAULT, ModelType.BOOLEAN, true)
+            new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.ENABLE_BY_DEFAULT, ModelType.BOOLEAN)
                     .setAllowExpression(true)
                     .setFlags(AttributeAccess.Flag.RESTART_NONE)
+                    .setRequired(true)
                     .build();
 
     private static final Map<String, AttributeDefinition> ATTRIBUTES;

diff --git a/...in/java/org/jboss/as/ejb3/subsystem/RemotingEjbReceiverChannelCreationOptionResource.java b/...in/java/org/jboss/as/ejb3/subsystem/RemotingEjbReceiverChannelCreationOptionResource.java
@@ -54,7 +54,7 @@
      * Attribute definition of the channel creation option "type"
      */
     static final SimpleAttributeDefinition CHANNEL_CREATION_OPTION_TYPE = new SimpleAttributeDefinitionBuilder(
-            EJB3SubsystemModel.TYPE, ModelType.STRING, true).setRequired(true)
+            EJB3SubsystemModel.TYPE, ModelType.STRING).setRequired(true)
             .setValidator(AllowedChannelOptionTypesValidator.INSTANCE).build();
 
     public static final Map<String, AttributeDefinition> ATTRIBUTES;

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/RemotingEjbReceiverDefinition.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/RemotingEjbReceiverDefinition.java
@@ -45,7 +45,7 @@
 public class RemotingEjbReceiverDefinition extends SimpleResourceDefinition {
 
     public static final SimpleAttributeDefinition OUTBOUND_CONNECTION_REF = new SimpleAttributeDefinitionBuilder(
-            EJB3SubsystemModel.OUTBOUND_CONNECTION_REF, ModelType.STRING, true).setRequired(true).setAllowExpression(true)
+            EJB3SubsystemModel.OUTBOUND_CONNECTION_REF, ModelType.STRING).setRequired(true).setAllowExpression(true)
             .build();
 
     public static final SimpleAttributeDefinition CONNECT_TIMEOUT = new SimpleAttributeDefinitionBuilder(

diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/handlers/ReverseProxyHandlerHost.java b/undertow/src/main/java/org/wildfly/extension/undertow/handlers/ReverseProxyHandlerHost.java
@@ -84,7 +84,7 @@
                         .setDynamicNameMapper(DynamicNameMappers.PARENT)
                         .build();
 
-    public static final SimpleAttributeDefinition OUTBOUND_SOCKET_BINDING = new SimpleAttributeDefinitionBuilder("outbound-socket-binding", ModelType.STRING, true)
+    public static final SimpleAttributeDefinition OUTBOUND_SOCKET_BINDING = new SimpleAttributeDefinitionBuilder("outbound-socket-binding", ModelType.STRING)
             .setRequired(true)
             .setValidator(new StringLengthValidator(1, false))
             .setAllowExpression(true)