(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 c5ff35c885 Marshall module improvements
c5ff35c885 is described below

commit c5ff35c88566dd40c2922bec037a7e3b3fac116c
Author: James Bognar <james.bog...@salesforce.com>
AuthorDate: Fri Dec 12 12:13:41 2025 -0500

    Marshall module improvements
---
 .../src/main/java/org/apache/juneau/BeanPropertyMeta.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 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 8610b11984..adf73a0401 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
@@ -303,7 +303,7 @@ public class BeanPropertyMeta implements 
Comparable<BeanPropertyMeta> {
                                if (nn(field) || isNotEmpty(lp)) {
                                        // Only use field type if it's a bean 
property or has @Beanp annotation.
                                        // Otherwise, we want to infer the type 
from the getter or setter.
-                                       rawTypeMeta = 
bc.resolveClassMeta(isNotEmpty(lp) ? last(lp).inner() : null, 
innerField.inner().getGenericType(), typeVarImpls);
+                                       rawTypeMeta = 
bc.resolveClassMeta(opt(last(lp)).map(AnnotationInfo::inner).orElse(null), 
innerField.inner().getGenericType(), typeVarImpls);
                                        isUri |= (rawTypeMeta.isUri());
                                }
                                lp.forEach(x -> {
@@ -325,7 +325,7 @@ public class BeanPropertyMeta implements 
Comparable<BeanPropertyMeta> {
                        if (nn(getter)) {
                                var lp = ap.find(Beanp.class, gi);
                                if (rawTypeMeta == null)
-                                       rawTypeMeta = 
bc.resolveClassMeta(isNotEmpty(lp) ? last(lp).inner() : null, 
getter.inner().getGenericReturnType(), typeVarImpls);
+                                       rawTypeMeta = 
bc.resolveClassMeta(opt(last(lp)).map(AnnotationInfo::inner).orElse(null), 
getter.inner().getGenericReturnType(), typeVarImpls);
                                isUri |= (rawTypeMeta.isUri() || 
ap.has(Uri.class, gi));
                                lp.forEach(x -> {
                                        var beanp = x.inner();
@@ -345,7 +345,7 @@ public class BeanPropertyMeta implements 
Comparable<BeanPropertyMeta> {
                        if (nn(setter)) {
                                var lp = ap.find(Beanp.class, si);
                                if (rawTypeMeta == null)
-                                       rawTypeMeta = 
bc.resolveClassMeta(isNotEmpty(lp) ? last(lp).inner() : null, 
setter.inner().getGenericParameterTypes()[0], typeVarImpls);
+                                       rawTypeMeta = 
bc.resolveClassMeta(opt(last(lp)).map(AnnotationInfo::inner).orElse(null), 
setter.inner().getGenericParameterTypes()[0], typeVarImpls);
                                isUri |= (rawTypeMeta.isUri() || 
ap.has(Uri.class, si));
                                lp.forEach(x -> {
                                        var beanp = x.inner();