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/27 15:55:25 UTC
[isis] 05/05: ISIS-2086: converts
'isis.reflector.validator.ensureUniqueObjectTypes' 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 c9e74d3ffc26d738c439a2cc463f72e7a86dd673
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 27 16:54:30 2019 +0100
ISIS-2086: converts 'isis.reflector.validator.ensureUniqueObjectTypes' to type-safe config
---
.../src/main/java/org/apache/isis/config/IsisConfiguration.java | 8 +++++---
.../metamodel/facets/object/encodeable/EncoderDecoderUtil.java | 2 +-
.../validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java | 7 +------
3 files changed, 7 insertions(+), 10 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 71f9b32..8096325 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
@@ -38,12 +38,10 @@ import lombok.Data;
public class IsisConfiguration {
private final Reflector reflector = new Reflector();
-
@Data
public static class Reflector {
private final ExplicitAnnotations explicitAnnotations = new ExplicitAnnotations();
-
@Data
public static class ExplicitAnnotations {
@@ -54,10 +52,14 @@ public class IsisConfiguration {
private boolean action = false;
}
+ private final Validator validator = new Validator();
+ @Data
+ public static class Validator {
+ private boolean ensureUniqueObjectTypes = true;
+ }
}
private final Services services = new Services();
-
@Data
public static class Services {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
index e7b0cb5..3786002 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/encodeable/EncoderDecoderUtil.java
@@ -39,7 +39,7 @@ public final class EncoderDecoderUtil {
// return !_Strings.isNullOrEmpty(encoderDecoderName) ? encoderDecoderName : null;
// }
- public static Class<?> encoderDecoderOrNull(final Class<?> candidateClass, final String classCandidateName) {
+ public static Class<?> encopderDecoderOrNull(final Class<?> candidateClass, final String classCandidateName) {
final Class<?> type = candidateClass != null ? ClassUtil.implementingClassOrNull(candidateClass.getName(), EncoderDecoder.class, FacetHolder.class) : null;
return type != null ? type : ClassUtil.implementingClassOrNull(classCandidateName, EncoderDecoder.class, FacetHolder.class);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
index 3d55edc..25573e8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/validator/MetaModelValidatorToCheckObjectSpecIdsUnique.java
@@ -34,18 +34,13 @@ import lombok.val;
public class MetaModelValidatorToCheckObjectSpecIdsUnique extends MetaModelValidatorComposite {
- public static final String ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_KEY = "isis.reflector.validator.ensureUniqueObjectTypes";
- public static final boolean ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_DEFAULT = true;
-
public MetaModelValidatorToCheckObjectSpecIdsUnique() {
addValidatorToEnsureUniqueObjectIds();
}
@Override
public void validate(final ValidationFailures validationFailures) {
- boolean check = getConfigurationLegacy()
- .getBoolean(ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_KEY,
- ISIS_REFLECTOR_ENSURE_UNIQUE_OBJECT_IDS_DEFAULT);
+ boolean check = getConfiguration().getReflector().getValidator().isEnsureUniqueObjectTypes();
if(!check) {
return;
}