(causeway) branch v3 updated: CAUSEWAY-2297: work on simplified tree model (part 13)

[ahuber]

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

ahuber pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/v3 by this push:
     new abba3951ebf CAUSEWAY-2297: work on simplified tree model (part 13)
abba3951ebf is described below

commit abba3951ebf7b8e993d0b6f7be884b65057f8997
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Sat Dec 14 09:39:49 2024 +0100

    CAUSEWAY-2297: work on simplified tree model (part 13)
    
    - remarks: not seeing the expected facets yet
---
 .../core/metamodel/facets/AccessorFacetFactoryAbstract.java       | 1 -
 .../properties/accessor/PropertyAccessorFacetViaAccessor.java     | 8 ++------
 .../core/metamodel/facets/object/navchild/TreeTraversalTest.java  | 5 ++++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/AccessorFacetFactoryAbstract.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/AccessorFacetFactoryAbstract.java
index 5d8183eac95..8ccc5988f5b 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/AccessorFacetFactoryAbstract.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/AccessorFacetFactoryAbstract.java
@@ -57,7 +57,6 @@ implements AccessorFacetFactory {
         var typeSpec = getSpecificationLoader().loadSpecification(cls);
         var facetHolder = processMethodContext.getFacetHolder();
 
-
         addFacet(createFacet(typeSpec, accessorMethod, facetHolder));
     }
 
diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
index d9e57515c87..4bd89f7c0bd 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/properties/accessor/PropertyAccessorFacetViaAccessor.java
@@ -62,18 +62,14 @@ implements ImperativeFacet {
         var method = methods.getFirstElseFail().asMethodElseFail(); // 
expected regular
         final Object referencedObject = 
MmInvokeUtils.invokeNoArg(method.method(), owningAdapter);
 
-        if(referencedObject == null) {
-            return null;
-        }
+        if(referencedObject == null) return null;
 
         boolean filterForVisibility = 
getConfiguration().getCore().getMetaModel().isFilterVisibility();
         if(filterForVisibility) {
             final ManagedObject referencedAdapter = 
getObjectManager().adapt(referencedObject);
             final boolean visible = MmVisibilityUtils
                     .isVisible(referencedAdapter, interactionInitiatedBy);
-            if (!visible) {
-                return null;
-            }
+            if (!visible) return null;
         }
         return referencedObject;
     }
diff --git 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navchild/TreeTraversalTest.java
 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navchild/TreeTraversalTest.java
index 38bbc3110f8..f4a7b1ac092 100644
--- 
a/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navchild/TreeTraversalTest.java
+++ 
b/core/metamodel/src/test/java/org/apache/causeway/core/metamodel/facets/object/navchild/TreeTraversalTest.java
@@ -47,7 +47,10 @@ extends FacetFactoryTestAbstract {
         var specLoader = mmc.getSpecificationLoader();
         var specA = specLoader.loadSpecification(_TreeSample.A.class);
         var assocAB = specA.getAssociationElseFail("childrenB");
-
+        //TODO[causeway-core-metamodel-CAUSEWAY-2297] we are seeing a 
PropertyAccessorFacetViaAccessor here,
+        // while it should be CollectionAccessorFacetViaAccessor
+        //TODO[causeway-core-metamodel-CAUSEWAY-2297] we are expecting to see 
a NavigableSubtreeFacet here,
+        // but we don't
         System.err.printf("assocA %s%n", 
assocAB.streamFacets().collect(Can.toCan()).join("\n"));
     }