You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2026/08/22 11:43:28 UTC

(causeway) branch main updated: CAUSEWAY-4044: fixes hierarchy walking regression

This is an automated email from the ASF dual-hosted git repository.

andi-huber pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/main by this push:
     new b881c8fc3a7 CAUSEWAY-4044: fixes hierarchy walking regression
b881c8fc3a7 is described below

commit b881c8fc3a7f7042caf1709777414455fe6bade1
Author: andi-huber <ah...@apache.org>
AuthorDate: Sat Aug 22 13:42:21 2026 +0200

    CAUSEWAY-4044: fixes hierarchy walking regression
---
 .../org/apache/causeway/core/metamodel/spec/Hierarchical.java     | 8 --------
 .../apache/causeway/core/metamodel/spec/ObjectSpecification.java  | 2 +-
 .../causeway/core/metamodel/spec/impl/MixinSpecStreamerEager.java | 7 +++++--
 .../causeway/core/metamodel/spec/impl/ObjectMetaDataFactory.java  | 5 ++++-
 .../core/metamodel/spec/impl/ObjectSpecificationDefault.java      | 2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/Hierarchical.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/Hierarchical.java
index 7465973fed7..17b768aac1b 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/Hierarchical.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/Hierarchical.java
@@ -73,14 +73,6 @@ default Stream<ObjectSpecification> streamSuperTypeHierarchy() {
         		.orElseGet(Stream::empty);
     }
 
-    /**
-     * Returns {@link Stream} of the class hierarchy upwards starting with superSpec,
-     * then includes all (collected) interfaces at the end.
-     */
-    default Stream<ObjectSpecification> streamSuperTypeHierarchyAndInterfaces() {
-        return Stream.concat(streamSuperTypeHierarchy(), interfaceSpecs().stream());
-    }
-
 	static <T extends Facet> Optional<T> lookupFacet(final Class<T> facetType,
 			final FacetHolder facetHolder,
 			final Hierarchical hierarchical) {
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
index 5bf83d20396..834b4e1e9dc 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/ObjectSpecification.java
@@ -647,7 +647,7 @@ default Stream<ObjectSpecification> streamTypeHierarchy() {
      * @since 4.0
      */
     default Stream<ObjectSpecification> streamTypeHierarchyAndInterfaces() {
-    	return Stream.concat(Stream.of(this), Hierarchical.super.streamSuperTypeHierarchyAndInterfaces());
+    	return Stream.concat(streamTypeHierarchy(), interfaceSpecs().stream());
     }
 
     /**
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/MixinSpecStreamerEager.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/MixinSpecStreamerEager.java
index 670379fb68a..ec8c4f7cde6 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/MixinSpecStreamerEager.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/MixinSpecStreamerEager.java
@@ -22,6 +22,8 @@
 
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.collections._Multimaps;
+import org.apache.causeway.commons.internal.reflection._Reflect;
+import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
 import org.apache.causeway.core.config.beans.CausewayBeanTypeRegistry;
 import org.apache.causeway.core.metamodel.spec.ObjectSpecification;
 import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
@@ -50,8 +52,9 @@ public Stream<ObjectSpecification> streamMixinSpecs() {
 
 	@Override
 	public Stream<ObjectSpecification> streamMixinSpecsFor(final ObjectSpecification mixeeSpec) {
-		return mixeeSpec.streamTypeHierarchyAndInterfaces()
-			.map(ObjectSpecification::correspondingClass)
+		// not using spec.streamTypeHierarchy.. here,
+		// because we want all interfaces not only those that have Domain.Inlcude semantics
+		return _Reflect.streamTypeHierarchy(mixeeSpec.correspondingClass(), InterfacePolicy.INCLUDE)
 			.flatMap(mixinsByMixeeClass::streamElements);
 	}
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectMetaDataFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectMetaDataFactory.java
index 2af6c8354a4..5b7deae53ff 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectMetaDataFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectMetaDataFactory.java
@@ -19,6 +19,7 @@
 package org.apache.causeway.core.metamodel.spec.impl;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import org.apache.causeway.applib.Identifier;
 import org.apache.causeway.commons.collections.Can;
@@ -131,7 +132,9 @@ ObjectMetaDataFull full(final ObjectMetaDataTypeOnly typeOnly,
 
         // fully introspect up the type hierarchy including interfaces
         // because members creation depends on presence of inherited members
-        typeOnly.hierarchical().streamSuperTypeHierarchyAndInterfaces()
+        Stream.concat(
+        		typeOnly.hierarchical().streamSuperTypeHierarchy(),
+        		typeOnly.hierarchical().interfaceSpecs().stream())
     		.map(ObjectSpecification::correspondingClass)
     		.forEach(cls->specLoaderInternal.loadSpecification(cls, IntrospectionRequest.FULL)); //TODO not a perfect match with LEGACY
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
index b72190aa817..23f28d71aa0 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/ObjectSpecificationDefault.java
@@ -254,7 +254,7 @@ private void introspectMembers(final MixinSpecStreamer mixinSpecStreamer) {
 
         // fully introspect up the type hierarchy including interfaces
         // because members creation depends on presence of inherited members
-    	streamSuperTypeHierarchyAndInterfaces()
+        streamTypeHierarchyAndInterfaces()
     		.map(ObjectSpecificationDefault.class::cast)
     		.forEach(spec->spec.introspectionStateHandler.introspectFully());