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 2017/10/03 11:58:52 UTC
[isis] 09/24: ISIS-1742: fixes up ActionAnnotationFacetFactory so
now compiles
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch dev/2.0.0/ISIS-1742-remove-deprecations
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c52caae1d4cb335e60ef13841dece7b7a2bd32cc
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 09:13:53 2017 +0100
ISIS-1742: fixes up ActionAnnotationFacetFactory so now compiles
---
.../actions/action/ActionAnnotationFacetFactory.java | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index e6436c2..14e650c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -88,7 +88,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
private final MetaModelValidatorForDeprecatedAnnotation commandValidator = new MetaModelValidatorForDeprecatedAnnotation(Command.class);
private final MetaModelValidatorForDeprecatedAnnotation queryOnlyValidator = new MetaModelValidatorForDeprecatedAnnotation(QueryOnly.class);
private final MetaModelValidatorForDeprecatedAnnotation idempotentValidator = new MetaModelValidatorForDeprecatedAnnotation(Idempotent.class);
- private final MetaModelValidatorForDeprecatedAnnotation publishedActionValidator = new MetaModelValidatorForDeprecatedAnnotation(PublishedAction.class);
private final MetaModelValidatorForDeprecatedAnnotation typeOfValidator = new MetaModelValidatorForDeprecatedAnnotation(TypeOf.class);
private final MetaModelValidatorForDeprecatedAnnotation hiddenValidator = new MetaModelValidatorForDeprecatedAnnotation(Hidden.class);
private final MetaModelValidatorForDeprecatedAnnotation disabledValidator = new MetaModelValidatorForDeprecatedAnnotation(Disabled.class);
@@ -348,17 +347,8 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
return;
}
- PublishedActionFacet facet;
-
- // check for deprecated @PublishedAction annotation first
- final PublishedAction annotation = Annotations.getAnnotation(processMethodContext.getMethod(), PublishedAction.class);
- facet = publishedActionValidator.flagIfPresent(
- PublishedActionFacetForPublishedActionAnnotation.create(annotation, holder), processMethodContext);
-
- // else check for @Action(publishing=...)
- if(facet == null) {
- facet = PublishedActionFacetForActionAnnotation.create(action, getConfiguration(), holder);
- }
+ // check for @Action(publishing=...)
+ PublishedActionFacet facet = PublishedActionFacetForActionAnnotation.create(action, getConfiguration(), holder);
FacetUtil.addFacet(facet);
}
@@ -416,7 +406,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
metaModelValidator.add(commandValidator);
metaModelValidator.add(queryOnlyValidator);
metaModelValidator.add(idempotentValidator);
- metaModelValidator.add(publishedActionValidator);
metaModelValidator.add(typeOfValidator);
metaModelValidator.add(hiddenValidator);
metaModelValidator.add(disabledValidator);
@@ -436,7 +425,6 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
commandValidator.setConfiguration(configuration);
queryOnlyValidator.setConfiguration(configuration);
idempotentValidator.setConfiguration(configuration);
- publishedActionValidator.setConfiguration(configuration);
typeOfValidator.setConfiguration(configuration);
hiddenValidator.setConfiguration(configuration);
disabledValidator.setConfiguration(configuration);
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.