WFLY-12006 EJB3 IIOP attributes enable-by-default and use-qualified-n…

…ame should be required
wildfly · Apr 18, 2019 · 7027a755f71c6824e995285e085c19b8c0387ba5 · 7027a75
1 parent d550882
commit 7027a755f71c6824e995285e085c19b8c0387ba5
Unified Split

Showing with 6 additions and 4 deletions.

+2 −2 ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPAdd.java

+4 −2 ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPResourceDefinition.java
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;