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 14:43:19 UTC
[isis] 05/05: ISIS-2086: refactors
'isis.reflector.validator.noParamsOnly' to type-safe config
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 2defb1ae41e6f2ec9b12e61ab8354eac0fa0b52f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Sep 28 15:43:02 2019 +0100
ISIS-2086: refactors 'isis.reflector.validator.noParamsOnly' to type-safe config
---
.../src/main/java/org/apache/isis/config/IsisConfiguration.java | 1 +
.../isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java | 5 -----
.../disabled/method/DisableForContextFacetViaMethodFactory.java | 4 +---
.../members/hidden/method/HideForContextFacetViaMethodFactory.java | 4 +---
4 files changed, 3 insertions(+), 11 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 7f0048b..1fae820 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
@@ -186,6 +186,7 @@ public class IsisConfiguration {
private boolean ensureUniqueObjectTypes = true;
private boolean checkModuleExtent = true;
+ private boolean noParamsOnly = false;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 237af34..a418dfc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -30,11 +30,6 @@ public abstract class MethodPrefixBasedFacetFactoryAbstract
extends FacetFactoryAbstract
implements MethodPrefixBasedFacetFactory {
- public static final String ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_KEY =
- "isis.reflector.validator.noParamsOnly";
- public static final boolean ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_DEFAULT = false;
-
-
private final List<String> prefixes;
private final OrphanValidation orphanValidation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
index 2b1f791..c956b73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/disabled/method/DisableForContextFacetViaMethodFactory.java
@@ -64,9 +64,7 @@ public class DisableForContextFacetViaMethodFactory extends MethodPrefixBasedFac
Method disableMethod = null;
- boolean noParamsOnly = getConfigurationLegacy().getBoolean(
- ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_KEY,
- ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_DEFAULT);
+ boolean noParamsOnly = getConfiguration().getReflector().getValidator().isNoParamsOnly();
boolean searchExactMatch = !noParamsOnly;
if(searchExactMatch) {
// search for exact match
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
index 49c826a..2565b2d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/members/hidden/method/HideForContextFacetViaMethodFactory.java
@@ -62,9 +62,7 @@ public class HideForContextFacetViaMethodFactory extends MethodPrefixBasedFacetF
Method hideMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodLiteralConstants.HIDE_PREFIX + capitalizedName, boolean.class, new Class[] {});
if (hideMethod == null) {
- boolean noParamsOnly = getConfigurationLegacy().getBoolean(
- ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_KEY,
- ISIS_REFLECTOR_VALIDATOR_NO_PARAMS_ONLY_DEFAULT);
+ boolean noParamsOnly = getConfiguration().getReflector().getValidator().isNoParamsOnly();
boolean searchExactMatch = !noParamsOnly;
if(searchExactMatch) {
hideMethod = MethodFinderUtils.findMethod(cls, MethodScope.OBJECT, MethodLiteralConstants.HIDE_PREFIX + capitalizedName, boolean.class, getMethod.getParameterTypes());