[causeway] branch master updated: CAUSEWAY-3423: fix 'typeOf' facet precedence

[ahuber]

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/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new 27424c2ca7 CAUSEWAY-3423: fix 'typeOf' facet precedence
27424c2ca7 is described below

commit 27424c2ca70438784287cd95a4b21c407bd30c33
Author: andi-huber <ahu...@apache.org>
AuthorDate: Wed Apr 12 09:14:51 2023 +0200

    CAUSEWAY-3423: fix 'typeOf' facet precedence
    
    - let typeOf annotation attribute overrule any typeOf discovered via
    reflection
---
 .../core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java      | 3 ++-
 .../facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java   | 3 ++-
 .../collection/typeof/TypeOfFacetForCollectionAnnotation.java          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java
index dfa0285471..4c03d6b5ff 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actcoll/typeof/TypeOfFacetFromType.java
@@ -25,7 +25,8 @@ public class TypeOfFacetFromType
 extends TypeOfFacetAbstract {
 
     TypeOfFacetFromType(final TypeOfAnyCardinality type, final FacetHolder 
holder) {
-        super(type, holder, Precedence.LOW); // generic type argument 
resolution on plain type are low priority
+        // generic type argument resolution on plain type are low priority
+        super(type, holder, Precedence.LOW);
     }
 
 }
diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
index 83ee7c9475..6b13f76fff 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/actions/action/typeof/TypeOfFacetForActionAnnotation.java
@@ -49,7 +49,8 @@ extends TypeOfFacetAbstract {
     private TypeOfFacetForActionAnnotation(
             final TypeOfAnyCardinality type,
             final FacetHolder holder) {
-        super(type, holder);
+        // overrules any generic type argument resolution that is based on 
reflection
+        super(type, holder, Precedence.HIGH);
     }
 
 }
diff --git 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
index 7c2c38b02f..4b00e02fb3 100644
--- 
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
+++ 
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/collections/collection/typeof/TypeOfFacetForCollectionAnnotation.java
@@ -49,7 +49,8 @@ extends TypeOfFacetAbstract {
 
     private TypeOfFacetForCollectionAnnotation(
             final TypeOfAnyCardinality type, final FacetHolder holder) {
-        super(type, holder);
+        // overrules any generic type argument resolution that is based on 
reflection
+        super(type, holder, Precedence.HIGH);
     }
 
 }