You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/28 16:25:44 UTC
[isis] 04/10: ISIS-2086: refactors
'isis.reflector.validator.actionCollectionParameterChoices' to type-safe
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8ef62fc3db63259297584785f78799fc09488755
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Sep 28 16:36:48 2019 +0100
ISIS-2086: refactors 'isis.reflector.validator.actionCollectionParameterChoices' to type-safe
---
.../src/main/java/org/apache/isis/config/IsisConfiguration.java | 1 +
.../action/ActionChoicesForCollectionParameterFacetFactory.java | 9 +--------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 7a0fdb6..b26ff7f 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -196,6 +196,7 @@ public class IsisConfiguration {
private boolean ensureUniqueObjectTypes = true;
private boolean checkModuleExtent = true;
private boolean noParamsOnly = false;
+ private boolean actionCollectionParameterChoices = true;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
index 2fecf9b..efb6f51 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
@@ -44,10 +44,6 @@ import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
public class ActionChoicesForCollectionParameterFacetFactory extends FacetFactoryAbstract
implements MetaModelValidatorRefiner {
- public static final String ISIS_REFLECTOR_VALIDATOR_ACTION_COLLECTION_PARAMETER_CHOICES_KEY =
- "isis.reflector.validator.actionCollectionParameterChoices";
- public static final boolean ISIS_REFLECTOR_VALIDATOR_ACTION_COLLECTION_PARAMETER_CHOICES_DEFAULT = true;
-
public ActionChoicesForCollectionParameterFacetFactory() {
super(FeatureType.ACTIONS_ONLY);
}
@@ -62,10 +58,7 @@ implements MetaModelValidatorRefiner {
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator) {
- final boolean doCheck = _Config.getConfiguration().getBoolean(
- ISIS_REFLECTOR_VALIDATOR_ACTION_COLLECTION_PARAMETER_CHOICES_KEY,
- ISIS_REFLECTOR_VALIDATOR_ACTION_COLLECTION_PARAMETER_CHOICES_DEFAULT);
-
+ final boolean doCheck = getConfiguration().getReflector().getValidator().isActionCollectionParameterChoices();
if(!doCheck) {
return;
}