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 13:21:38 UTC
[isis] branch ISIS-2086 updated: ISIS-2086: refactors
'isis.reflector.validator.serviceActionsOnly' 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
The following commit(s) were added to refs/heads/ISIS-2086 by this push:
new 45d3cf2 ISIS-2086: refactors 'isis.reflector.validator.serviceActionsOnly' to type-safe config
45d3cf2 is described below
commit 45d3cf2cfb3bab1feffa39be7bd374a48761bac0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 29 14:21:26 2019 +0100
ISIS-2086: refactors 'isis.reflector.validator.serviceActionsOnly' to type-safe config
---
.../main/java/org/apache/isis/config/IsisConfiguration.java | 3 +++
.../annotation/DomainServiceFacetAnnotationFactory.java | 11 ++---------
2 files changed, 5 insertions(+), 9 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 57acc4a..c351960 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
@@ -63,6 +63,7 @@ public class IsisConfiguration {
private EditingObjectsConfiguration editing = EditingObjectsConfiguration.TRUE;
}
+
private final Reflector reflector = new Reflector();
@Data
public static class Reflector {
@@ -233,6 +234,8 @@ public class IsisConfiguration {
private boolean checkModuleExtent = true;
private boolean noParamsOnly = false;
private boolean actionCollectionParameterChoices = true;
+ @Deprecated
+ private boolean serviceActionsOnly = true;
private boolean jaxbViewModelNotAbstract = true;
private boolean jaxbViewModelNotInnerClass = true;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
index b133d4e..1342021 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
@@ -45,11 +45,6 @@ public class DomainServiceFacetAnnotationFactory extends FacetFactoryAbstract
implements MetaModelValidatorRefiner {
@Deprecated
- public static final String ISIS_REFLECTOR_VALIDATOR_SERVICE_ACTIONS_ONLY_KEY =
- "isis.reflector.validator.serviceActionsOnly";
- public static final boolean ISIS_REFLECTOR_VALIDATOR_SERVICE_ACTIONS_ONLY_DEFAULT = true;
-
- @Deprecated
public static final String ISIS_REFLECTOR_VALIDATOR_MIXINS_ONLY_KEY =
"isis.reflector.validator.mixinsOnly";
public static final boolean ISIS_REFLECTOR_VALIDATOR_MIXINS_ONLY_DEFAULT = true;
@@ -106,9 +101,7 @@ implements MetaModelValidatorRefiner {
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator) {
- final boolean serviceActionsOnly = _Config.getConfiguration().getBoolean(
- ISIS_REFLECTOR_VALIDATOR_SERVICE_ACTIONS_ONLY_KEY,
- ISIS_REFLECTOR_VALIDATOR_SERVICE_ACTIONS_ONLY_DEFAULT);
+ final boolean serviceActionsOnly = getConfiguration().getReflector().getValidator().isServiceActionsOnly();
if (serviceActionsOnly) {
metaModelValidator.add(new MetaModelValidatorVisiting(new MetaModelValidatorVisiting.Visitor() {
@@ -142,7 +135,7 @@ implements MetaModelValidatorRefiner {
thisSpec.getIdentifier(),
"%s: services can only have actions ('%s' config property), not properties or collections; annotate with @Programmatic if required. Found: %s",
thisSpec.getFullIdentifier(),
- ISIS_REFLECTOR_VALIDATOR_SERVICE_ACTIONS_ONLY_KEY,
+ "isis.reflector.validator.serviceActionsOnly",
associationNames);
}
}));