[isis] branch master updated: ISIS-3072: allow NamedFacets as inferred from annotations to override those inferred via reflection

[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/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 0d5a4f5a31 ISIS-3072: allow NamedFacets as inferred from annotations 
to override those inferred via reflection
0d5a4f5a31 is described below

commit 0d5a4f5a31f103dcacba123be321bbd213326343
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Thu Jun 9 16:36:01 2022 +0200

    ISIS-3072: allow NamedFacets as inferred from annotations to override
    those inferred via reflection
---
 .../metamodel/facets/all/named/ParamNamedFacetAbstract.java   | 11 +++++++++--
 .../param/name/NamedFacetForParameterUsingReflection.java     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ParamNamedFacetAbstract.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ParamNamedFacetAbstract.java
index 1f4dbbba87..05956ede76 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ParamNamedFacetAbstract.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ParamNamedFacetAbstract.java
@@ -38,11 +38,18 @@ implements ParamNamedFacet {
     protected ParamNamedFacetAbstract(
             final String originalText,
             final FacetHolder holder) {
+        this(originalText, holder, Precedence.DEFAULT);
+    }
+
+    protected ParamNamedFacetAbstract(
+            final String originalText,
+            final FacetHolder holder,
+            final Precedence precedence) {
         super(type(),
                 
TranslationContext.forTranslationContextHolder(holder.getFeatureIdentifier()),
                 originalText,
-                holder);
+                holder,
+                precedence);
     }
 
-
 }
diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/name/NamedFacetForParameterUsingReflection.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/name/NamedFacetForParameterUsingReflection.java
index 95c8fdff2a..1bdc33ed59 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/name/NamedFacetForParameterUsingReflection.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/name/NamedFacetForParameterUsingReflection.java
@@ -31,7 +31,7 @@ extends ParamNamedFacetAbstract {
     public NamedFacetForParameterUsingReflection(
             final String named,
             final FacetHolder holder) {
-        super(named, holder);
+        super(named, holder, Precedence.LOW); // allow facets inferred from 
annotations to override
     }
 
 }