This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push: new 3c40d81 ISIS-2340: remove support for service contributed actions (2) 3c40d81 is described below commit 3c40d81754fb9b774b8baf842b8366f2975454d2 Author: Andi Huber <ahu...@apache.org> AuthorDate: Fri May 1 11:05:10 2020 +0200 ISIS-2340: remove support for service contributed actions (2) --- .../specimpl/ObjectSpecificationAbstract.java | 58 +--------------------- .../specloader/specimpl/PendingParameterModel.java | 3 +- 2 files changed, 3 insertions(+), 58 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java index 6133ec7..e945c8a 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java @@ -33,6 +33,7 @@ import java.util.stream.Stream; import javax.enterprise.inject.Vetoed; import org.apache.isis.applib.Identifier; +import org.apache.isis.applib.services.metamodel.BeanSort; import org.apache.isis.core.commons.internal.base._Lazy; import org.apache.isis.core.commons.internal.base._NullSafe; import org.apache.isis.core.commons.internal.base._Strings; @@ -42,7 +43,6 @@ import org.apache.isis.core.commons.internal.collections._Multimaps.ListMultimap import org.apache.isis.core.commons.internal.collections._Sets; import org.apache.isis.core.commons.internal.collections._Streams; import org.apache.isis.core.commons.internal.exceptions._Exceptions; -import org.apache.isis.applib.services.metamodel.BeanSort; import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter; import org.apache.isis.core.config.beans.IsisBeanTypeRegistry; import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder; @@ -834,61 +834,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem } - // -- contributee actions - /** - * All contributee actions (each wrapping a service's contributed action) for this spec. - * - * <p> - * If this specification {@link #isManagedBean() is actually for} a service, - * then returns an empty list. - */ - @Deprecated - private List<ObjectAction> createContributeeActions() { - if (isManagedBean() || isValue()) { - return Collections.emptyList(); - } - val contributeeActions = _Lists.<ObjectAction>newArrayList(); - streamManagedBeans() - .forEach(serviceBean->forEachContributeeAction(serviceBean, contributeeActions::add)); - return contributeeActions; - } - - - @Deprecated - private void forEachContributeeAction( - final Object servicePojo, - final Consumer<ObjectAction> onNewContributeeAction) { - - if(log.isDebugEnabled()) { - log.debug("{} : addContributeeActionsIfAny(...); servicePojo class is: {}", - this.getFullIdentifier(), servicePojo.getClass().getName()); - } - - val serviceType = servicePojo.getClass(); - val specification = getSpecificationLoader().loadSpecification(serviceType, - IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED); - if (specification == this) { - return; - } - - final Stream<ObjectAction> serviceActions = specification - .streamObjectActions(ActionType.ALL, Contributed.INCLUDED); - - serviceActions - .filter(Predicates.isContributeeAction(this)) - - .findAny().ifPresent(action->_Exceptions - .unrecoverableFormatted("ContributeeActions like %s are no longer supported", action)); - - -// .map(ObjectActionDefault.class::cast) -// .map(Factories.contributeeAction(this, servicePojo)) -// .peek(facetProcessor::processMemberOrder) -// .forEach(onNewContributeeAction); - - } - - // -- mixin actions /** * All contributee actions (each wrapping a service's contributed action) for this spec. @@ -1034,7 +979,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem synchronized (unmodifiableActions) { val actions = _Lists.newArrayList(this.objectActions); if (isEntityOrViewModel()) { - actions.addAll(createContributeeActions()); actions.addAll(createMixedInActions()); } sortCacheAndUpdateActions(actions); diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModel.java index 17c89cf..44030b3 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModel.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/PendingParameterModel.java @@ -37,7 +37,8 @@ public class PendingParameterModel { @NonNull private final ObjectAction action; @NonNull private final ManagedObject actionOwner; - /** typically equal to {@code actionOwner}, except for mixins and contributees*/ + /** typically equal to {@code actionOwner}, except for mixins, where {@code actionTarget} + * is the mixin instance */ @NonNull private final ManagedObject actionTarget; @NonNull private final Can<ManagedObject> paramValues;