(juneau) branch master updated: Marshall module improvements

[jamesbognar]

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

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new 5a26b2da7b Marshall module improvements
5a26b2da7b is described below

commit 5a26b2da7bed22078cc387ed4a2321a4e50f39ad
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Fri Dec 12 17:42:27 2025 -0500

    Marshall module improvements
---
 .../src/main/java/org/apache/juneau/BeanPropertyMeta.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 742d2617ee..05abc396fc 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -741,6 +741,8 @@ public class BeanPropertyMeta implements 
Comparable<BeanPropertyMeta> {
                        result.addAll(ap.find(getter, SELF, MATCHING_METHODS, 
RETURN_TYPE, PACKAGE));
                if (nn(setter))
                        result.addAll(ap.find(setter, SELF, MATCHING_METHODS, 
RETURN_TYPE, PACKAGE));
+               if (nn(extraKeys))
+                       result.addAll(ap.find(extraKeys, SELF, 
MATCHING_METHODS, RETURN_TYPE, PACKAGE));
                return u(result);
        }
 
@@ -777,22 +779,19 @@ public class BeanPropertyMeta implements 
Comparable<BeanPropertyMeta> {
        public <A extends Annotation> List<A> 
getAllAnnotationsParentFirst(Class<A> a) {
                var l = new LinkedList<A>();
                var ap = bc.getAnnotationProvider();
-               var fi = field;
-               var gi = getter;
-               var si = setter;
                if (a == null)
                        return l;
                rstream(ap.find(a, getBeanMeta().getClassMeta())).forEach(x -> 
l.add(x.inner()));
                if (nn(field)) {
-                       ap.find(a, fi).forEach(x -> l.add(x.inner()));
+                       ap.find(a, field).forEach(x -> l.add(x.inner()));
                        rstream(ap.find(a, field.getFieldType())).forEach(x -> 
l.add(x.inner()));
                }
-               if (nn(gi)) {
-                       ap.find(a, gi, SELF, MATCHING_METHODS, RETURN_TYPE, 
PACKAGE).forEach(x -> l.add(x.inner()));
-                       rstream(ap.find(a, gi.getReturnType())).forEach(x -> 
l.add(x.inner()));
+               if (nn(getter)) {
+                       ap.find(a, getter, SELF, MATCHING_METHODS, RETURN_TYPE, 
PACKAGE).forEach(x -> l.add(x.inner()));
+                       rstream(ap.find(a, getter.getReturnType())).forEach(x 
-> l.add(x.inner()));
                }
                if (nn(setter)) {
-                       ap.find(a, si, SELF, MATCHING_METHODS, RETURN_TYPE, 
PACKAGE).forEach(x -> l.add(x.inner()));
+                       ap.find(a, setter, SELF, MATCHING_METHODS, RETURN_TYPE, 
PACKAGE).forEach(x -> l.add(x.inner()));
                        rstream(ap.find(a, setter.getReturnType())).forEach(x 
-> l.add(x.inner()));
                }
                if (nn(extraKeys)) {