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 bc1323f0c7 Marshall module improvements
bc1323f0c7 is described below
commit bc1323f0c767360a62802b32c0be0d9b9eb9b9ca
Author: James Bognar <[email protected]>
AuthorDate: Sun Dec 7 15:27:48 2025 -0500
Marshall module improvements
---
.../juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 0cfa3ead6c..19be317d13 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -179,7 +179,7 @@ public class ClassMeta<T> extends ClassInfoTyped<T> {
private Tuple2<BeanMeta<T>,String> findBeanMeta() {
if (! cat.isUnknown())
return Tuple2.of(null, "Known non-bean type");
- return BeanMeta.create(this, beanFilter.get(), null,
implClass.isPresent() ? noArgConstructor.get() : null);
+ return BeanMeta.create(this, beanFilter.get(), null,
implClass.map(x -> x.getPublicConstructor(x2 ->
x2.hasNumParameters(0)).orElse(null)).orElse(null));
}
/**
@@ -314,8 +314,6 @@ public class ClassMeta<T> extends ClassInfoTyped<T> {
this.beanMeta = notABeanReason == null ? _beanMeta :
null;
this.beanMeta2 = memoize(()->findBeanMeta());
-// if (nn(this.beanMeta))
-// cat.set(BEAN);
this.keyType = _keyType;
this.valueType = _valueType;
this.elementType = _elementType;
@@ -343,7 +341,7 @@ public class ClassMeta<T> extends ClassInfoTyped<T> {
this.swaps = _swaps.isEmpty() ? null :
_swaps.toArray(new ObjectSwap[_swaps.size()]);
- this.proxyInvocationHandler = ()->(nn(beanMeta) &&
beanContext.isUseInterfaceProxies() && isInterface()) ? new
BeanProxyInvocationHandler<>(beanMeta) : null;
+ this.proxyInvocationHandler =
()->(nn(beanMeta2.get().getA()) && beanContext.isUseInterfaceProxies() &&
isInterface()) ? new BeanProxyInvocationHandler<>(beanMeta2.get().getA()) :
null;
this.childSwaps = childSwaps;
this.childUnswapMap = childSwaps == null ? null : new
ConcurrentHashMap<>();