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 850369c972 Marshall module improvements
850369c972 is described below
commit 850369c97274f6a7db33924f88c4eb929c2c1c65
Author: James Bognar <[email protected]>
AuthorDate: Fri Dec 12 15:05:15 2025 -0500
Marshall module improvements
---
.../juneau/commons/collections/ListBuilder.java | 4 +--
.../juneau/commons/collections/MapBuilder.java | 6 ++--
.../juneau/commons/collections/SetBuilder.java | 6 ++--
.../juneau/jena/annotation/RdfAnnotation.java | 6 ++--
.../main/java/org/apache/juneau/BeanBuilder.java | 2 +-
.../main/java/org/apache/juneau/BeanFilter.java | 38 +++++++++++-----------
.../src/main/java/org/apache/juneau/Context.java | 14 ++++----
.../apache/juneau/annotation/SwapAnnotation.java | 8 ++---
.../apache/juneau/annotation/UriAnnotation.java | 2 +-
.../juneau/http/annotation/TagAnnotation.java | 6 ++--
.../juneau/uon/annotation/UonAnnotation.java | 2 +-
.../annotation/UrlEncodingAnnotation.java | 4 +--
.../java/org/apache/juneau/utils/BeanDiff.java | 6 ++--
.../juneau/xml/annotation/XmlAnnotation.java | 10 +++---
14 files changed, 57 insertions(+), 57 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
index cebb3ffca7..b1f53f60ae 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/ListBuilder.java
@@ -316,7 +316,7 @@ public class ListBuilder<E> {
* @return This object.
*/
public ListBuilder<E> elementType(Class<E> value) {
- this.elementType = assertArgNotNull("value", value);
+ elementType = assertArgNotNull("value", value);
return this;
}
@@ -350,7 +350,7 @@ public class ListBuilder<E> {
* @return This object.
*/
public ListBuilder<E> sparse() {
- this.sparse = true;
+ sparse = true;
return this;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
index 7ecee0f01b..705b86e046 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/MapBuilder.java
@@ -329,7 +329,7 @@ public class MapBuilder<K,V> {
|| (isArray(x) && Array.getLength(x) == 0)
|| (x instanceof Map x2 && x2.isEmpty())
|| (x instanceof Collection x3 && x3.isEmpty())
- ));
+ ));
// @formatter:on
}
@@ -390,7 +390,7 @@ public class MapBuilder<K,V> {
* @return This object.
*/
public MapBuilder<K,V> sparse() {
- this.sparse = true;
+ sparse = true;
return this;
}
@@ -414,7 +414,7 @@ public class MapBuilder<K,V> {
* @return This object.
*/
public MapBuilder<K,V> unmodifiable() {
- this.unmodifiable = true;
+ unmodifiable = true;
return this;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
index 305523a2b7..8529e509c6 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/SetBuilder.java
@@ -319,7 +319,7 @@ public class SetBuilder<E> {
* @return This object.
*/
public SetBuilder<E> elementType(Class<E> value) {
- this.elementType = assertArgNotNull("value", value);
+ elementType = assertArgNotNull("value", value);
return this;
}
@@ -353,7 +353,7 @@ public class SetBuilder<E> {
* @return This object.
*/
public SetBuilder<E> sparse() {
- this.sparse = true;
+ sparse = true;
return this;
}
@@ -377,7 +377,7 @@ public class SetBuilder<E> {
* @return This object.
*/
public SetBuilder<E> unmodifiable() {
- this.unmodifiable = true;
+ unmodifiable = true;
return this;
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
index 245c03d243..14a612efd8 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/annotation/RdfAnnotation.java
@@ -101,7 +101,7 @@ public class RdfAnnotation {
* @return This object.
*/
public Builder collectionFormat(RdfCollectionFormat value) {
- this.collectionFormat = value;
+ collectionFormat = value;
return this;
}
@@ -141,7 +141,7 @@ public class RdfAnnotation {
* @return This object.
*/
public Builder prefix(String value) {
- this.prefix = value;
+ prefix = value;
return this;
}
@@ -156,7 +156,7 @@ public class RdfAnnotation {
super.onClass(value);
return this;
}
-
+
@Override /* Overridden from AppliedAnnotationObject.BuilderT */
public Builder on(ClassInfo...value) {
super.on(value);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanBuilder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanBuilder.java
index b55467e186..ca03d1ea71 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanBuilder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanBuilder.java
@@ -98,7 +98,7 @@ public class BeanBuilder<T> {
*/
@SuppressWarnings("unchecked")
public BeanBuilder<T> impl(Object value) {
- this.impl = (T)value;
+ impl = (T)value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
index e821e77d9e..1c9ee80e90 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanFilter.java
@@ -222,7 +222,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder example(String value) {
- this.example = value;
+ example = value;
return this;
}
@@ -264,7 +264,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder excludeProperties(String...value) {
- this.excludeProperties = set();
+ excludeProperties = set();
for (var v : value)
split(v, x -> excludeProperties.add(x));
return this;
@@ -303,7 +303,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder findFluentSetters() {
- this.fluentSetters = true;
+ fluentSetters = true;
return this;
}
@@ -314,7 +314,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder implClass(Class<?> value) {
- this.implClass = value == null ? null : info(value);
+ implClass = value == null ? null : info(value);
return this;
}
@@ -328,7 +328,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder implClass(ClassInfo value) {
- this.implClass = value;
+ implClass = value;
return this;
}
@@ -366,7 +366,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder interceptor(Class<?> value) {
- this.interceptor.type(value);
+ interceptor.type(value);
return this;
}
@@ -388,7 +388,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder interceptor(ClassInfo value) {
- this.interceptor.type(value);
+ interceptor.type(value);
return this;
}
@@ -443,7 +443,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder interfaceClass(Class<?> value) {
- this.interfaceClass = value == null ? null :
info(value);
+ interfaceClass = value == null ? null : info(value);
return this;
}
@@ -457,7 +457,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder interfaceClass(ClassInfo value) {
- this.interfaceClass = value;
+ interfaceClass = value;
return this;
}
@@ -499,7 +499,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder properties(String...value) {
- this.properties = set();
+ properties = set();
for (var v : value)
split(v, x -> properties.add(x));
return this;
@@ -544,7 +544,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder propertyNamer(Class<? extends PropertyNamer>
value) {
- this.propertyNamer.type(value);
+ propertyNamer.type(value);
return this;
}
@@ -567,7 +567,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder propertyNamer(ClassInfoTyped<? extends
PropertyNamer> value) {
- this.propertyNamer.type(value);
+ propertyNamer.type(value);
return this;
}
@@ -611,7 +611,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder readOnlyProperties(String...value) {
- this.readOnlyProperties = set();
+ readOnlyProperties = set();
for (var v : value)
split(v, x -> readOnlyProperties.add(x));
return this;
@@ -631,7 +631,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder sortProperties() {
- this.sortProperties = true;
+ sortProperties = true;
return this;
}
@@ -672,7 +672,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder sortProperties(boolean value) {
- this.sortProperties = value;
+ sortProperties = value;
return this;
}
@@ -729,7 +729,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder stopClass(Class<?> value) {
- this.stopClass = value == null ? null : info(value);
+ stopClass = value == null ? null : info(value);
return this;
}
@@ -743,7 +743,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder stopClass(ClassInfo value) {
- this.stopClass = value;
+ stopClass = value;
return this;
}
@@ -780,7 +780,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder typeName(String value) {
- this.typeName = value;
+ typeName = value;
return this;
}
@@ -824,7 +824,7 @@ public class BeanFilter {
* @return This object.
*/
public Builder writeOnlyProperties(String...value) {
- this.writeOnlyProperties = set();
+ writeOnlyProperties = set();
for (var v : value)
split(v, x -> writeOnlyProperties.add(x));
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index 2c0871ebde..a213283717 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -495,7 +495,7 @@ public abstract class Context {
* @return This object.
*/
public Builder cache(Cache<HashKey,? extends Context> value) {
- this.cache = value;
+ cache = value;
return this;
}
@@ -639,18 +639,18 @@ public abstract class Context {
* @return This object.
*/
public Builder type(Class<? extends Context> value) {
- this.type = value;
+ type = value;
return this;
}
private ConstructorInfo getContextConstructor() {
var cci = CONTEXT_CONSTRUCTORS.get(type);
if (cci == null) {
- // @formatter:off
- cci = info(type).getPublicConstructor(
- x -> x.hasNumParameters(1)
+ // @formatter:off
+ cci = info(type).getPublicConstructor(
+ x -> x.hasNumParameters(1)
&& x.getParameter(0).canAccept(this)
- ).orElseThrow(() -> rex("Public constructor not
found: {0}({1})", cn(type), cn(this)));
+ ).orElseThrow(() -> rex("Public
constructor not found: {0}({1})", cn(type), cn(this)));
// @formatter:on
CONTEXT_CONSTRUCTORS.put(type, cci);
}
@@ -734,7 +734,7 @@ public abstract class Context {
&& x.isNotDeprecated()
&& x.hasName("create")
&&
x.hasReturnType(ci.getParameter(0).getParameterType())
- ).orElse(null);
+ ).orElse(null);
// @formatter:on
if (nn(mi))
break;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
index 41ec9a203e..638076cbed 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SwapAnnotation.java
@@ -111,7 +111,7 @@ public class SwapAnnotation {
* @return This object.
*/
public Builder description(String...value) {
- this.description = value;
+ description = value;
return this;
}
@@ -122,7 +122,7 @@ public class SwapAnnotation {
* @return This object.
*/
public Builder impl(Class<?> value) {
- this.impl = value;
+ impl = value;
return this;
}
@@ -133,7 +133,7 @@ public class SwapAnnotation {
* @return This object.
*/
public Builder mediaTypes(String...value) {
- this.mediaTypes = value;
+ mediaTypes = value;
return this;
}
@@ -144,7 +144,7 @@ public class SwapAnnotation {
* @return This object.
*/
public Builder template(String value) {
- this.template = value;
+ template = value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
index ae8faa2eea..84c1674fed 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/UriAnnotation.java
@@ -107,7 +107,7 @@ public class UriAnnotation {
* @return This object.
*/
public Builder description(String...value) {
- this.description = value;
+ description = value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
index b76dbafb79..30b88f3760 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/TagAnnotation.java
@@ -64,7 +64,7 @@ public class TagAnnotation {
* @return This object.
*/
public Builder description(String...value) {
- this.description = value;
+ description = value;
return this;
}
@@ -75,7 +75,7 @@ public class TagAnnotation {
* @return This object.
*/
public Builder externalDocs(ExternalDocs value) {
- this.externalDocs = value;
+ externalDocs = value;
return this;
}
@@ -86,7 +86,7 @@ public class TagAnnotation {
* @return This object.
*/
public Builder name(String value) {
- this.name = value;
+ name = value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
index 40b1e019c3..24438a2bc8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonAnnotation.java
@@ -110,7 +110,7 @@ public class UonAnnotation {
* @return This object.
*/
public Builder description(String...value) {
- this.description = value;
+ description = value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
index 38857448ec..b4a1582e0e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingAnnotation.java
@@ -111,7 +111,7 @@ public class UrlEncodingAnnotation {
* @return This object.
*/
public Builder description(String...value) {
- this.description = value;
+ description = value;
return this;
}
@@ -122,7 +122,7 @@ public class UrlEncodingAnnotation {
* @return This object.
*/
public Builder expandedParams(boolean value) {
- this.expandedParams = value;
+ expandedParams = value;
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
index b4fe00fa9d..0ee6c44225 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
@@ -71,7 +71,7 @@ public class BeanDiff {
* @return This object.
*/
public Builder<T> beanContext(BeanContext value) {
- this.beanContext = value;
+ beanContext = value;
return this;
}
@@ -113,7 +113,7 @@ public class BeanDiff {
* @return This object.
*/
public Builder<T> first(T value) {
- this.first = value;
+ first = value;
return this;
}
@@ -152,7 +152,7 @@ public class BeanDiff {
* @return This object.
*/
public Builder<T> second(T value) {
- this.second = value;
+ second = value;
return this;
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
index 04948acac1..c122d874c7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlAnnotation.java
@@ -112,7 +112,7 @@ public class XmlAnnotation {
* @return This object.
*/
public Builder description(String...value) {
- this.description = value;
+ description = value;
return this;
}
@@ -123,7 +123,7 @@ public class XmlAnnotation {
* @return This object.
*/
public Builder childName(String value) {
- this.childName = value;
+ childName = value;
return this;
}
@@ -134,7 +134,7 @@ public class XmlAnnotation {
* @return This object.
*/
public Builder format(XmlFormat value) {
- this.format = value;
+ format = value;
return this;
}
@@ -145,7 +145,7 @@ public class XmlAnnotation {
* @return This object.
*/
public Builder namespace(String value) {
- this.namespace = value;
+ namespace = value;
return this;
}
@@ -156,7 +156,7 @@ public class XmlAnnotation {
* @return This object.
*/
public Builder prefix(String value) {
- this.prefix = value;
+ prefix = value;
return this;
}
