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/29 14:05:16 UTC
[isis] 03/03: ISIS-2086: refactors
'isis.reflector.validator.jdoql...' (2 of them) 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 35840d059b51305fa6eb71cc5cca0f7ab1aa0bb9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 29 15:04:34 2019 +0100
ISIS-2086: refactors 'isis.reflector.validator.jdoql...' (2 of them) to type-safe config
---
.../java/org/apache/isis/config/IsisConfiguration.java | 3 +++
.../object/query/JdoQueryAnnotationFacetFactory.java | 15 ++-------------
2 files changed, 5 insertions(+), 13 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 5090a94..7731b78 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
@@ -259,6 +259,9 @@ public class IsisConfiguration {
private boolean jaxbViewModelReferenceTypeAdapter = true;
private boolean jaxbViewModelDateTimeTypeAdapter = true;
+ private boolean jdoqlFromClause = true;
+ private boolean jdoqlVariablesClause = true;
+
}
}
diff --git a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
index 02c0a9f..347b6ee 100644
--- a/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java
@@ -39,12 +39,6 @@ import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting
public class JdoQueryAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
- public static final String ISIS_REFLECTOR_VALIDATOR_JDOQL_FROM_CLAUSE_KEY = "isis.reflector.validator.jdoqlFromClause";
- public static final boolean ISIS_REFLECTOR_VALIDATOR_JDOQL_FROM_CLAUSE_DEFAULT = true;
-
- public static final String ISIS_REFLECTOR_VALIDATOR_JDOQL_VARIABLES_CLAUSE_KEY = "isis.reflector.validator.jdoqlVariablesClause";
- public static final boolean ISIS_REFLECTOR_VALIDATOR_JDOQL_VARIABLES_CLAUSE_DEFAULT = true;
-
public JdoQueryAnnotationFacetFactory() {
super(FeatureType.OBJECTS_ONLY);
}
@@ -78,18 +72,13 @@ public class JdoQueryAnnotationFacetFactory extends FacetFactoryAbstract impleme
public void refineMetaModelValidator(
final MetaModelValidatorComposite metaModelValidator) {
- final IsisConfigurationLegacy configuration = _Config.getConfiguration();
- final boolean validateFromClause = configuration.getBoolean(
- ISIS_REFLECTOR_VALIDATOR_JDOQL_FROM_CLAUSE_KEY,
- ISIS_REFLECTOR_VALIDATOR_JDOQL_FROM_CLAUSE_DEFAULT);
+ final boolean validateFromClause = getConfiguration().getReflector().getValidator().isJdoqlFromClause();
if (validateFromClause) {
final MetaModelValidator queryFromValidator = new MetaModelValidatorVisiting(new VisitorForFromClause(this));
metaModelValidator.add(queryFromValidator);
}
- final boolean validateVariablesClause = configuration.getBoolean(
- ISIS_REFLECTOR_VALIDATOR_JDOQL_VARIABLES_CLAUSE_KEY,
- ISIS_REFLECTOR_VALIDATOR_JDOQL_VARIABLES_CLAUSE_DEFAULT);
+ final boolean validateVariablesClause = getConfiguration().getReflector().getValidator().isJdoqlVariablesClause();
if (validateVariablesClause) {
final MetaModelValidator queryFromValidator = new MetaModelValidatorVisiting(new VisitorForVariablesClause(this));
metaModelValidator.add(queryFromValidator);