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 e2ec7a97f7 Marshall module improvements
e2ec7a97f7 is described below
commit e2ec7a97f77eaf8ee7a6bb58ae78356195a28ab2
Author: James Bognar <[email protected]>
AuthorDate: Fri Dec 12 16:44:35 2025 -0500
Marshall module improvements
---
.../java/org/apache/juneau/BeanPropertyMeta.java | 24 ++++++----------------
.../org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 2 +-
.../java/org/apache/juneau/reflect/Mutaters.java | 2 +-
.../org/apache/juneau/uon/UonParserSession.java | 2 +-
.../juneau/http/header/BasicBooleanHeader.java | 2 +-
.../apache/juneau/http/part/BasicBooleanPart.java | 2 +-
.../PrimitiveObjectBeans_RoundTripTest.java | 9 ++++----
.../juneau/assertions/BooleanAssertion_Test.java | 4 ++--
.../commons/reflect/ConstructorInfo_Test.java | 2 +-
.../commons/reflect/ExecutableInfo_Test.java | 2 +-
.../juneau/commons/reflect/FieldInfo_Test.java | 2 +-
.../juneau/commons/reflect/MethodInfo_Test.java | 2 +-
.../juneau/commons/reflect/PackageInfo_Test.java | 8 ++++----
.../juneau/commons/reflect/ParameterInfo_Test.java | 2 +-
.../java/org/apache/juneau/json/Json_Test.java | 2 +-
16 files changed, 29 insertions(+), 40 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 a79b2533bc..e8283d6250 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
@@ -245,18 +245,6 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
return this;
}
- /**
- * Sets the inner field for this bean property.
- *
- * @param value The inner field for this bean property.
- * @return This object.
- */
- public Builder setInnerField(Field value) {
- assertArgNotNull("value", value);
- innerField = FieldInfo.of(value);
- return this;
- }
-
/**
* Sets the setter method for this bean property.
*
@@ -314,9 +302,9 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
properties =
split(beanp.properties());
bdClasses.addAll(l(beanp.dictionary()));
if (isNotEmpty(beanp.ro()))
- readOnly =
Boolean.valueOf(beanp.ro());
+ readOnly = b(beanp.ro());
if (isNotEmpty(beanp.wo()))
- writeOnly =
Boolean.valueOf(beanp.wo());
+ writeOnly = b(beanp.wo());
});
ap.find(Swap.class,
ifi).stream().map(AnnotationInfo::inner).findFirst().ifPresent(x -> swap =
getPropertySwap(x));
isUri |= ap.has(Uri.class, ifi);
@@ -335,9 +323,9 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
properties =
split(beanp.properties());
bdClasses.addAll(l(beanp.dictionary()));
if (isNotEmpty(beanp.ro()))
- readOnly =
Boolean.valueOf(beanp.ro());
+ readOnly = b(beanp.ro());
if (isNotEmpty(beanp.wo()))
- writeOnly =
Boolean.valueOf(beanp.wo());
+ writeOnly = b(beanp.wo());
});
ap.find(Swap.class,
gi).stream().map(AnnotationInfo::inner).forEach(x -> swap = getPropertySwap(x));
}
@@ -355,9 +343,9 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
properties =
split(beanp.properties());
bdClasses.addAll(l(beanp.dictionary()));
if (isNotEmpty(beanp.ro()))
- readOnly =
Boolean.valueOf(beanp.ro());
+ readOnly = b(beanp.ro());
if (isNotEmpty(beanp.wo()))
- writeOnly =
Boolean.valueOf(beanp.wo());
+ writeOnly = b(beanp.wo());
});
ap.find(Swap.class,
si).stream().map(AnnotationInfo::inner).forEach(x -> swap = getPropertySwap(x));
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index b96717854e..9036e3e059 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -2533,7 +2533,7 @@ public class HttpPartSchema {
}
private static Boolean resolve(String newValue, Boolean
oldValue) {
- return isEmpty(newValue) ? oldValue :
Boolean.valueOf(newValue);
+ return isEmpty(newValue) ? oldValue : b(newValue);
}
private static Long resolve(String newValue, Long oldValue) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index f33ab27aed..32a34d57c8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -323,7 +323,7 @@ public class JsonParserSession extends ReaderParserSession {
private Boolean parseBoolean(ParserReader r) throws IOException,
ParseException {
int c = r.peek();
if (c == '\'' || c == '"')
- return Boolean.valueOf(parseString(r));
+ return b(parseString(r));
if (c == 't') {
parseKeyword("true", r);
return Boolean.TRUE;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
index e539df24a7..a719c651f9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/Mutaters.java
@@ -80,7 +80,7 @@ public class Mutaters {
public Boolean mutate(Object outer, String in) {
if (in == null || "null".equals(in) ||
in.isEmpty())
return null;
- return Boolean.valueOf(in);
+ return b(in);
}
}
);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index cf81ca006f..ad219dcb0d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -347,7 +347,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
var s = parseString(r, isUrlParamValue);
if (c != '\'') {
if ("true".equals(s) ||
"false".equals(s))
- o = Boolean.valueOf(s);
+ o = b(s);
else if (! "null".equals(s)) {
if (isNumeric(s))
o =
StringUtils.parseNumber(s, Number.class);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
index 92ec5f315a..36e3db33d3 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
@@ -122,7 +122,7 @@ public class BasicBooleanHeader extends BasicHeader {
*/
public BasicBooleanHeader(String name, String value) {
super(name, value);
- this.value = isEmpty(value) ? null : Boolean.valueOf(value);
+ this.value = isEmpty(value) ? null : b(value);
this.supplier = null;
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
index c6120137b4..eadf1c9599 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
@@ -88,7 +88,7 @@ public class BasicBooleanPart extends BasicPart {
*/
public BasicBooleanPart(String name, String value) {
super(name, value);
- this.value = isEmpty(value) ? null : Boolean.valueOf(value);
+ this.value = isEmpty(value) ? null : b(value);
this.supplier = null;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
index 1e5a4ac086..48dfb04bff 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/a/rttests/PrimitiveObjectBeans_RoundTripTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.juneau.a.rttests;
+import static org.apache.juneau.commons.utils.Utils.*;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.juneau.testutils.pojos.*;
@@ -40,7 +41,7 @@ class PrimitiveObjectBeans_RoundTripTest extends
RoundTripTest_Base {
x = t.roundTrip(x, PrimitiveObjectsBean.class);
// primitives
- assertEquals(Boolean.valueOf(true), x.poBoolean);
+ assertEquals(b(true), x.poBoolean);
assertEquals(Byte.valueOf((byte)1), x.poByte);
assertEquals(Character.valueOf('a'), x.poChar);
assertEquals(Short.valueOf("2"), x.poShort);
@@ -66,7 +67,7 @@ class PrimitiveObjectBeans_RoundTripTest extends
RoundTripTest_Base {
assertNull(x.pouBigDecimal);
// primitive arrays
- assertEquals(Boolean.valueOf(false), x.poaBoolean[1][0]);
+ assertEquals(b(false), x.poaBoolean[1][0]);
assertEquals(Byte.valueOf((byte)2), x.poaByte[1][0]);
assertEquals(Character.valueOf('b'), x.poaChar[1][0]);
assertEquals(Short.valueOf("2"), x.poaShort[1][0]);
@@ -103,7 +104,7 @@ class PrimitiveObjectBeans_RoundTripTest extends
RoundTripTest_Base {
assertNull(x.poauBigDecimal);
// anonymous list of object primitive arrays
- assertEquals(Boolean.valueOf(true), x.poalBoolean.get(0)[0]);
+ assertEquals(b(true), x.poalBoolean.get(0)[0]);
assertEquals(Byte.valueOf((byte)1), x.poalByte.get(0)[0]);
assertEquals(Character.valueOf('a'), x.poalChar.get(0)[0]);
assertEquals(Short.valueOf((short)1), x.poalShort.get(0)[0]);
@@ -126,7 +127,7 @@ class PrimitiveObjectBeans_RoundTripTest extends
RoundTripTest_Base {
assertNull(x.poalBigDecimal.get(1));
// regular list of object primitive arrays
- assertEquals(Boolean.valueOf(true), x.polBoolean.get(0)[0]);
+ assertEquals(b(true), x.polBoolean.get(0)[0]);
assertEquals(Byte.valueOf((byte)1), x.polByte.get(0)[0]);
assertEquals(Character.valueOf('a'), x.polChar.get(0)[0]);
assertEquals(Short.valueOf((short)1), x.polShort.get(0)[0]);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
index 8e33a535f2..58e3dc1a66 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/assertions/BooleanAssertion_Test.java
@@ -174,8 +174,8 @@ class BooleanAssertion_Test extends TestBase {
@Test void ca08_isSame() {
// Note that even the following returns the same object
sometimes.
- var x1 = Boolean.valueOf(new String("true"));
- var x1a = Boolean.valueOf(new String("true"));
+ var x1 = b(new String("true"));
+ var x1a = b(new String("true"));
var nil = n(Boolean.class);
test(x1).isSame(x1);
test(nil).isSame(nil);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
index 358d473e56..69e95fc9a8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ConstructorInfo_Test.java
@@ -520,7 +520,7 @@ class ConstructorInfo_Test extends TestBase {
// Public constructors might already be accessible
var publicAccessible = b_c1.isAccessible();
- assertNotNull(Boolean.valueOf(publicAccessible));
+ assertNotNull(publicAccessible);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
index f0644a01a4..d571a3d1dc 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ExecutableInfo_Test.java
@@ -709,7 +709,7 @@ class ExecutableInfo_Test extends TestBase {
// Public methods might already be accessible
var publicAccessible = f_isPublic.isAccessible();
- assertNotNull(Boolean.valueOf(publicAccessible));
+ assertNotNull(publicAccessible);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
index c1334ee39e..10691491ea 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/FieldInfo_Test.java
@@ -501,7 +501,7 @@ class FieldInfo_Test extends TestBase {
// Public fields might already be accessible
var publicAccessible = d_isPublic.isAccessible();
- assertNotNull(Boolean.valueOf(publicAccessible));
+ assertNotNull(publicAccessible);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
index 07eb0f5588..dab65a7cb2 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/MethodInfo_Test.java
@@ -464,7 +464,7 @@ class MethodInfo_Test extends TestBase {
// This test case demonstrates the limitation mentioned in the
javadoc.
var result = e_a2.hasOnlyParameterTypes(int.class);
// The result depends on the implementation - it may be true
(lenient) or false (strict)
- assertNotNull(Boolean.valueOf(result));
+ assertNotNull(result);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
index 950b62f4ff..c8d1b308ef 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/PackageInfo_Test.java
@@ -235,11 +235,11 @@ class PackageInfo_Test extends TestBase {
if (specVersion != null && !specVersion.isEmpty()) {
// Line 309: normal return path when package has a
version
var compatible = pi.isCompatibleWith("1.0");
- assertNotNull(Boolean.valueOf(compatible));
+ assertNotNull(compatible);
// Test with another version
var compatible2 = pi.isCompatibleWith("2.0");
- assertNotNull(Boolean.valueOf(compatible2));
+ assertNotNull(compatible2);
} else {
// Package doesn't have a version - isCompatibleWith
will throw NumberFormatException
// Line 309 is still executed, exception is thrown from
inner.isCompatibleWith
@@ -263,7 +263,7 @@ class PackageInfo_Test extends TestBase {
var pi = PackageInfo.of(TestClass1.class);
var sealed = pi.isSealed();
// Most packages are not sealed
- assertNotNull(Boolean.valueOf(sealed));
+ assertNotNull(sealed);
}
//====================================================================================================
@@ -275,7 +275,7 @@ class PackageInfo_Test extends TestBase {
var url = new URL("file:///test.jar");
var sealed = pi.isSealed(url);
// Most packages are not sealed with respect to a specific URL
- assertNotNull(Boolean.valueOf(sealed));
+ assertNotNull(sealed);
}
//====================================================================================================
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
index 0093fa6e1d..e386019f21 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/reflect/ParameterInfo_Test.java
@@ -777,7 +777,7 @@ class ParameterInfo_Test extends TestBase {
void a024_isNamePresent() {
// This checks if name is present in bytecode, not if it has a
resolved name
var namePresent = b_a1_a.isNamePresent();
- assertNotNull(Boolean.valueOf(namePresent));
+ assertNotNull(namePresent);
}
//====================================================================================================
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
index 61dff6b044..25bccf3079 100755
--- a/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/Json_Test.java
@@ -91,7 +91,7 @@ class Json_Test extends TestBase{
l.add("2");
l.add("3");
var o = a(m, l);
- var o2 = a(o, "foo", "bar", Integer.valueOf(1),
Boolean.valueOf(false), Float.valueOf(1.2f), null);
+ var o2 = a(o, "foo", "bar", Integer.valueOf(1), b(false),
Float.valueOf(1.2f), null);
assertEquals("[[{J:'f1',B:'b',C:'c'},['1','2','3']],'foo','bar',1,false,1.2,null]",
s1.serialize(o2));
}
