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:50 UTC
[isis] 07/24: ISIS-1742: fixes PublishedActionFacet implementations,
removing reference to the now deleted PayloadFactory stuff
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 058b75a0dfcd4a02301924b63959879344e75544
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 3 09:07:50 2017 +0100
ISIS-1742: fixes PublishedActionFacet implementations, removing reference to the now deleted PayloadFactory stuff
Also deletes PublishedActoinFacetForPublishedActionAnnotation, since that annotation was previously deleted.
---
.../action/ActionAnnotationFacetFactory.java | 1 -
.../PublishedActionFacetForActionAnnotation.java | 31 ++--------
...ActionFacetForActionAnnotationAsConfigured.java | 3 +-
...hedActionFacetForPublishedActionAnnotation.java | 66 ----------------------
.../PublishedActionFacetFromConfiguration.java | 3 +-
.../action/ActionAnnotationFacetFactoryTest.java | 1 -
6 files changed, 6 insertions(+), 99 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 f234bdd..e6436c2 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
@@ -59,7 +59,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInv
import org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.prototype.PrototypeFacetForPrototypeAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForPublishedActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetFallbackToNonIdempotent;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.semantics.ActionSemanticsFacetForActionSemanticsAnnotation;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
index 6bcd831..9ea448e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotation.java
@@ -54,45 +54,22 @@ public class PublishedActionFacetForActionAnnotation extends PublishedActionFace
}
// else fall through
default:
- final PublishingPayloadFactoryForAction publishingPayloadFactory = newPayloadFactory(action);
return action != null
- ? new PublishedActionFacetForActionAnnotationAsConfigured(publishingPayloadFactory, holder)
- : new PublishedActionFacetFromConfiguration(publishingPayloadFactory, holder);
+ ? new PublishedActionFacetForActionAnnotationAsConfigured(holder)
+ : new PublishedActionFacetFromConfiguration(holder);
}
case DISABLED:
return null;
case ENABLED:
- return new PublishedActionFacetForActionAnnotation(
- newPayloadFactory(action), holder);
+ return new PublishedActionFacetForActionAnnotation(holder);
}
return null;
}
- /**
- * @return null means that the default payload factories will be used; this is handled within IsisTransaction.
- */
- private static PublishingPayloadFactoryForAction newPayloadFactory(final Action action) {
- if(action == null) {
- return null;
- }
- final Class<? extends PublishingPayloadFactoryForAction> payloadFactoryClass = action.publishingPayloadFactory();
- if(payloadFactoryClass == null) {
- return null;
- }
-
- try {
- return payloadFactoryClass.newInstance();
- } catch (final InstantiationException e) {
- return null;
- } catch (final IllegalAccessException e) {
- return null;
- }
- }
public PublishedActionFacetForActionAnnotation(
- final PublishingPayloadFactoryForAction publishingPayloadFactory,
final FacetHolder holder) {
- super(publishingPayloadFactory, holder);
+ super(holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
index 1f42f10..6ea559f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForActionAnnotationAsConfigured.java
@@ -24,9 +24,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
public class PublishedActionFacetForActionAnnotationAsConfigured extends PublishedActionFacetForActionAnnotation {
public PublishedActionFacetForActionAnnotationAsConfigured(
- final PublishingPayloadFactoryForAction publishingPayloadFactory,
final FacetHolder holder) {
- super(publishingPayloadFactory, holder);
+ super(holder);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForPublishedActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForPublishedActionAnnotation.java
deleted file mode 100644
index ad1f6f4..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetForPublishedActionAnnotation.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.core.metamodel.facets.actions.action.publishing;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacet;
-import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class PublishedActionFacetForPublishedActionAnnotation extends PublishedActionFacetAbstract {
-
- public static PublishedActionFacet create(
- final PublishedAction publishedAction,
- final FacetHolder holder) {
-
- if (publishedAction == null) {
- return null;
- }
-
- return new PublishedActionFacetForPublishedActionAnnotation(newPayloadFactory(publishedAction), holder);
- }
-
-
- public PublishedActionFacetForPublishedActionAnnotation(
- final PublishedAction.PayloadFactory payloadFactory,
- final FacetHolder holder) {
- super(payloadFactory, holder);
- }
-
- private static PublishedAction.PayloadFactory newPayloadFactory(final PublishedAction publishedAction) {
- final Class<? extends PublishedAction.PayloadFactory> payloadFactoryClass = publishedAction.value();
- if(payloadFactoryClass == null) {
- return null;
- }
-
- try {
- return payloadFactoryClass.newInstance();
- } catch (final InstantiationException e) {
- return null;
- } catch (final IllegalAccessException e) {
- return null;
- }
- }
-
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
index f06e45d..d5483b9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/publishing/PublishedActionFacetFromConfiguration.java
@@ -25,9 +25,8 @@ import org.apache.isis.core.metamodel.facets.actions.publish.PublishedActionFace
public class PublishedActionFacetFromConfiguration extends PublishedActionFacetAbstract {
public PublishedActionFacetFromConfiguration(
- final PublishingPayloadFactoryForAction publishingPayloadFactory,
final FacetHolder holder) {
- super(publishingPayloadFactory, holder);
+ super(holder);
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index 360d0ef..03d28d9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -67,7 +67,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInv
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacetForDomainEventFromDefault;
import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForActionAnnotation;
-import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetForPublishedActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.publishing.PublishedActionFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.typeof.TypeOfFacetOnActionForTypeOfAnnotation;
--
To stop receiving notification emails like this one, please contact
"commits@isis.apache.org" <co...@isis.apache.org>.