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 cbc1ea4075 Marshall module improvements
cbc1ea4075 is described below
commit cbc1ea4075d54ffb4a7f726ba0c742b1477d2c1b
Author: James Bognar <[email protected]>
AuthorDate: Sun Dec 7 09:54:10 2025 -0500
Marshall module improvements
---
.../src/main/java/org/apache/juneau/BeanMeta.java | 4 ++--
.../src/main/java/org/apache/juneau/ClassMeta.java | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index d492c0ecc4..0cb1f5180c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -68,9 +68,9 @@ import org.apache.juneau.commons.utils.*;
*/
public class BeanMeta<T> {
- public static <T> Tuple2<BeanMeta<T>,String> create(ClassMeta<T> cm,
BeanFilter bf, String[] pNames, ConstructorInfo noArgConstructor) {
+ public static <T> Tuple2<BeanMeta<T>,String> create(ClassMeta<T> cm,
BeanFilter bf, String[] pNames, ConstructorInfo implClassConstructor) {
try {
- var bm = new BeanMeta<>(cm, bf, pNames,
noArgConstructor);
+ var bm = new BeanMeta<>(cm, bf, pNames,
implClassConstructor);
var nabr = bm.notABeanReason;
return Tuple2.of(nabr == null ? bm : null, nabr);
} catch (RuntimeException e) {
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 14e4a992be..0cfa3ead6c 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
@@ -177,9 +177,9 @@ public class ClassMeta<T> extends ClassInfoTyped<T> {
private final Supplier<Tuple2<BeanMeta<T>,String>> beanMeta2;
private Tuple2<BeanMeta<T>,String> findBeanMeta() {
- if (cat.isUnknown())
+ if (! cat.isUnknown())
return Tuple2.of(null, "Known non-bean type");
- return BeanMeta.create(this, beanFilter.get(), null,
implClass.isPresent() ? null : noArgConstructor.get());
+ return BeanMeta.create(this, beanFilter.get(), null,
implClass.isPresent() ? noArgConstructor.get() : null);
}
/**
@@ -305,7 +305,7 @@ public class ClassMeta<T> extends ClassInfoTyped<T> {
notABeanReason = "Known non-bean type";
} else {
try {
- _beanMeta = new
BeanMeta<>(ClassMeta.this, beanFilter.get(), null, implClass.get() == null ?
null : noArgConstructor.get());
+ _beanMeta = new BeanMeta<>(this,
beanFilter.get(), null, implClass.get() == null ? null :
noArgConstructor.get());
notABeanReason =
_beanMeta.notABeanReason;
} catch (RuntimeException e) {
notABeanReason = e.getMessage();
@@ -552,8 +552,7 @@ public class ClassMeta<T> extends ClassInfoTyped<T> {
* this class.
*/
public BeanMeta<T> getBeanMeta() {
- return beanMeta;
- //return beanMeta2.get().getA();
+ return beanMeta2.get().getA();
}
/**
