Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WFCORE-835 remove adding 'allowed' in ObjectListAttributeDefinition a… #911

Merged
merged 1 commit into from Jul 22, 2015
Merged

WFCORE-835 remove adding 'allowed' in ObjectListAttributeDefinition a… #911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions controller/src/main/java/org/jboss/as/controller/ObjectListAttributeDefinition.java
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@

import java.util.Locale;
import java.util.ResourceBundle;

import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;

Expand Down Expand Up @@ -59,7 +58,7 @@ public ModelNode addResourceAttributeDescription(ResourceBundle bundle, String p
final ModelNode attr = getNoTextDescription(false);
attr.get(ModelDescriptionConstants.DESCRIPTION).set(getAttributeTextDescription(bundle, prefix));
final ModelNode result = resourceDescription.get(ModelDescriptionConstants.ATTRIBUTES, getName()).set(attr);
addValueTypeDescription(result, prefix, bundle, false,null,null);
addValueTypeDescription(result, prefix, bundle, false, null, null);
addAccessConstraints(result, bundle.getLocale());
return result;
}
Expand All @@ -69,7 +68,7 @@ public ModelNode addOperationParameterDescription(ResourceBundle bundle, String
final ModelNode param = getNoTextDescription(true);
param.get(ModelDescriptionConstants.DESCRIPTION).set(getAttributeTextDescription(bundle, prefix));
final ModelNode result = operationDescription.get(ModelDescriptionConstants.REQUEST_PROPERTIES, getName()).set(param);
addValueTypeDescription(result, prefix, bundle, true,null,null);
addValueTypeDescription(result, prefix, bundle, true, null, null);
return result;
}

Expand Down Expand Up @@ -221,6 +220,10 @@ protected void addValueTypeDescription(final ModelNode node, final String prefix
valueType.addValueTypeDescription(node, prefix, bundle,resolver,locale);
}

@Override
protected void addAllowedValuesToDescription(ModelNode result, ParameterValidator validator) {
//Don't add allowed values for object types, since they simply enumerate the fields given in the value type
}

public static final class Builder extends ListAttributeDefinition.Builder<Builder, ObjectListAttributeDefinition> {
private final ObjectTypeAttributeDefinition valueType;
Expand Down