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/09 09:06:15 UTC

(causeway) branch main updated: CAUSEWAY-4044: fixes NavigableParentFacet to not trigger full introspection of members

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 f4ef5b67861 CAUSEWAY-4044: fixes NavigableParentFacet to not trigger full introspection of members
f4ef5b67861 is described below

commit f4ef5b6786197b664ecd207fc367f74adffecfe0
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Aug 9 11:05:59 2026 +0200

    CAUSEWAY-4044: fixes NavigableParentFacet to not trigger full
    introspection of members
    
    also fail hard if we detect fully introspected domain types after the
    mixins were introspected, because thats too early
---
 .../core/metamodel/facets/FacetFactory.java        | 14 ++++++++--
 .../NavigableParentAnnotationFacetFactory.java     |  4 +--
 .../method/NavigableParentFacetViaMethod.java      | 18 ++++++------
 .../core/metamodel/spec/impl/FacetProcessor.java   |  6 ++--
 .../metamodel/spec/impl/FacetedMethodsFactory.java |  3 +-
 .../spec/impl/ObjectSpecificationDefault.java      |  1 -
 .../spec/impl/SpecificationLoaderDefault.java      | 32 ++++++++++++++++------
 .../navparent/NavigableParentFacetMethodTest.java  | 13 +++++----
 8 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java
index c2072086f59..7d79428d4f8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/FacetFactory.java
@@ -148,7 +148,8 @@ public record ProcessClassContext(
     		Class<?> cls,
             IntrospectionPolicy introspectionPolicy,
             MethodRemover methodRemover,
-            FacetHolder facetHolder)
+            FacetHolder facetHolder,
+            Function<Class<?>, ObjectSpecification> loadSpecificationTypeOnlyFunction)
     implements
     	ProcessWithClsContext<FacetHolder>, HasMethodRemover {
 
@@ -160,7 +161,14 @@ public static ProcessClassContext forTesting(
                 final MethodRemover methodRemover,
                 final FacetHolder facetHolder) {
             return new ProcessClassContext(
-                    cls, IntrospectionPolicy.ANNOTATION_OPTIONAL, methodRemover, facetHolder);
+                    cls, IntrospectionPolicy.ANNOTATION_OPTIONAL, methodRemover, facetHolder,
+                    _JUnitSupport.loadSpecificationTypeOnlyFunction(facetHolder.getSpecificationLoader()));
+        }
+
+        // -- SPEC
+
+        public @Nullable ObjectSpecification loadSpecificationTypeOnly(@Nullable final Class<?> domainType) {
+        	return loadSpecificationTypeOnlyFunction.apply(domainType);
         }
     }
 
@@ -264,7 +272,7 @@ private Can<String> namingConventionForPropertyAndCollectionSupport(
 
         // -- SPEC
 
-        public @Nullable ObjectSpecification loadSpecificationTypeOnly(@Nullable final Class<?> domainType) {
+		public @Nullable ObjectSpecification loadSpecificationTypeOnly(@Nullable final Class<?> domainType) {
         	return loadSpecificationTypeOnlyFunction.apply(domainType);
         }
 
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
index c93109a7071..f397b174be8 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactory.java
@@ -30,7 +30,6 @@
 import org.apache.causeway.commons.internal.reflection._Reflect.InterfacePolicy;
 import org.apache.causeway.commons.internal.reflection._Reflect.TypeHierarchyPolicy;
 import org.apache.causeway.core.metamodel.context.MetaModelContext;
-import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
 import org.apache.causeway.core.metamodel.facetapi.FeatureType;
 import org.apache.causeway.core.metamodel.facetapi.MetaModelRefiner;
 import org.apache.causeway.core.metamodel.facets.Evaluators;
@@ -63,7 +62,6 @@ public NavigableParentAnnotationFacetFactory(final MetaModelContext mmc) {
     @Override
     public void process(final ProcessClassContext processClassContext) {
         final Class<?> cls = processClassContext.cls();
-        final FacetHolder facetHolder = processClassContext.facetHolder();
 
         // Starting from the current domain-object class, we search down the object
         // inheritance hierarchy (super class, super super class, ...), until we find
@@ -99,7 +97,7 @@ public void process(final ProcessClassContext processClassContext) {
 			return; // no parent resolvable
 
         addFacetIfPresent(
-                NavigableParentFacetViaMethod.create(cls, method, facetHolder));
+                NavigableParentFacetViaMethod.create(processClassContext, method));
     }
 
     private static boolean isNavigableParentFlagSet(final AnnotatedElement annotatedElement){
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java
index 7e33552873b..48380f7139c 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/object/navparent/method/NavigableParentFacetViaMethod.java
@@ -28,6 +28,7 @@
 import org.apache.causeway.commons.internal.reflection._GenericResolver.ResolvedMethod;
 import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
 import org.apache.causeway.core.metamodel.facets.object.navparent.NavigableParentFacet;
 import org.apache.causeway.core.metamodel.facets.object.navparent.NavigableParentFacetAbstract;
 import org.apache.causeway.core.metamodel.specloader.validator.ValidationFailure;
@@ -42,11 +43,13 @@ public class NavigableParentFacetViaMethod
     private final MethodHandle methodHandle;
 
     public static Optional<NavigableParentFacet> create(
-            final @NonNull Class<?> processedClass,
-            final @NonNull ResolvedMethod method,
-            final @NonNull FacetHolder facetHolder) {
+            final @NonNull ProcessClassContext processClassContext,
+            final @NonNull ResolvedMethod method) {
 
-        return validateNavigableParentType(processedClass, method, facetHolder)
+    	final Class<?> processedClass = processClassContext.cls();
+        final FacetHolder facetHolder = processClassContext.facetHolder();
+
+        return validateNavigableParentType(processClassContext, method)
         .fold(
             // failure
             deficiency->{
@@ -89,11 +92,10 @@ public void visitAttributes(final BiConsumer<String, Object> visitor) {
 
     /** Returns either the MethodHandle to use or a deficiency message. */
     private static Either<String, MethodHandle> validateNavigableParentType(
-            final @NonNull Class<?> processedClass,
-            final @NonNull ResolvedMethod method,
-            final @NonNull FacetHolder holder) {
+            final @NonNull ProcessClassContext processClassContext,
+            final @NonNull ResolvedMethod method) {
 
-        var navigableParentSpec = holder.getSpecificationLoader().loadSpecification(method.returnType());
+        var navigableParentSpec = processClassContext.loadSpecificationTypeOnly(method.returnType());
         if(navigableParentSpec==null)
 			return Either.left("vetoed");
         if(navigableParentSpec.isPlural())
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetProcessor.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetProcessor.java
index 3b517d69bee..355d4e7e0ca 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetProcessor.java
@@ -242,12 +242,14 @@ public void process(
             final Class<?> cls,
             final IntrospectionPolicy introspectionPolicy,
             final MethodRemover methodRemover,
-            final FacetHolder facetHolder) {
+            final FacetHolder facetHolder,
+            final Function<Class<?>, ObjectSpecification> loadSpecificationTypeOnlyFunction) {
         var ctx = new ProcessClassContext(
                 cls,
                 introspectionPolicy,
                 removerElseNoopRemover(methodRemover),
-                facetHolder);
+                facetHolder,
+                loadSpecificationTypeOnlyFunction);
 
         factoriesByFeatureType.getOrElseEmpty(FeatureType.OBJECT)
             .forEach(facetFactory->facetFactory.process(ctx));
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetedMethodsFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetedMethodsFactory.java
index 6132f2ab0c5..0d9dfbd9ac3 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetedMethodsFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/FacetedMethodsFactory.java
@@ -124,7 +124,8 @@ public void introspectClass() {
         // process facets at object level
         // this will also remove some methods, such as the superclass methods.
         facetProcessor
-        	.process(introspectedClass(), introspectionPolicy(), methodRemover, internalSpec);
+        	.process(introspectedClass(), introspectionPolicy(), methodRemover, internalSpec,
+        			internalSpec.specLoaderInternal()::loadSpecificationTypeOnly);
     }
 
     /**
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 95f7b0a4b97..420793fc7aa 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
@@ -272,7 +272,6 @@ private void introspectMembers(final MixinSpecStreamer mixinSpecStreamer) {
     		.forEach(it->((IntrospectionStateHandler)it)
     			.introspectFully());
 
-
         // create associations and actions
 
         var regularMemberFactory = new RegularMemberFactory(this, facetedMethodsFactory);
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderDefault.java
index ac585e050c5..f59252f72c1 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/spec/impl/SpecificationLoaderDefault.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.causeway.applib.Identifier;
@@ -288,19 +289,34 @@ public void createMetaModel() {
         this.mixinSpecStreamer = new MixinSpecStreamerEager(this, causewayBeanTypeRegistry);
         this.phase = Phase.AFTER_MIXINS;
 
-        //TODO  expected no entities fully introspected yet. however, some postprocessors, that
-        // run on mixin-spec have the sideeffect of fully introspecting other types e.g. by asking for the
+        //TODO good for abstract types, but cannot be decided for interfaces,
+        // as those could in theory be shared with mixins and domain-types
+        var mixinTypeHierarchyMembers = specs.mixinSpecs.stream()
+	    	.flatMap(ObjectSpecificationInternal::streamTypeHierarchy)
+	    	.filter(spec->!spec.isMixin())
+	    	.collect(Collectors.toSet());
+
+        //TODO expected no domain objects fully introspected yet. however, some facet/post processors, that
+        // run on mixin-spec have the side effect of fully introspecting other types e.g. by asking for the
         // members's element type
-        cache.values().stream()
+        long brokenSpecCount = cache.values().stream()
+    		.filter(spec->!spec.getCorrespondingClass().getName().startsWith("java."))
         	.filter(spec->!spec.isMixin())
         	.filter(spec->!spec.isValue())
         	.filter(ObjectSpecificationInternal::isFullyIntrospected)
-        	.forEach(spec->{
-    			log.warn("type (non-mixin, non-value) found fully introspected after mixin introspection {}"
-    					+ " - reload triggered", spec.getCorrespondingClass());
-    			//invalidateCache(spec.getCorrespondingClass());
+        	.filter(spec->!mixinTypeHierarchyMembers.contains(spec))
+        	.filter(spec->{
+        		var msg = "type (non-mixin, non-value) found fully introspected after mixin introspection %s - reload triggered"
+        				.formatted(spec.getCorrespondingClass());
+    			log.warn(msg);
+    			return true;
     			//reloadSpecification(spec.getCorrespondingClass());
-        	});
+        	}).count();
+        if(brokenSpecCount>0)
+        	//TODO for now we fail hard, because Spec reloading is not consistently supported yet
+        	// that is currently we evict the spec from the cache but the Spec reference must stay constant
+			throw _Exceptions.illegalState("brokenSpecCount=%d", brokenSpecCount);
+
 
         introspectAndLog("domain services", specs.domainServiceSpecs, IntrospectionRequest.FULL); //TODO no mixins required either
         introspectAndLog("entities (%s)".formatted(causewayBeanTypeRegistry.persistenceStack().name()),
diff --git a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
index 39318379dc6..23337df5ebb 100644
--- a/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
+++ b/core/mmtest/src/test/java/org/apache/causeway/core/metamodel/facets/object/navparent/NavigableParentFacetMethodTest.java
@@ -18,23 +18,24 @@
  */
 package org.apache.causeway.core.metamodel.facets.object.navparent;
 
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.apache.causeway.commons.internal.reflection._GenericResolver;
 import org.apache.causeway.core.metamodel.facetapi.FacetHolder;
+import org.apache.causeway.core.metamodel.facets.FacetFactory.ProcessClassContext;
 import org.apache.causeway.core.metamodel.facets.Mocking;
 import org.apache.causeway.core.metamodel.facets.object.navparent.method.NavigableParentFacetViaMethod;
 import org.apache.causeway.core.metamodel.object.ManagedObject;
 import org.apache.causeway.core.mmtestsupport.MetaModelContext_forTesting;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 class NavigableParentFacetMethodTest {
 
-    private Mocking mocking = new Mocking();
+    private final Mocking mocking = new Mocking();
     private NavigableParentFacet facet;
     private FacetHolder simpleFacetHolder;
     private ManagedObject mockOwningAdapter;
@@ -57,7 +58,9 @@ void setUp() throws Exception {
 
         var navigableParentMethod = _GenericResolver.testing
                 .resolveMethod(DomainObjectWithProblemInNavigableParentMethod.class, "parent");
-        facet = NavigableParentFacetViaMethod.create(pojo.getClass(), navigableParentMethod, simpleFacetHolder)
+
+        var pcc = ProcessClassContext.forTesting(pojo.getClass(), null, simpleFacetHolder);
+        facet = NavigableParentFacetViaMethod.create(pcc, navigableParentMethod)
                 .orElse(null);
 
         mockOwningAdapter = mocking.asViewmodel(pojo);