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:18 UTC
[isis] 04/05: ISIS-2086: refactors
'isis.reflector.validator.checkModuleExtent' as 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 b2c29d1142013d8239dbf15cff086676ca468a0b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Sep 28 15:36:36 2019 +0100
ISIS-2086: refactors 'isis.reflector.validator.checkModuleExtent' as type-safe config
(cherry picked from commit 3ed5456381700c8b973c831248cece7290a33dc8)
---
.../src/main/java/org/apache/isis/config/IsisConfiguration.java | 2 ++
.../validator/MetaModelValidatorToCheckModuleExtent.java | 7 +------
2 files changed, 3 insertions(+), 6 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 9d7bb08..7f0048b 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
@@ -183,7 +183,9 @@ public class IsisConfiguration {
private final Validator validator = new Validator();
@Data
public static class Validator {
+
private boolean ensureUniqueObjectTypes = true;
+ private boolean checkModuleExtent = true;
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
index 766ccd8..a62e5d2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckModuleExtent.java
@@ -27,18 +27,13 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
public class MetaModelValidatorToCheckModuleExtent extends MetaModelValidatorComposite {
- private static final String ISIS_REFLECTOR_CHECK_MODULE_EXTENT_KEY = "isis.reflector.validator.checkModuleExtent";
- private static final boolean ISIS_REFLECTOR_CHECK_MODULE_EXTENT_DEFAULT = true;
-
public MetaModelValidatorToCheckModuleExtent() {
addValidatorToCheckModuleExtent();
}
@Override
public void validate(final ValidationFailures validationFailures) {
- boolean check = getConfigurationLegacy()
- .getBoolean(ISIS_REFLECTOR_CHECK_MODULE_EXTENT_KEY,
- ISIS_REFLECTOR_CHECK_MODULE_EXTENT_DEFAULT);
+ boolean check = getConfiguration().getReflector().getValidator().isCheckModuleExtent();
if(!check) {
return;
}