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 333e63d Context API refactoring.
333e63d is described below
commit 333e63d27f3f8e7c66126ec664a5c47065062d09
Author: JamesBognar <[email protected]>
AuthorDate: Tue Oct 12 16:00:17 2021 -0400
Context API refactoring.
---
.../apache/juneau/jena/RdfSerializerSession.java | 4 +-
.../java/org/apache/juneau/AnnotationApplier.java | 40 +++-------
.../main/java/org/apache/juneau/BeanSession.java | 14 +---
.../org/apache/juneau/BeanTraverseSession.java | 4 +-
.../java/org/apache/juneau/ContextSession.java | 85 ++++------------------
.../juneau/annotation/BeanConfigAnnotation.java | 8 +-
.../apache/juneau/csv/CsvSerializerSession.java | 4 +-
.../org/apache/juneau/html/HtmlParserSession.java | 4 +-
.../juneau/html/HtmlSchemaSerializerSession.java | 4 +-
.../apache/juneau/html/HtmlSerializerSession.java | 4 +-
.../html/HtmlStrippedDocSerializerSession.java | 4 +-
.../org/apache/juneau/jso/JsoParserSession.java | 4 +-
.../apache/juneau/jso/JsoSerializerSession.java | 4 +-
.../org/apache/juneau/json/JsonParserSession.java | 4 +-
.../juneau/json/JsonSchemaSerializerSession.java | 4 +-
.../apache/juneau/json/JsonSerializerSession.java | 4 +-
.../jsonschema/JsonSchemaGeneratorSession.java | 4 +-
.../juneau/msgpack/MsgPackParserSession.java | 4 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 4 +-
.../juneau/oapi/OpenApiSerializerSession.java | 4 +-
.../juneau/parser/InputStreamParserSession.java | 4 +-
.../org/apache/juneau/parser/ParserSession.java | 4 +-
.../apache/juneau/parser/ReaderParserSession.java | 4 +-
.../juneau/plaintext/PlainTextParserSession.java | 4 +-
.../plaintext/PlainTextSerializerSession.java | 4 +-
.../serializer/OutputStreamSerializerSession.java | 4 +-
.../juneau/serializer/SerializerSession.java | 4 +-
.../juneau/serializer/WriterSerializerSession.java | 4 +-
.../org/apache/juneau/uon/UonParserSession.java | 4 +-
.../apache/juneau/uon/UonSerializerSession.java | 4 +-
.../urlencoding/UrlEncodingSerializerSession.java | 4 +-
.../apache/juneau/xml/XmlSerializerSession.java | 4 +-
.../juneau/rest/BasicSwaggerProviderSession.java | 2 +-
.../java/org/apache/juneau/rest/RequestBody.java | 2 +-
.../juneau/rest/annotation/RestAnnotation.java | 2 +-
.../rest/annotation/RestDeleteAnnotation.java | 2 +-
.../juneau/rest/annotation/RestGetAnnotation.java | 2 +-
.../juneau/rest/annotation/RestOpAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPostAnnotation.java | 2 +-
.../juneau/rest/annotation/RestPutAnnotation.java | 2 +-
.../rest/processors/SerializedPojoProcessor.java | 2 +-
41 files changed, 95 insertions(+), 182 deletions(-)
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index a593bc3..0988c08 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -94,8 +94,8 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 6959760..afd086d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -12,6 +12,9 @@
//
***************************************************************************************************************************
package org.apache.juneau;
+import static org.apache.juneau.internal.StringUtils.*;
+import static java.util.Optional.*;
+
import java.lang.annotation.*;
import java.nio.charset.*;
import java.util.*;
@@ -23,9 +26,9 @@ import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
/**
- * Class used to add properties to a context builder from an annotation (e.g.
{@link BeanConfig}).
+ * Class used to add properties to a context builder (e.g. {@link
BeanContext.Builder}) from an annotation (e.g. {@link BeanConfig}).
*
- * @param <A> The annotation that this <c>ConfigApply</c> reads from.
+ * @param <A> The annotation that this applier reads from.
* @param <B> The builder class to apply the annotation to.
*/
public abstract class AnnotationApplier<A extends Annotation, B> {
@@ -114,17 +117,7 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
* @return The array wrapped in an {@link Optional}.
*/
protected Optional<String[]> strings(String[] in) {
- return Optional.ofNullable(in.length == 0 ? null :
Arrays.asList(in).stream().map(x -> vr.resolve(x)).filter(x ->
!StringUtils.isEmpty(x)).toArray(String[]::new));
- }
-
- /**
- * Resolves the specified strings in the string array.
- *
- * @param in The string array containing variables to resolve.
- * @return An array with resolved strings.
- */
- protected List<String> stringList(String[] in) {
- return stream(in).collect(Collectors.toList());
+ return ofNullable(in.length == 0 ? null :
Arrays.stream(in).map(x -> vr.resolve(x)).filter(x ->
isNotEmpty(x)).toArray(String[]::new));
}
/**
@@ -134,7 +127,7 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> stream(String[] in) {
- return Arrays.asList(in).stream().map(x ->
vr.resolve(x)).filter(x -> !StringUtils.isEmpty(x));
+ return Arrays.stream(in).map(x -> vr.resolve(x)).filter(x ->
isNotEmpty(x));
}
/**
@@ -143,8 +136,8 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
* @param in The CDL string containing variables to resolve.
* @return An array with resolved strings.
*/
- protected Stream<String> strings_cdl(String in) {
- return
Arrays.asList(StringUtils.split(vr.resolve(in))).stream().filter(x ->
!StringUtils.isEmpty(x));
+ protected Stream<String> cdl(String in) {
+ return Arrays.stream(split(vr.resolve(in))).filter(x ->
isNotEmpty(x));
}
/**
@@ -173,21 +166,6 @@ public abstract class AnnotationApplier<A extends
Annotation, B> {
}
/**
- * Resolves the specified string and converts it to a Visibility.
- *
- * @param in The string containing variables to resolve.
- * @param loc The annotation field name.
- * @return The resolved Visibility.
- */
- protected Optional<Visibility> visibility(String in, String loc) {
- try {
- return string(in).map(Visibility::valueOf);
- } catch (IllegalArgumentException e) {
- throw new ConfigException("Invalid syntax for
visibility on annotation @{0}({1}): {2}", ca.getSimpleName(), loc, in);
- }
- }
-
- /**
* Resolves the specified string and converts it to a Charset.
*
* @param in The string containing variables to resolve.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index a58c787..50e8a6b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -228,8 +228,8 @@ public class BeanSession extends ContextSession {
// <FluentSetters>
@Override /* GENERATED - ContextSession.Builder */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
@@ -1753,14 +1753,4 @@ public class BeanSession extends ContextSession {
public final boolean isUseJavaBeanIntrospector() {
return ctx.isUseJavaBeanIntrospector();
}
-
-
//-----------------------------------------------------------------------------------------------------------------
- // Other methods
-
//-----------------------------------------------------------------------------------------------------------------
-
- @Override /* ContextSession */
- public void checkForWarnings() {
- if (isDebug())
- super.checkForWarnings();
- }
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 563cc62..e762a8f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -68,8 +68,8 @@ public class BeanTraverseSession extends BeanSession {
}
@Override /* GENERATED - ContextSession.Builder */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
index 7ff6135..2902c72 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
@@ -14,6 +14,7 @@ package org.apache.juneau;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.collections.OMap.*;
+import static java.util.Collections.*;
import java.text.*;
import java.util.*;
@@ -37,7 +38,7 @@ public abstract class ContextSession {
@FluentSetters
public static abstract class Builder {
Context ctx;
- OMap properties = OMap.create();
+ OMap properties;
boolean unmodifiable;
Boolean debug;
@@ -96,15 +97,16 @@ public abstract class ContextSession {
*/
@FluentSetter
public Builder unmodifiable() {
- this.unmodifiable = true;
+ unmodifiable = true;
return this;
}
/**
- * Session-level properties.
+ * Session properties.
*
* <p>
- * Overrides context-level properties.
+ * Session properties are generic key-value pairs that can be
passed through the session and made
+ * available to any customized serializers/parsers or swaps.
*
* @param value
* The new value for this property.
@@ -113,7 +115,7 @@ public abstract class ContextSession {
*/
@FluentSetter
public Builder properties(Map<String,Object> value) {
- this.properties = OMap.of(value);
+ properties = OMap.of(value);
return this;
}
@@ -126,6 +128,8 @@ public abstract class ContextSession {
*/
@FluentSetter
public Builder property(String key, Object value) {
+ if (properties == null)
+ properties = OMap.create();
if (value == null) {
properties.remove(key);
} else {
@@ -142,7 +146,7 @@ public abstract class ContextSession {
* @return This object.
*/
@FluentSetter
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
if (type.isInstance(this))
apply.accept(type.cast(this));
return this;
@@ -158,7 +162,6 @@ public abstract class ContextSession {
//-----------------------------------------------------------------------------------------------------------------
private final OMap properties;
- private Map<String,Object> cache;
private List<String> warnings; // Any warnings encountered.
private final Context ctx;
@@ -173,7 +176,7 @@ public abstract class ContextSession {
protected ContextSession(Builder builder) {
ctx = builder.ctx;
unmodifiable = builder.unmodifiable;
- OMap sp = builder.properties;
+ OMap sp = builder.properties == null ? OMap.EMPTY_MAP :
builder.properties;
if (unmodifiable)
sp = sp.unmodifiable();
properties = sp;
@@ -199,55 +202,6 @@ public abstract class ContextSession {
}
/**
- * Adds an arbitrary object to this session's cache.
- *
- * <p>
- * Can be used to store objects for reuse during a session.
- *
- * @param key The key. Can be any string.
- * @param val The cached object.
- */
- public final void addToCache(String key, Object val) {
- if (unmodifiable)
- return;
- if (cache == null)
- cache = new TreeMap<>();
- cache.put(key, val);
- }
-
- /**
- * Adds arbitrary objects to this session's cache.
- *
- * <p>
- * Can be used to store objects for reuse during a session.
- *
- * @param cacheObjects
- * The objects to add to this session's cache.
- * No-op if <jk>null</jk>.
- */
- public final void addToCache(Map<String,Object> cacheObjects) {
- if (unmodifiable)
- return;
- if (cacheObjects != null) {
- if (cache == null)
- cache = new TreeMap<>();
- cache.putAll(cacheObjects);
- }
- }
-
- /**
- * Returns an object stored in the session cache.
- *
- * @param c The class type of the object.
- * @param key The session object key.
- * @return The cached object, or <jk>null</jk> if it doesn't exist.
- */
- @SuppressWarnings("unchecked")
- public final <T> T getFromCache(Class<T> c, String key) {
- return cache == null ? null : (T)cache.get(key);
- }
-
- /**
* Logs a warning message.
*
* @param msg The warning message.
@@ -262,28 +216,19 @@ public abstract class ContextSession {
}
/**
- * Returns <jk>true</jk> if warnings occurred in this session.
- *
- * @return <jk>true</jk> if warnings occurred in this session.
- */
- public final boolean hasWarnings() {
- return warnings != null && warnings.size() > 0;
- }
-
- /**
* Returns the warnings that occurred in this session.
*
* @return The warnings that occurred in this session, or <jk>null</jk>
if no warnings occurred.
*/
public final List<String> getWarnings() {
- return warnings;
+ return warnings == null ? emptyList() : warnings;
}
/**
- * Throws a {@link BeanRuntimeException} if any warnings occurred in
this session.
+ * Throws a {@link BeanRuntimeException} if any warnings occurred in
this session and debug is enabled.
*/
public void checkForWarnings() {
- if (warnings != null && ! warnings.isEmpty())
+ if (debug && ! getWarnings().isEmpty())
throw new BeanRuntimeException("Warnings occurred in
session: \n" + join(getWarnings(), "\n"));
}
@@ -292,7 +237,7 @@ public abstract class ContextSession {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Configuration property: Debug mode.
+ * Debug mode enabled.
*
* @see Context.Builder#debug()
* @return
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
index fbf925e..dc2d355 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
@@ -44,10 +44,10 @@ public class BeanConfigAnnotation {
public void apply(AnnotationInfo<BeanConfig> ai,
BeanContext.Builder b) {
BeanConfig a = ai.getAnnotation();
- visibility(a.beanClassVisibility(),
"beanClassVisibility").ifPresent(x -> b.beanClassVisibility(x));
- visibility(a.beanConstructorVisibility(),
"beanConstructorVisibility").ifPresent(x -> b.beanConstructorVisibility(x));
- visibility(a.beanFieldVisibility(),
"beanFieldVisibility").ifPresent(x -> b.beanFieldVisibility(x));
- visibility(a.beanMethodVisibility(),
"beanMethodVisibility").ifPresent(x -> b.beanMethodVisibility(x));
+
string(a.beanClassVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanClassVisibility(x));
+
string(a.beanConstructorVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanConstructorVisibility(x));
+
string(a.beanFieldVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanFieldVisibility(x));
+
string(a.beanMethodVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanMethodVisibility(x));
bool(a.beanMapPutReturnsOldValue()).ifPresent(x ->
b.beanMapPutReturnsOldValue(x));
bool(a.beansRequireDefaultConstructor()).ifPresent(x ->
b.beansRequireDefaultConstructor(x));
bool(a.beansRequireSerializable()).ifPresent(x ->
b.beansRequireSerializable(x));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index 2f11796..239e6d3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -78,8 +78,8 @@ public final class CsvSerializerSession extends
WriterSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index ce27fca..7be0377 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -90,8 +90,8 @@ public final class HtmlParserSession extends XmlParserSession
{
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
index 9123a44..bbed021 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
@@ -78,8 +78,8 @@ public class HtmlSchemaSerializerSession extends
HtmlSerializerSession {
// <FluentSetters>
@Override /* GENERATED - SessionArgs */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 6eb32e1..aaf6968 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -88,8 +88,8 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
// <FluentSetters>
@Override /* GENERATED - SessionArgs */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
index 129a886..c7d7e99 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
@@ -77,8 +77,8 @@ public class HtmlStrippedDocSerializerSession extends
HtmlSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserSession.java
index 6891eff..175538a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParserSession.java
@@ -77,8 +77,8 @@ public class JsoParserSession extends
InputStreamParserSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerSession.java
index 688dfef..b94bb7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializerSession.java
@@ -77,8 +77,8 @@ public class JsoSerializerSession extends
OutputStreamSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
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 4a02ab2..b60c4d6 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
@@ -84,8 +84,8 @@ public final class JsonParserSession extends
ReaderParserSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
index 4892ccb..5154893 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
@@ -79,8 +79,8 @@ public class JsonSchemaSerializerSession extends
JsonSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index cf2fe9b..3f5f746 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -81,8 +81,8 @@ public class JsonSerializerSession extends
WriterSerializerSession {
// <FluentSetters>
@Override /* GENERATED - SessionArgs */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index 3bdb43b..59c03d7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -82,8 +82,8 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
index b0be8cb..2b9d836 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
@@ -81,8 +81,8 @@ public final class MsgPackParserSession extends
InputStreamParserSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index eab0b62..aa068ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -80,8 +80,8 @@ public final class MsgPackSerializerSession extends
OutputStreamSerializerSessio
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index 16a584b..4956a19 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -102,8 +102,8 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
index 9fc1610..1b91d68 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/InputStreamParserSession.java
@@ -58,8 +58,8 @@ public abstract class InputStreamParserSession extends
ParserSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index a142ff6..47ead24 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -134,8 +134,8 @@ public abstract class ParserSession extends BeanSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
index e5d68c0..86a713d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParserSession.java
@@ -110,8 +110,8 @@ public abstract class ReaderParserSession extends
ParserSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
index 8de6fd1..56e3818 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParserSession.java
@@ -79,8 +79,8 @@ public class PlainTextParserSession extends
ReaderParserSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
index 102d906..abb2245 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
@@ -78,8 +78,8 @@ public class PlainTextSerializerSession extends
WriterSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
index 77ff7a3..d474ef5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializerSession.java
@@ -82,8 +82,8 @@ public abstract class OutputStreamSerializerSession extends
SerializerSession {
}
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index 1a0bdb6..3cd248a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -177,8 +177,8 @@ public abstract class SerializerSession extends
BeanTraverseSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
index 3bde6b6..078be9c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializerSession.java
@@ -144,8 +144,8 @@ public abstract class WriterSerializerSession extends
SerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
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 fa2327c..53401d3 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
@@ -102,8 +102,8 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index f3c6f37..b7e7b77 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -96,8 +96,8 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index de46454..a2a7ce9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -84,8 +84,8 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 82a5a0c..b2ced94 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -88,8 +88,8 @@ public class XmlSerializerSession extends
WriterSerializerSession {
// <FluentSetters>
@Override /* GENERATED */
- public <T> Builder ifType(Class<T> type, Consumer<T> apply) {
- super.ifType(type, apply);
+ public <T> Builder apply(Class<T> type, Consumer<T> apply) {
+ super.apply(type, apply);
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
index c407d9c..b700371 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/BasicSwaggerProviderSession.java
@@ -835,7 +835,7 @@ public class BasicSwaggerProviderSession {
.createSession()
.locale(locale)
.mediaType(mt)
-
.ifType(WriterSerializerSession.Builder.class, x -> x.useWhitespace(true))
+
.apply(WriterSerializerSession.Builder.class, x -> x.useWhitespace(true))
.build()
.serializeToString(example);
examples.put(s2.getPrimaryMediaType().toString(), eVal);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
index b7c758f..3252da2 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestBody.java
@@ -451,7 +451,7 @@ public class RequestBody {
.locale(locale)
.timeZone(timeZone.orElse(null))
.mediaType(mediaType)
- .ifType(ReaderParser.Builder.class, x ->
x.streamCharset(req.getCharset()))
+ .apply(ReaderParser.Builder.class, x ->
x.streamCharset(req.getCharset()))
.schema(schema)
.debug(req.isDebug() ? true : null)
.outer(req.getContext().getResource())
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index b5b2676..90a02bd 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -1127,7 +1127,7 @@ public class RestAnnotation {
b.guards().append(a.guards());
string(a.defaultCharset()).map(Charset::forName).ifPresent(x ->
b.defaultCharset(x));
string(a.maxInput()).ifPresent(x -> b.maxInput(x));
- strings_cdl(a.rolesDeclared()).forEach(x ->
b.rolesDeclared(x));
+ cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index 65fb175..4cd7495 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -482,7 +482,7 @@ public class RestDeleteAnnotation {
string(a.defaultCharset()).map(Charset::forName).ifPresent(x ->
b.defaultCharset(x));
stream(a.path()).forEach(x -> b.path(x));
string(a.value()).ifPresent(x -> b.path(x));
- strings_cdl(a.rolesDeclared()).forEach(x ->
b.rolesDeclared(x));
+ cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
string(a.debug()).map(Enablement::fromString).ifPresent(x -> b.debug(x));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index a08eb5e..543cece 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -542,7 +542,7 @@ public class RestGetAnnotation {
string(a.defaultCharset()).map(Charset::forName).ifPresent(x ->
b.defaultCharset(x));
stream(a.path()).forEach(x -> b.path(x));
string(a.value()).ifPresent(x -> b.path(x));
- strings_cdl(a.rolesDeclared()).forEach(x ->
b.rolesDeclared(x));
+ cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
string(a.debug()).map(Enablement::fromString).ifPresent(x -> b.debug(x));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 53eafb7..ed0e00d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -649,7 +649,7 @@ public class RestOpAnnotation {
string(a.defaultCharset()).map(Charset::forName).ifPresent(x ->
b.defaultCharset(x));
string(a.maxInput()).ifPresent(x -> b.maxInput(x));
stream(a.path()).forEach(x -> b.path(x));
- strings_cdl(a.rolesDeclared()).forEach(x ->
b.rolesDeclared(x));
+ cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
string(a.method()).ifPresent(x -> b.httpMethod(x));
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 18df3fe..f8c8cde 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -634,7 +634,7 @@ public class RestPostAnnotation {
string(a.maxInput()).ifPresent(x -> b.maxInput(x));
stream(a.path()).forEach(x -> b.path(x));
string(a.value()).ifPresent(x -> b.path(x));
- strings_cdl(a.rolesDeclared()).forEach(x ->
b.rolesDeclared(x));
+ cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
string(a.debug()).map(Enablement::fromString).ifPresent(x -> b.debug(x));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 926e174..b4686d8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -634,7 +634,7 @@ public class RestPutAnnotation {
string(a.maxInput()).ifPresent(x -> b.maxInput(x));
stream(a.path()).forEach(x -> b.path(x));
string(a.value()).ifPresent(x -> b.path(x));
- strings_cdl(a.rolesDeclared()).forEach(x ->
b.rolesDeclared(x));
+ cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
string(a.debug()).map(Enablement::fromString).ifPresent(x -> b.debug(x));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processors/SerializedPojoProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processors/SerializedPojoProcessor.java
index 25a5fdf..eec2f8b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processors/SerializedPojoProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processors/SerializedPojoProcessor.java
@@ -62,7 +62,7 @@ public final class SerializedPojoProcessor implements
ResponseProcessor {
.locale(req.getLocale())
.timeZone(req.getTimeZone().orElse(null))
.mediaType(mediaType)
-
.ifType(WriterSerializerSession.Builder.class, x ->
x.streamCharset(res.getCharset()).useWhitespace(req.isPlainText() ? true :
null))
+
.apply(WriterSerializerSession.Builder.class, x ->
x.streamCharset(res.getCharset()).useWhitespace(req.isPlainText() ? true :
null))
.schema(schema)
.debug(req.isDebug() ? true : null)
.uriContext(req.getUriContext())
