You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/23 11:59:24 UTC
[isis] branch master updated: ISIS-2492: more metamodel API method
renaming
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 556c6ec ISIS-2492: more metamodel API method renaming
556c6ec is described below
commit 556c6ecab3a9bd4af26f345347add53d8d1c4c11
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 23 12:59:06 2021 +0100
ISIS-2492: more metamodel API method renaming
to better reflect the fact that methods only return declared members
this is in preparation of providing variants that do support inheritance
---
.../MethodPrefixBasedFacetFactoryAbstract.java | 2 +-
...nChoicesForCollectionParameterFacetFactory.java | 2 +-
.../annotation/HomePageFacetAnnotationFactory.java | 2 +-
.../BookmarkPolicyFacetFallbackFactory.java | 2 +-
.../DomainServiceFacetAnnotationFactory.java | 2 +-
...jectSpecIdFacetDerivedFromClassNameFactory.java | 3 +--
.../impl/ObjectValidPropertiesFacetImpl.java | 2 +-
.../interactions/managed/ManagedMember.java | 2 +-
.../core/metamodel/layout/LayoutFacetUtil.java | 2 +-
.../create/ObjectCreator_builtinHandlers.java | 2 +-
.../param/DeriveFacetsPostProcessor.java | 4 ++--
.../dflt/ProgrammingModelFacetsJava8.java | 4 ++--
.../ApplicationFeatureRepositoryDefault.java | 6 +++---
.../services/grid/GridSystemServiceAbstract.java | 6 +++---
.../grid/bootstrap3/GridSystemServiceBS3.java | 2 +-
.../services/metamodel/MetaModelExporter.java | 2 +-
.../metamodel/MetaModelServiceDefault.java | 6 +++---
.../core/metamodel/spec/ObjectSpecification.java | 6 +++---
.../core/metamodel/spec/feature/ObjectAction.java | 6 +++---
.../spec/feature/ObjectActionContainer.java | 24 +++++++++++-----------
.../spec/feature/ObjectAssociationContainer.java | 8 +++++---
.../specimpl/ObjectSpecificationAbstract.java | 12 +++++------
.../specimpl/dflt/ObjectSpecificationDefault.java | 10 ++++-----
.../core/metamodel/util/snapshot/XmlSnapshot.java | 4 ++--
.../ApplicationFeatureRepositoryDefaultTest.java | 6 +++---
.../testspec/ObjectSpecificationStub.java | 10 ++++-----
.../command/CommandExecutorServiceDefault.java | 4 ++--
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../wrapper/WrapperFactoryDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 4 ++--
.../changetracking/EntityChangeTrackerDefault.java | 2 +-
.../integration/metamodel/JdoPropertyUtils.java | 2 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 2 +-
...DerivedFromJdoColumnAnnotationFacetFactory.java | 2 +-
.../isis/testdomain/domainmodel/MetamodelUtil.java | 4 ++--
.../DomainModelTest_usingGoodDomain.java | 6 +++---
.../excel/applib/dom/util/ExcelConverter.java | 6 +++---
.../common/model/mementos/ActionMemento.java | 2 +-
.../domainobjects/DomainObjectReprRenderer.java | 4 ++--
.../domaintypes/DomainTypeReprRenderer.java | 4 ++--
.../service/swagger/internal/Generation.java | 4 ++--
.../rendering/service/swagger/internal/Util.java | 4 ++--
.../resources/ObjectAdapterUpdateHelper.java | 2 +-
.../wicket/model/models/BookmarkTreeNode.java | 2 +-
.../collection/AssociatedWithActionsHelper.java | 2 +-
.../CollectionContentsAsAjaxTablePanel.java | 2 +-
.../summary/CollectionContentsAsSummary.java | 2 +-
.../CollectionContentsAsSummaryFactory.java | 2 +-
49 files changed, 103 insertions(+), 102 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index cd30e86..4c18093 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -109,7 +109,7 @@ implements MethodPrefixBasedFacetFactory {
public boolean visit(ObjectSpecification objectSpec, MetaModelValidator metaModelValidator) {
// ensure accepted actions do not have any of the reserved prefixes
- objectSpec.streamObjectActions(MixedIn.EXCLUDED)
+ objectSpec.streamDeclaredActions(MixedIn.EXCLUDED)
.forEach(objectAction -> {
val actionId = objectAction.getId();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
index f1ea615..a261af1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
@@ -78,7 +78,7 @@ implements MetaModelRefiner {
final ObjectSpecification objectSpec,
final MetaModelValidator validator) {
- objectSpec.streamObjectActions(MixedIn.INCLUDED)
+ objectSpec.streamDeclaredActions(MixedIn.INCLUDED)
.forEach(objectAction->{
if(objectAction instanceof ObjectActionMixedIn) {
// we'll report only the mixin
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
index 5bcb4cf..84a9ba2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/homepage/annotation/HomePageFacetAnnotationFactory.java
@@ -81,7 +81,7 @@ implements MetaModelRefiner {
public boolean visit(ObjectSpecification objectSpec, MetaModelValidator validator) {
val objectActions =
- objectSpec.streamObjectActions(MixedIn.EXCLUDED);
+ objectSpec.streamDeclaredActions(MixedIn.EXCLUDED);
objectActions
.filter(objectAction->objectAction.containsFacet(HomePageFacet.class))
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
index a0c6879..0842570 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/bookmarkpolicy/bookmarkable/BookmarkPolicyFacetFallbackFactory.java
@@ -57,7 +57,7 @@ implements MetaModelRefiner {
programmingModel.addValidator((objectSpec, validator) -> {
- final Stream<ObjectAction> objectActions = objectSpec.streamObjectActions(MixedIn.EXCLUDED);
+ final Stream<ObjectAction> objectActions = objectSpec.streamDeclaredActions(MixedIn.EXCLUDED);
objectActions
.filter(objectAction->{
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
index f575f96..120ef9e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
@@ -92,7 +92,7 @@ implements MetaModelRefiner {
return;
}
- final Stream<ObjectAssociation> associations = thisSpec.streamAssociations(MixedIn.EXCLUDED);
+ final Stream<ObjectAssociation> associations = thisSpec.streamDeclaredAssociations(MixedIn.EXCLUDED);
final String associationNames = associations
.map(ObjectAssociation::getName)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
index 99e99c5..17a38ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
import javax.inject.Inject;
import javax.xml.bind.annotation.XmlType;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -190,7 +189,7 @@ implements MetaModelRefiner, ObjectSpecIdFacetFactory {
}
// don't check if domain service has only programmatic methods
- final Stream<ObjectAction> objectActions = objectSpec.streamObjectActions(MixedIn.INCLUDED);
+ final Stream<ObjectAction> objectActions = objectSpec.streamDeclaredActions(MixedIn.INCLUDED);
return objectActions.anyMatch(__->true); // return true if not empty
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
index d8a1281..d656672 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectvalidprops/impl/ObjectValidPropertiesFacetImpl.java
@@ -47,7 +47,7 @@ public class ObjectValidPropertiesFacetImpl extends ObjectValidPropertiesFacetAb
final StringBuilder buf = new StringBuilder();
final ManagedObject adapter = context.getTarget();
- adapter.getSpecification().streamAssociations(MixedIn.EXCLUDED)
+ adapter.getSpecification().streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES)
.filter(property->property.isVisible(adapter, context.getInitiatedBy(), where).isVetoed()) // ignore hidden properties
.filter(property->property.isUsable(adapter, context.getInitiatedBy(), where).isVetoed()) // ignore disabled properties
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
index a4f06ff..28bcd2c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/managed/ManagedMember.java
@@ -55,7 +55,7 @@ public abstract class ManagedMember implements ManagedFeature {
.map(collection->collection.isOneToManyAssociation()?collection:null)),
ACTION(ObjectAction.class, (spec, actionId)->
- spec.getObjectAction(actionId));
+ spec.getAction(actionId));
@Getter private final Class<? extends ObjectMember> memberType;
private final BiFunction<
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
index d989108..ce3741e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/LayoutFacetUtil.java
@@ -317,7 +317,7 @@ public class LayoutFacetUtil {
@Override
public void visit(final ActionLayoutData actionLayoutData) {
- objectSpec.getObjectAction(actionLayoutData.getId())
+ objectSpec.getAction(actionLayoutData.getId())
.ifPresent(objectAction->{
setBookmarkingIfAny(actionLayoutData, objectAction);
setCssClassIfAny(actionLayoutData, objectAction);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
index ea2cd0d..5814ddc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/create/ObjectCreator_builtinHandlers.java
@@ -100,7 +100,7 @@ final class ObjectCreator_builtinHandlers {
private ManagedObject initializePropertiesAndDoCallback(ManagedObject adapter) {
// initialize new object
- adapter.getSpecification().streamAssociations(MixedIn.EXCLUDED)
+ adapter.getSpecification().streamDeclaredAssociations(MixedIn.EXCLUDED)
.forEach(field->field.toDefault(adapter));
val pojo = adapter.getPojo();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index 611e352..c93185d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -124,7 +124,7 @@ implements ObjectSpecificationPostProcessor, MetaModelContextAware {
// all the actions of this type
val actionTypes = inferActionTypes();
- final Stream<ObjectAction> objectActions = objectSpecification.streamObjectActions(actionTypes, MixedIn.INCLUDED);
+ final Stream<ObjectAction> objectActions = objectSpecification.streamDeclaredActions(actionTypes, MixedIn.INCLUDED);
// and all the collections of this type
final Stream<OneToManyAssociation> collections = objectSpecification.streamCollections(MixedIn.INCLUDED);
@@ -185,7 +185,7 @@ implements ObjectSpecificationPostProcessor, MetaModelContextAware {
final ObjectActionParameter.Predicates.ScalarParameter whetherScalarParamOfType =
new ObjectActionParameter.Predicates.ScalarParameter(specification);
- objectSpecification.streamObjectActions(actionTypes, MixedIn.INCLUDED)
+ objectSpecification.streamDeclaredActions(actionTypes, MixedIn.INCLUDED)
.filter(ObjectAction.Predicates.associatedWith(collection))
.forEach(action->{
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index 13659cd..c521488 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
@@ -360,10 +360,10 @@ public final class ProgrammingModelFacetsJava8 extends ProgrammingModelAbstract
addValidator(new TitlesAndTranslationsValidator());
addValidator((objectSpec, validator) -> {
- final long numActions = objectSpec.streamObjectActions(MixedIn.INCLUDED).count();
+ final long numActions = objectSpec.streamDeclaredActions(MixedIn.INCLUDED).count();
if (numActions > 0L) {
- val actionIds = objectSpec.streamObjectActions(MixedIn.INCLUDED)
+ val actionIds = objectSpec.streamDeclaredActions(MixedIn.INCLUDED)
.map(ObjectAction::getIdentifier)
.map(Identifier::toString)
.collect(Collectors.joining(", "));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 3a5cebf..35f703e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -137,13 +137,13 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
return;
}
- final List<ObjectAssociation> properties = spec.streamAssociations(MixedIn.INCLUDED)
+ final List<ObjectAssociation> properties = spec.streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES)
.collect(Collectors.toList());
- final List<ObjectAssociation> collections = spec.streamAssociations(MixedIn.INCLUDED)
+ final List<ObjectAssociation> collections = spec.streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(ObjectAssociation.Predicates.COLLECTIONS)
.collect(Collectors.toList());
- final List<ObjectAction> actions = spec.streamObjectActions(MixedIn.INCLUDED)
+ final List<ObjectAction> actions = spec.streamDeclaredActions(MixedIn.INCLUDED)
.collect(Collectors.toList());
if (properties.isEmpty() && collections.isEmpty() && actions.isEmpty()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index f01a586..9b4f3cd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -181,7 +181,7 @@ implements GridSystemService<G> {
val oneToOneAssociationById = ObjectMember.mapById(getOneToOneAssociations(objectSpec));
val oneToManyAssociationById = ObjectMember.mapById(getOneToManyAssociations(objectSpec));
- val objectActionById = ObjectMember.mapById(objectSpec.streamObjectActions(MixedIn.INCLUDED));
+ val objectActionById = ObjectMember.mapById(objectSpec.streamDeclaredActions(MixedIn.INCLUDED));
final AtomicInteger propertySequence = new AtomicInteger(0);
fcGrid.visit(new Grid.VisitorAdapter() {
@@ -327,7 +327,7 @@ implements GridSystemService<G> {
protected static Stream<OneToOneAssociation> getOneToOneAssociations(final ObjectSpecification objectSpec) {
@SuppressWarnings("rawtypes")
Stream associations = objectSpec
- .streamAssociations(MixedIn.INCLUDED)
+ .streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES);
return _Casts.uncheckedCast(associations);
}
@@ -335,7 +335,7 @@ implements GridSystemService<G> {
protected static Stream<OneToManyAssociation> getOneToManyAssociations(final ObjectSpecification objectSpec) {
@SuppressWarnings("rawtypes")
Stream associations = objectSpec
- .streamAssociations(MixedIn.INCLUDED)
+ .streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(ObjectAssociation.Predicates.COLLECTIONS);
return _Casts.uncheckedCast(associations);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 90d910f..57781c6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -178,7 +178,7 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
val oneToOneAssociationById = ObjectMember.mapById(getOneToOneAssociations(objectSpec));
val oneToManyAssociationById = ObjectMember.mapById(getOneToManyAssociations(objectSpec));
- val objectActionById = ObjectMember.mapById( objectSpec.streamObjectActions(MixedIn.INCLUDED));
+ val objectActionById = ObjectMember.mapById( objectSpec.streamDeclaredActions(MixedIn.INCLUDED));
val propertyLayoutDataById = bs3Grid.getAllPropertiesById();
val collectionLayoutDataById = bs3Grid.getAllCollectionsById();
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
index 6b83a7e..0a5ce77 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
@@ -267,7 +267,7 @@ class MetaModelExporter {
}
final List<Action> actions = domainClass.getActions().getAct();
- specification.streamObjectActions(MixedIn.INCLUDED)
+ specification.streamDeclaredActions(MixedIn.INCLUDED)
.map(action ->asXsdType(action, domainClassByObjectSpec, config))
.forEach(actions::add);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 45e9286..d608d75 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -119,7 +119,7 @@ public class MetaModelServiceDefault implements MetaModelService {
{
final Stream<ObjectAssociation> properties =
- spec.streamAssociations(MixedIn.EXCLUDED)
+ spec.streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES);
properties
@@ -130,7 +130,7 @@ public class MetaModelServiceDefault implements MetaModelService {
{
final Stream<ObjectAssociation> associations =
- spec.streamAssociations(MixedIn.EXCLUDED)
+ spec.streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.COLLECTIONS);
associations
@@ -141,7 +141,7 @@ public class MetaModelServiceDefault implements MetaModelService {
{
final Stream<ObjectAction> actions =
- spec.streamObjectActions(MixedIn.INCLUDED);
+ spec.streamDeclaredActions(MixedIn.INCLUDED);
actions
.filter(action->!exclude(action))
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 6ec068e..ccef4ae 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -128,7 +128,7 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
* @since 2.0
*/
public default Optional<MixedInMember> getMixedInMember(ObjectSpecification onType) {
- return streamObjectActions(MixedIn.INCLUDED)
+ return streamDeclaredActions(MixedIn.INCLUDED)
.filter(MixedInMember.class::isInstance)
.map(MixedInMember.class::cast)
.filter(member->member.getMixinType() == onType)
@@ -448,8 +448,8 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
default Stream<FacetHolder> streamFacetHolders(){
val self = Stream.of(this);
- val actions = streamObjectActions(MixedIn.EXCLUDED);
- val actionParameters = streamObjectActions(MixedIn.EXCLUDED)
+ val actions = streamDeclaredActions(MixedIn.EXCLUDED);
+ val actionParameters = streamDeclaredActions(MixedIn.EXCLUDED)
.flatMap(action->action.getParameterCount()>0
? action.getParameters().stream()
: Stream.empty());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 39256f2..550322d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -368,7 +368,7 @@ public interface ObjectAction extends ObjectMember {
.and(ObjectAction.Predicates.excludeWizardActions(adapterSpec));
final Stream<ObjectAction> userActions =
- adapterSpec.streamObjectActions(actionType, MixedIn.INCLUDED)
+ adapterSpec.streamDeclaredActions(actionType, MixedIn.INCLUDED)
.filter(predicate);
userActions
.forEach(topLevelActions::add);
@@ -409,7 +409,7 @@ public interface ObjectAction extends ObjectMember {
.and(ObjectAction.Predicates.excludeWizardActions(objectSpecification));
final Stream<ObjectAction> userActions =
- objectSpecification.streamObjectActions(type, MixedIn.INCLUDED)
+ objectSpecification.streamDeclaredActions(type, MixedIn.INCLUDED)
.filter(predicate);
userActions
.forEach(associatedActions::add);
@@ -595,7 +595,7 @@ public interface ObjectAction extends ObjectMember {
final Set<String> associationNamesAndIds = _Sets.newHashSet();
- adapterSpec.streamAssociations(MixedIn.INCLUDED)
+ adapterSpec.streamDeclaredAssociations(MixedIn.INCLUDED)
.forEach(ass->{
associationNamesAndIds.add(_Strings.lower(ass.getName()));
associationNamesAndIds.add(_Strings.lower(ass.getId()));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
index f3faed0..3a07d4b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionContainer.java
@@ -42,22 +42,22 @@ public interface ObjectActionContainer {
* and if nothing found there, search the interfaces. Special care needs to be taken, as the
* {@link ActionType} might be redeclared when inheriting from a super-type or interface.
*/
- Optional<ObjectAction> getObjectAction(String id, @Nullable ActionType type);
+ Optional<ObjectAction> getAction(String id, @Nullable ActionType type);
- default ObjectAction getObjectActionElseFail(String id, @Nullable ActionType type) {
- return getObjectAction(id, type)
+ default ObjectAction getActionElseFail(String id, @Nullable ActionType type) {
+ return getAction(id, type)
.orElseThrow(()->_Exceptions.noSuchElement("id=%s type=%s",
id,
type==null ? "any" : type.name()));
}
- default Optional<ObjectAction> getObjectAction(String id) {
- return getObjectAction(id, null);
+ default Optional<ObjectAction> getAction(String id) {
+ return getAction(id, null);
}
- default ObjectAction getObjectActionElseFail(String id) {
- return getObjectActionElseFail(id, null);
+ default ObjectAction getActionElseFail(String id) {
+ return getActionElseFail(id, null);
}
@@ -88,13 +88,13 @@ public interface ObjectActionContainer {
* Returns an array of actions of the specified type, including or excluding
* contributed actions as required.
*/
- Stream<ObjectAction> streamObjectActions(ImmutableEnumSet<ActionType> types, MixedIn contributed);
+ Stream<ObjectAction> streamDeclaredActions(ImmutableEnumSet<ActionType> types, MixedIn contributed);
- default Stream<ObjectAction> streamObjectActions(ActionType type, MixedIn contributed) {
- return streamObjectActions(ImmutableEnumSet.of(type), contributed);
+ default Stream<ObjectAction> streamDeclaredActions(ActionType type, MixedIn contributed) {
+ return streamDeclaredActions(ImmutableEnumSet.of(type), contributed);
}
- default Stream<ObjectAction> streamObjectActions(MixedIn contributed) {
- return streamObjectActions(ActionType.ANY, contributed);
+ default Stream<ObjectAction> streamDeclaredActions(MixedIn contributed) {
+ return streamDeclaredActions(ActionType.ANY, contributed);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
index 1a3288c..c15ab2d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationContainer.java
@@ -64,7 +64,7 @@ public interface ObjectAssociationContainer {
* <tt>ObjectAssociationFilters#staticallyVisible(...)</tt>
*
*/
- Stream<ObjectAssociation> streamAssociations(MixedIn contributed);
+ Stream<ObjectAssociation> streamDeclaredAssociations(MixedIn contributed);
/**
* All {@link ObjectAssociation association}s that represent
@@ -72,7 +72,8 @@ public interface ObjectAssociationContainer {
*
*/
default Stream<OneToOneAssociation> streamProperties(MixedIn contributed) {
- return streamAssociations(contributed)
+ //TODO support inheritance
+ return streamDeclaredAssociations(contributed)
.filter(ObjectAssociation.Predicates.PROPERTIES)
.map(x->(OneToOneAssociation)x);
}
@@ -85,7 +86,8 @@ public interface ObjectAssociationContainer {
*
*/
default Stream<OneToManyAssociation> streamCollections(MixedIn contributed){
- return streamAssociations(contributed)
+ //TODO support inheritance
+ return streamDeclaredAssociations(contributed)
.filter(ObjectAssociation.Predicates.COLLECTIONS)
.map(x->(OneToManyAssociation)x);
}
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 e711c0d..1dbd1a5 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
@@ -679,7 +679,7 @@ implements ObjectSpecification {
// -- ASSOCIATIONS
@Override
- public Stream<ObjectAssociation> streamAssociations(final MixedIn contributed) {
+ public Stream<ObjectAssociation> streamDeclaredAssociations(final MixedIn contributed) {
introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
if(contributed.isIncluded()) {
@@ -700,7 +700,7 @@ implements ObjectSpecification {
public Optional<? extends ObjectMember> getMember(final String memberId) {
introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
- val objectAction = getObjectAction(memberId);
+ val objectAction = getAction(memberId);
if(objectAction.isPresent()) {
return objectAction;
}
@@ -742,13 +742,13 @@ implements ObjectSpecification {
@Override
public Optional<ObjectAssociation> getDeclaredAssociation(final String id) {
introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
- return streamAssociations(MixedIn.INCLUDED)
+ return streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(objectAssociation->objectAssociation.getId().equals(id))
.findFirst();
}
@Override
- public Stream<ObjectAction> streamObjectActions(
+ public Stream<ObjectAction> streamDeclaredActions(
final ImmutableEnumSet<ActionType> types,
final MixedIn contributed) {
introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
@@ -799,7 +799,7 @@ implements ObjectSpecification {
val mixinMethodName = mixinFacet.value();
final Stream<ObjectAction> mixinActions = specification
- .streamObjectActions(ActionType.ANY, MixedIn.INCLUDED);
+ .streamDeclaredActions(ActionType.ANY, MixedIn.INCLUDED);
mixinActions
.filter(Predicates::isMixedInAssociation)
@@ -854,7 +854,7 @@ implements ObjectSpecification {
val mixinMethodName = mixinFacet.value();
final Stream<ObjectAction> mixinsActions = mixinSpec
- .streamObjectActions(ActionType.ANY, MixedIn.INCLUDED);
+ .streamDeclaredActions(ActionType.ANY, MixedIn.INCLUDED);
mixinsActions
.filter(Predicates::isMixedInAction)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index a21981b..b8e4d1e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -273,7 +273,7 @@ implements FacetHolder {
// -- findObjectAction
@Override
- public Optional<ObjectAction> getObjectAction(String id, @Nullable ActionType type) {
+ public Optional<ObjectAction> getAction(String id, @Nullable ActionType type) {
if(isTypeHierarchyRoot()) {
return Optional.empty(); // stop search as we reached the Object class, which does not contribute actions
@@ -295,7 +295,7 @@ implements FacetHolder {
return Optional.empty();
}
- return superclass().getObjectAction(id, type);
+ return superclass().getAction(id, type);
//XXX future extensions should also search the interfaces,
// but avoid doing redundant work when walking the type-hierarchy;
@@ -309,7 +309,7 @@ implements FacetHolder {
introspectUpTo(IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
final Stream<ObjectAction> actions =
- streamObjectActions(
+ streamDeclaredActions(
type==null
? ActionType.ANY
: ImmutableEnumSet.of(type),
@@ -358,7 +358,7 @@ implements FacetHolder {
}
private void cataloguePropertiesAndCollections(BiConsumer<Method, ObjectMember> onMember) {
- streamAssociations(MixedIn.EXCLUDED)
+ streamDeclaredAssociations(MixedIn.EXCLUDED)
.forEach(field->{
final Stream<Facet> facets = field.streamFacets().filter(ImperativeFacet.PREDICATE);
facets.forEach(facet->{
@@ -371,7 +371,7 @@ implements FacetHolder {
}
private void catalogueActions(BiConsumer<Method, ObjectMember> onMember) {
- streamObjectActions(MixedIn.INCLUDED)
+ streamDeclaredActions(MixedIn.INCLUDED)
.forEach(userAction->{
final Stream<Facet> facets = userAction.streamFacets().filter(ImperativeFacet.PREDICATE);
facets.forEach(facet->{
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
index c3bd5ee..9f7b12f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
@@ -484,7 +484,7 @@ public class XmlSnapshot implements Snapshot {
if (field instanceof OneToOneAssociation) {
- if (field.getSpecification().streamAssociations(MixedIn.INCLUDED).limit(1).count() == 0L) {
+ if (field.getSpecification().streamDeclaredAssociations(MixedIn.INCLUDED).limit(1).count() == 0L) {
if (log.isDebugEnabled()) {
log.debug("includeField(Pl, Vec, Str): field is value; done");
}
@@ -653,7 +653,7 @@ public class XmlSnapshot implements Snapshot {
isisMetaModel.setAttributesForClass(element, oidAsString(adapter).toString());
- final List<ObjectAssociation> fields = nos.streamAssociations(MixedIn.INCLUDED)
+ final List<ObjectAssociation> fields = nos.streamDeclaredAssociations(MixedIn.INCLUDED)
.collect(Collectors.toList());
if (log.isDebugEnabled()) {
log.debug("objectToElement(NO): processing fields");
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index e721e87..738dc62 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -110,10 +110,10 @@ public class ApplicationFeatureRepositoryDefaultTest {
allowing(mockSpec).getFullIdentifier();
will(returnValue(Bar.class.getName()));
- allowing(mockSpec).streamAssociations(with(MixedIn.INCLUDED));//, with(ObjectAssociation.Predicates.PROPERTIES));
+ allowing(mockSpec).streamDeclaredAssociations(with(MixedIn.INCLUDED));//, with(ObjectAssociation.Predicates.PROPERTIES));
will(returnValue(properties.stream().filter(ObjectAssociation.Predicates.PROPERTIES)));
- allowing(mockSpec).streamAssociations(with(MixedIn.INCLUDED));//, with(ObjectAssociation.Predicates.COLLECTIONS));
+ allowing(mockSpec).streamDeclaredAssociations(with(MixedIn.INCLUDED));//, with(ObjectAssociation.Predicates.COLLECTIONS));
will(returnValue(collections.stream().filter(ObjectAssociation.Predicates.COLLECTIONS)));
allowing(mockSpec).getFacet(HiddenFacet.class);
@@ -127,7 +127,7 @@ public class ApplicationFeatureRepositoryDefaultTest {
allowing(mockSpec).getCorrespondingClass();
will(returnValue(Bar.class));
- allowing(mockSpec).streamObjectActions(with(MixedIn.INCLUDED));
+ allowing(mockSpec).streamDeclaredActions(with(MixedIn.INCLUDED));
will(returnValue(actions.stream()));
allowing(mockProp).getId();
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 29cfe50..4bb1d8c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -71,7 +71,7 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
@Override
public Optional<? extends ObjectMember> getMember(final String memberId) {
- val objectAction = getObjectAction(memberId);
+ val objectAction = getAction(memberId);
if(objectAction.isPresent()) {
return objectAction;
}
@@ -122,7 +122,7 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
}
@Override
- public Stream<ObjectAssociation> streamAssociations(final MixedIn contributed) {
+ public Stream<ObjectAssociation> streamDeclaredAssociations(final MixedIn contributed) {
return fields.stream();
}
@@ -298,12 +298,12 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
// /////////////////////////////////////////////////////////////
@Override
- public Stream<ObjectAction> streamObjectActions(final MixedIn contributed) {
+ public Stream<ObjectAction> streamDeclaredActions(final MixedIn contributed) {
return null;
}
@Override
- public Stream<ObjectAction> streamObjectActions(ImmutableEnumSet<ActionType> types, MixedIn contributed) {
+ public Stream<ObjectAction> streamDeclaredActions(ImmutableEnumSet<ActionType> types, MixedIn contributed) {
return null;
}
@@ -353,7 +353,7 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
}
@Override
- public Optional<ObjectAction> getObjectAction(String id, ActionType type) {
+ public Optional<ObjectAction> getAction(String id, ActionType type) {
// poorly implemented, inheritance not supported
return getDeclaredAction(id, type);
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index a6bf80a..fc0198a 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -346,7 +346,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
private static ObjectAction findActionElseNull(
final ObjectSpecification specification,
final String localActionId) {
- final Stream<ObjectAction> objectActions = specification.streamObjectActions(MixedIn.INCLUDED);
+ final Stream<ObjectAction> objectActions = specification.streamDeclaredActions(MixedIn.INCLUDED);
return objectActions
.filter(objectAction->
@@ -359,7 +359,7 @@ public class CommandExecutorServiceDefault implements CommandExecutorService {
final ObjectSpecification specification,
final String localPropertyId) {
- final Stream<ObjectAssociation> associations = specification.streamAssociations(MixedIn.INCLUDED);
+ final Stream<ObjectAssociation> associations = specification.streamDeclaredAssociations(MixedIn.INCLUDED);
return associations
.filter(association->
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index 5fe092e..5ee4f70 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -368,7 +368,7 @@ public class MenuBarsServiceBS3 implements MenuBarsService {
}
}
- final Stream<ObjectAction> objectActions = serviceSpec.streamObjectActions(actionType, MixedIn.INCLUDED);
+ final Stream<ObjectAction> objectActions = serviceSpec.streamDeclaredActions(actionType, MixedIn.INCLUDED);
return objectActions
// skip if annotated to not be included in repository menu using legacy mechanism
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index d58064f..939bcb3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -408,7 +408,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
// don't care about anything other than actions
// (contributed properties and collections are read-only).
- Optional<ObjectActionMixedIn> targetActionIfAny = mixedInSpec.streamObjectActions(MixedIn.INCLUDED)
+ Optional<ObjectActionMixedIn> targetActionIfAny = mixedInSpec.streamDeclaredActions(MixedIn.INCLUDED)
.filter(ObjectActionMixedIn.class::isInstance)
.map(ObjectActionMixedIn.class::cast)
.filter(x -> x.hasMixinAction((ObjectAction) mixinMember))
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index 3945fb8..3a10ace 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -263,8 +263,8 @@ extends DelegatingInvocationHandlerDefault<T> {
return null;
}
val specification = domainObjectAdapter.getSpecification();
- val objectActions = specification.streamObjectActions(MixedIn.INCLUDED);
- val objectAssociations = specification.streamAssociations(MixedIn.INCLUDED);
+ val objectActions = specification.streamDeclaredActions(MixedIn.INCLUDED);
+ val objectAssociations = specification.streamDeclaredAssociations(MixedIn.INCLUDED);
final Stream<ObjectMember> objectMembers = Stream.concat(objectActions, objectAssociations);
return objectMembers
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
index fde6ad3..e2561b3 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/EntityChangeTrackerDefault.java
@@ -268,7 +268,7 @@ implements
log.debug("enlist entity's property changes for auditing {}", entity);
entity.getSpecification()
- .streamAssociations(MixedIn.EXCLUDED)
+ .streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES)
.map(OneToOneAssociation.class::cast)
.filter(property->!property.isNotPersisted())
diff --git a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java
index 7045f72..5b11732 100644
--- a/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java
+++ b/persistence/jdo/integration/src/main/java/org/apache/isis/persistence/jdo/integration/metamodel/JdoPropertyUtils.java
@@ -63,7 +63,7 @@ public final class JdoPropertyUtils {
final List<ObjectAssociation> propertyList = objSpec
- .streamAssociations(MixedIn.EXCLUDED)
+ .streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(predicate)
.limit(2)
.collect(Collectors.toList());
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
index 5ecb199..7f80434 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -124,7 +124,7 @@ implements MetaModelRefiner {
return;
}
- final Stream<ObjectAssociation> associations = objectSpec.streamAssociations(MixedIn.EXCLUDED)
+ final Stream<ObjectAssociation> associations = objectSpec.streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES);
associations
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
index c811a9a..a1aae29 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -142,7 +142,7 @@ implements MetaModelRefiner {
}
final Stream<ObjectAssociation> associations = objectSpec
- .streamAssociations(MixedIn.EXCLUDED)
+ .streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES);
associations
diff --git a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
index 85a9a5e..6a00d34 100644
--- a/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
+++ b/persistence/jdo/metamodel/src/main/java/org/apache/isis/persistence/jdo/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java
@@ -114,7 +114,7 @@ implements MetaModelRefiner {
}
final Stream<ObjectAssociation> associations = objectSpec
- .streamAssociations(MixedIn.EXCLUDED)
+ .streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES);
associations.forEach(association->{
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/MetamodelUtil.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/MetamodelUtil.java
index e0f0e4f..6625648 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/MetamodelUtil.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/domainmodel/MetamodelUtil.java
@@ -35,11 +35,11 @@ final class MetamodelUtil {
allSpecs.stream()
.forEach(spec->{
- spec.streamObjectActions(MixedIn.INCLUDED)
+ spec.streamDeclaredActions(MixedIn.INCLUDED)
.forEach(feature->{
features.add(feature.getIdentifier().toString());
});
- spec.streamAssociations(MixedIn.INCLUDED)
+ spec.streamDeclaredAssociations(MixedIn.INCLUDED)
.forEach(feature->{
features.add(feature.getIdentifier().toString());
});
diff --git a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 63e730f..a7cedaa 100644
--- a/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -111,14 +111,14 @@ class DomainModelTest_usingGoodDomain {
val holderSpec = specificationLoader.loadSpecification(ProperMemberSupport.class,
IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
- val mx_action = holderSpec.getObjectActionElseFail("action"); // when @Action at type level
+ val mx_action = holderSpec.getActionElseFail("action"); // when @Action at type level
assertNotNull(mx_action);
assertEquals("action", mx_action.getId());
assertEquals("foo", mx_action.getName());
assertEquals("bar", mx_action.getDescription());
assertHasPublishedActionFacet(mx_action);
- val mx_action2 = holderSpec.getObjectActionElseFail("action2"); // proper mixed-in action support
+ val mx_action2 = holderSpec.getActionElseFail("action2"); // proper mixed-in action support
assertNotNull(mx_action2);
assertHasPublishedActionFacet(mx_action2);
@@ -183,7 +183,7 @@ class DomainModelTest_usingGoodDomain {
val holderSpec = specificationLoader.loadSpecification(ProperMemberInheritance.class,
IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
- val super_action = holderSpec.getObjectActionElseFail("sampleAction");
+ val super_action = holderSpec.getActionElseFail("sampleAction");
assertNotNull(super_action);
assertEquals("sampleAction", super_action.getId());
assertEquals("foo", super_action.getName());
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java
index f98915c..0dde58f 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelConverter.java
@@ -156,7 +156,7 @@ class ExcelConverter {
final List<ManagedObject> adapters = domainObjects.stream().map(objectManager::adapt).collect(Collectors.toList());
- final List<ObjectAssociation> propertyList = objectSpec.streamAssociations(MixedIn.INCLUDED)
+ final List<ObjectAssociation> propertyList = objectSpec.streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(VISIBLE_PROPERTIES)
.collect(Collectors.toList());
@@ -248,7 +248,7 @@ class ExcelConverter {
final ObjectSpecification objectSpec = specificationLoader.loadSpecification(factory.getCls());
- final List<ObjectAssociation> propertyList = objectSpec.streamAssociations(MixedIn.INCLUDED)
+ final List<ObjectAssociation> propertyList = objectSpec.streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(VISIBLE_PROPERTIES)
.collect(Collectors.toList());
@@ -544,7 +544,7 @@ class ExcelConverter {
}
private static OneToOneAssociation getAssociation(final ObjectSpecification objectSpec, final String propertyNameOrId) {
- final Stream<ObjectAssociation> associations = objectSpec.streamAssociations(MixedIn.INCLUDED);
+ final Stream<ObjectAssociation> associations = objectSpec.streamDeclaredAssociations(MixedIn.INCLUDED);
return associations
.filter(OneToOneAssociation.class::isInstance)
.map(OneToOneAssociation.class::cast)
diff --git a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mementos/ActionMemento.java b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mementos/ActionMemento.java
index 3d72977..4e38799 100644
--- a/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mementos/ActionMemento.java
+++ b/viewers/common/src/main/java/org/apache/isis/viewer/common/model/mementos/ActionMemento.java
@@ -91,7 +91,7 @@ public class ActionMemento implements Serializable {
SpecificationLoader specificationLoader) {
val objectSpec = specificationLoader.lookupBySpecIdElseLoad(owningType);
- return objectSpec.getObjectActionElseFail(nameParmsId, actionType);
+ return objectSpec.getActionElseFail(nameParmsId, actionType);
}
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index 6a55f69..923b09a 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -290,7 +290,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
final JsonRepresentation appendTo =
mode.isUpdatePropertiesLinkArgs() ? representation : JsonRepresentation.newMap();
final List<ObjectAssociation> associations = objectAdapter.getSpecification()
- .streamAssociations(MixedIn.INCLUDED)
+ .streamDeclaredAssociations(MixedIn.INCLUDED)
.collect(Collectors.toList());
addProperties(objectAdapter, appendTo, associations);
@@ -302,7 +302,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
if (mode.isRegular()) {
final Stream<ObjectAction> actions = objectAdapter.getSpecification()
- .streamObjectActions(MixedIn.INCLUDED);
+ .streamDeclaredActions(MixedIn.INCLUDED);
addActions(objectAdapter, actions, appendTo);
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
index 2045de8..f51e6ea 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domaintypes/DomainTypeReprRenderer.java
@@ -97,7 +97,7 @@ public class DomainTypeReprRenderer extends ReprRendererAbstract<DomainTypeReprR
private void addMembers() {
final JsonRepresentation membersList = JsonRepresentation.newArray();
representation.mapPut("members", membersList);
- final Stream<ObjectAssociation> associations = objectSpecification.streamAssociations(MixedIn.EXCLUDED);
+ final Stream<ObjectAssociation> associations = objectSpecification.streamDeclaredAssociations(MixedIn.EXCLUDED);
associations.forEach(association->{
if (association.isOneToOneAssociation()) {
@@ -111,7 +111,7 @@ public class DomainTypeReprRenderer extends ReprRendererAbstract<DomainTypeReprR
}
});
- final Stream<ObjectAction> actions = objectSpecification.streamObjectActions(MixedIn.INCLUDED);
+ final Stream<ObjectAction> actions = objectSpecification.streamDeclaredActions(MixedIn.INCLUDED);
actions.forEach(action->{
final LinkBuilder linkBuilder = ActionDescriptionReprRenderer
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index 353daef..d354f7b 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -171,9 +171,9 @@ class Generation {
@SuppressWarnings("unused")
private void debugTraverseAllSpecs(final Collection<ObjectSpecification> allSpecs) {
for (final ObjectSpecification objectSpec : allSpecs) {
- objectSpec.streamAssociations(MixedIn.INCLUDED)
+ objectSpec.streamDeclaredAssociations(MixedIn.INCLUDED)
.collect(Collectors.toList());
- objectSpec.streamObjectActions(MixedIn.INCLUDED)
+ objectSpec.streamDeclaredActions(MixedIn.INCLUDED)
.collect(Collectors.toList());
}
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
index 84d328d..86ea312 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
@@ -131,7 +131,7 @@ public final class Util {
final Predicate<ObjectAssociation> associationPredicate, final SwaggerService.Visibility visibility) {
final List<ObjectAssociation> list =
- objectSpecification.streamAssociations(MixedIn.INCLUDED)
+ objectSpecification.streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(associationPredicate.and(associationsWith(visibility)))
.collect(Collectors.toList());
@@ -144,7 +144,7 @@ public final class Util {
final ClassExcluder classExcluder) {
val actionTypes = actionTypesFor(visibility);
- return objectSpec.streamObjectActions(actionTypes, MixedIn.INCLUDED)
+ return objectSpec.streamDeclaredActions(actionTypes, MixedIn.INCLUDED)
.filter(objectAction->
!classExcluder.exclude(objectAction) &&
!visibility.isPublic() || isVisibleForPublic(objectAction)
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
index c7560af..52832a7 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ObjectAdapterUpdateHelper.java
@@ -63,7 +63,7 @@ public class ObjectAdapterUpdateHelper {
final Intent intent) {
final ObjectSpecification objectSpec = objectAdapter.getSpecification();
- final Stream<ObjectAssociation> properties = objectSpec.streamAssociations(MixedIn.EXCLUDED)
+ final Stream<ObjectAssociation> properties = objectSpec.streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.PROPERTIES);
final boolean[] allOk = {true}; // simply a non-thread-safe value reference
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 8acd45f..3d1236e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -198,7 +198,7 @@ public class BookmarkTreeNode implements Serializable {
val entityModel = (EntityModel) candidateBookmarkableModel;
val candidateAdapter = entityModel.getObject();
final Stream<ObjectAssociation> properties = candidateAdapter.getSpecification()
- .streamAssociations(MixedIn.EXCLUDED)
+ .streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(ObjectAssociation.Predicates.REFERENCE_PROPERTIES);
properties
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index eaa77c4..bd048c1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -59,7 +59,7 @@ public class AssociatedWithActionsHelper implements Serializable {
final ObjectSpecification objectSpec = getObjectSpecification();
val actionTypes = inferActionTypes(collectionModel.getCommonContext());
- final Stream<ObjectAction> objectActions = objectSpec.streamObjectActions(actionTypes, MixedIn.INCLUDED);
+ final Stream<ObjectAction> objectActions = objectSpec.streamDeclaredActions(actionTypes, MixedIn.INCLUDED);
return objectActions
.filter(ObjectAction.Predicates.associatedWithAndWithCollectionParameterFor(collection))
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 78e4d8e..5efc760 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -204,7 +204,7 @@ implements CollectionCountProvider {
.and(associationDoesNotReferenceParent(parentSpecIfAny));
final Stream<? extends ObjectAssociation> propertyList =
- typeOfSpec.streamAssociations(MixedIn.INCLUDED)
+ typeOfSpec.streamDeclaredAssociations(MixedIn.INCLUDED)
.filter(predicate);
final Map<String, ObjectAssociation> propertyById = _Maps.newLinkedHashMap();
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
index 1174470..f9843c1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummary.java
@@ -86,7 +86,7 @@ public class CollectionContentsAsSummary extends PanelAbstract<EntityCollectionM
addOrReplace(feedback);
final Stream<ObjectAssociation> numberAssociations = elementSpec
- .streamAssociations(MixedIn.EXCLUDED)
+ .streamDeclaredAssociations(MixedIn.EXCLUDED)
.filter(CollectionContentsAsSummaryFactory.OF_TYPE_BIGDECIMAL);
final RepeatingView repeating = new RepeatingView(ID_REPEATING_SUMMARY);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
index ed85583..4f8e569 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/summary/CollectionContentsAsSummaryFactory.java
@@ -65,7 +65,7 @@ public class CollectionContentsAsSummaryFactory extends ComponentFactoryAbstract
}
final EntityCollectionModel entityCollectionModel = (EntityCollectionModel) model;
final ObjectSpecification elementSpec = entityCollectionModel.getTypeOfSpecification();
- final Stream<ObjectAssociation> associations = elementSpec.streamAssociations(MixedIn.EXCLUDED);
+ final Stream<ObjectAssociation> associations = elementSpec.streamDeclaredAssociations(MixedIn.EXCLUDED);
return appliesIf(associations.anyMatch(OF_TYPE_BIGDECIMAL));
}