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 7f0b99d Context API refactoring.
7f0b99d is described below
commit 7f0b99df133e2eb26778ff031c3210c11fe7cb3a
Author: JamesBognar <[email protected]>
AuthorDate: Fri Oct 1 17:26:29 2021 -0400
Context API refactoring.
---
.../main/java/org/apache/juneau/config/Config.java | 2 +-
.../apache/juneau/config/store/ConfigStore.java | 2 +-
.../java/org/apache/juneau/jena/RdfParser.java | 2 +-
.../java/org/apache/juneau/jena/RdfSerializer.java | 2 +-
.../main/java/org/apache/juneau/BeanContext.java | 6 +++---
.../java/org/apache/juneau/BeanContextable.java | 6 +++---
.../org/apache/juneau/BeanTraverseContext.java | 2 +-
.../src/main/java/org/apache/juneau/Context.java | 24 ++++++++++++++++++----
.../main/java/org/apache/juneau/csv/CsvParser.java | 2 +-
.../java/org/apache/juneau/csv/CsvSerializer.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../java/org/apache/juneau/html/HtmlParser.java | 2 +-
.../juneau/html/HtmlSchemaDocSerializer.java | 2 +-
.../apache/juneau/html/HtmlSchemaSerializer.java | 2 +-
.../org/apache/juneau/html/HtmlSerializer.java | 2 +-
.../juneau/html/HtmlStrippedDocSerializer.java | 2 +-
.../main/java/org/apache/juneau/jso/JsoParser.java | 2 +-
.../java/org/apache/juneau/jso/JsoSerializer.java | 2 +-
.../java/org/apache/juneau/json/JsonParser.java | 2 +-
.../apache/juneau/json/JsonSchemaSerializer.java | 2 +-
.../org/apache/juneau/json/JsonSerializer.java | 2 +-
.../juneau/jsonschema/JsonSchemaGenerator.java | 2 +-
.../org/apache/juneau/msgpack/MsgPackParser.java | 2 +-
.../apache/juneau/msgpack/MsgPackSerializer.java | 2 +-
.../org/apache/juneau/oapi/OpenApiSerializer.java | 2 +-
.../main/java/org/apache/juneau/parser/Parser.java | 4 ++--
.../apache/juneau/plaintext/PlainTextParser.java | 2 +-
.../juneau/plaintext/PlainTextSerializer.java | 2 +-
.../juneau/serializer/OutputStreamSerializer.java | 4 ++--
.../org/apache/juneau/serializer/Serializer.java | 4 ++--
.../apache/juneau/serializer/WriterSerializer.java | 4 ++--
.../org/apache/juneau/soap/SoapXmlSerializer.java | 2 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 2 +-
.../java/org/apache/juneau/uon/UonSerializer.java | 2 +-
.../juneau/urlencoding/UrlEncodingParser.java | 2 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 2 +-
.../org/apache/juneau/xml/XmlDocSerializer.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 2 +-
.../java/org/apache/juneau/xml/XmlSerializer.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../java/org/apache/juneau/rest/RestOpContext.java | 2 +-
41 files changed, 68 insertions(+), 52 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index c18ffc5..0302ac4 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -1600,7 +1600,7 @@ public final class Config extends Context implements
ConfigEventListener, Writab
* Unused.
*/
@Override /* Context */
- public Context.Args createDefaultSessionArgs() {
+ public Context.Args defaultArgs() {
throw new UnsupportedOperationException();
}
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
index 0d62f2d..e4179b2 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigStore.java
@@ -197,7 +197,7 @@ public abstract class ConfigStore extends Context
implements Closeable {
* Unused.
*/
@Override /* Context */
- public final Context.Args createDefaultSessionArgs() {
+ public final Context.Args defaultArgs() {
throw new NoSuchMethodError();
}
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index eaa9434..fb6c9b4 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -119,7 +119,7 @@ public class RdfParser extends ReaderParser implements
RdfMetaProvider {
@Override /* Parser */
public RdfParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index d7dbb6a..472995f 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -151,7 +151,7 @@ public class RdfSerializer extends WriterSerializer
implements RdfMetaProvider {
@Override /* Context */
public RdfSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 924e7e0..fff6077 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -340,7 +340,7 @@ public class BeanContext extends Context {
*/
@Override /* Context */
public BeanSession createSession() {
- return createBeanSession(createDefaultSessionArgs());
+ return createBeanSession(defaultArgs());
}
/**
@@ -386,12 +386,12 @@ public class BeanContext extends Context {
}
@Override /* Context */
- public BeanSessionArgs createDefaultSessionArgs() {
+ public BeanSessionArgs defaultArgs() {
return createDefaultBeanSessionArgs();
}
/**
- * Same as {@link #createDefaultSessionArgs()} except always returns a
{@link BeanSessionArgs} unlike
+ * Same as {@link #defaultArgs()} except always returns a {@link
BeanSessionArgs} unlike
* {@link #createDefaultBeanSessionArgs()} which is meant to be
overridden by subclasses.
*
* @return A new session arguments object.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
index cf89bf1..2c5dd36 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java
@@ -47,7 +47,7 @@ public abstract class BeanContextable extends Context {
@Override
public BeanSession createSession() {
- return
beanContext.createBeanSession(beanContext.createDefaultSessionArgs());
+ return beanContext.createBeanSession(beanContext.defaultArgs());
}
/**
@@ -72,8 +72,8 @@ public abstract class BeanContextable extends Context {
}
@Override /* Context */
- public BeanSessionArgs createDefaultSessionArgs() {
- return beanContext.createDefaultSessionArgs();
+ public BeanSessionArgs defaultArgs() {
+ return beanContext.defaultArgs();
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
index a741e61..dfa749d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseContext.java
@@ -57,7 +57,7 @@ public abstract class BeanTraverseContext extends
BeanContextable {
@Override /* Context */
public BeanTraverseSession createSession() {
- return new BeanTraverseSession(this,
createDefaultSessionArgs());
+ return new BeanTraverseSession(this, defaultArgs());
}
@Override /* Context */
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 b083365..5a64ff9 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
@@ -905,7 +905,10 @@ public abstract class Context implements MetaProvider {
//-----------------------------------------------------------------------------------------------------------------
/**
- * Runtime arguments passed to the session object.
+ * Runtime arguments bean.
+ *
+ * <p>
+ * These are passed to {@link Session} beans to modify select settings
defined on the {@link Context} bean.
*/
@FluentSetters
public static class Args {
@@ -1024,7 +1027,6 @@ public abstract class Context implements MetaProvider {
// </FluentSetters>
}
-
//-----------------------------------------------------------------------------------------------------------------
// Instance
//-----------------------------------------------------------------------------------------------------------------
@@ -1094,6 +1096,18 @@ public abstract class Context implements MetaProvider {
public abstract Builder copy();
/**
+ * Creates an {@link Args} bean to pass to the {@link
#createSession(Args)} method.
+ *
+ * <p>
+ * The {@link Args} bean can be used to override select settings
defined on this context when creating session beans.
+ *
+ * @return A new Args bean.
+ */
+ public Args createArgs() {
+ return new Args();
+ }
+
+ /**
* Create a new bean session based on the properties defined on this
context.
*
* <p>
@@ -1103,7 +1117,7 @@ public abstract class Context implements MetaProvider {
* @return A new session object.
*/
public Session createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
/**
@@ -1125,7 +1139,7 @@ public abstract class Context implements MetaProvider {
*
* @return A SessionArgs object, possibly a read-only reusable instance.
*/
- public abstract Args createDefaultSessionArgs();
+ public abstract Args defaultArgs();
//-----------------------------------------------------------------------------------------------------------------
// Properties
@@ -1406,6 +1420,8 @@ public abstract class Context implements MetaProvider {
@Override /* Object */
public String toString() {
+ if (SimpleJsonSerializer.DEFAULT_READABLE == null)
+ return super.toString();
return SimpleJsonSerializer.DEFAULT_READABLE.toString(toMap());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index bdec1dd..6df944b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -67,7 +67,7 @@ public class CsvParser extends ReaderParser implements
CsvMetaProvider {
@Override /* Parser */
public CsvParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index f063398..e28f96d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -70,7 +70,7 @@ public final class CsvSerializer extends WriterSerializer
implements CsvMetaProv
@Override /* Context */
public CsvSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index ee4f9a9..a789266 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -136,7 +136,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
@Override /* Serializer */
public HtmlDocSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index 5a4439e..59186f4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -81,7 +81,7 @@ public class HtmlParser extends XmlParser implements
HtmlMetaProvider {
@Override /* Parser */
public HtmlParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index b6b91be..96307ac 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -78,7 +78,7 @@ public final class HtmlSchemaDocSerializer extends
HtmlDocSerializer {
@Override /* Serializer */
public HtmlSchemaDocSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index a37314e..53ca51c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -137,7 +137,7 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
@Override /* Context */
public HtmlSchemaSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index 7627cdb..f3b3f41 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -226,7 +226,7 @@ public class HtmlSerializer extends XmlSerializer
implements HtmlMetaProvider {
@Override /* Serializer */
public HtmlSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index a2ae912..93b247f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -75,7 +75,7 @@ public class HtmlStrippedDocSerializer extends HtmlSerializer
{
@Override /* Serializer */
public HtmlSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
index 62be056..21917e9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoParser.java
@@ -75,7 +75,7 @@ public final class JsoParser extends InputStreamParser
implements JsoMetaProvide
@Override /* Parser */
public JsoParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
index 2dbda60..ec929b5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jso/JsoSerializer.java
@@ -77,7 +77,7 @@ public class JsoSerializer extends OutputStreamSerializer
implements JsoMetaProv
@Override /* Context */
public JsoSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index 67ea8b9..5657381 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -175,7 +175,7 @@ public class JsonParser extends ReaderParser implements
JsonMetaProvider {
@Override /* Parser */
public JsonParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 0ef48b1..dcc2fe3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -133,7 +133,7 @@ public class JsonSchemaSerializer extends JsonSerializer
implements JsonSchemaMe
@Override /* Context */
public JsonSchemaSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index f99289e..37ee9ee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -198,7 +198,7 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
@Override /* Context */
public JsonSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
index a69d2eb..22efce0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGenerator.java
@@ -104,7 +104,7 @@ public class JsonSchemaGenerator extends
BeanTraverseContext implements JsonSche
@Override /* Context */
public JsonSchemaGeneratorSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 059e86a..915ec26 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -114,7 +114,7 @@ public class MsgPackParser extends InputStreamParser
implements MsgPackMetaProvi
@Override /* Parser */
public MsgPackParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index c8fc3a6..06ed3c4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -117,7 +117,7 @@ public class MsgPackSerializer extends
OutputStreamSerializer implements MsgPack
@Override /* Context */
public MsgPackSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index bde9beb..5879d08 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -84,7 +84,7 @@ public class OpenApiSerializer extends UonSerializer
implements OpenApiMetaProvi
@Override /* Context */
public OpenApiSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index eb6c651..20c69fa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -406,11 +406,11 @@ public abstract class Parser extends BeanContextable {
@Override /* Context */
public ParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Context */
- public final ParserSessionArgs createDefaultSessionArgs() {
+ public final ParserSessionArgs defaultArgs() {
return new ParserSessionArgs().mediaType(getPrimaryMediaType());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index c587dd8..1f6c387 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -89,7 +89,7 @@ public class PlainTextParser extends ReaderParser implements
PlainTextMetaProvid
@Override /* Parser */
public PlainTextParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 17289ae..3d8f16a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -87,7 +87,7 @@ public class PlainTextSerializer extends WriterSerializer
implements PlainTextMe
@Override /* Context */
public PlainTextSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
index 1922c28..21eaffa 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/OutputStreamSerializer.java
@@ -56,7 +56,7 @@ public abstract class OutputStreamSerializer extends
Serializer {
@Override /* Context */
public OutputStreamSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
@@ -73,7 +73,7 @@ public abstract class OutputStreamSerializer extends
Serializer {
*/
@Override
public final byte[] serialize(Object o) throws SerializeException {
- return createSession(createDefaultSessionArgs()).serialize(o);
+ return createSession(defaultArgs()).serialize(o);
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 89a8374..d0b66ec 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -156,11 +156,11 @@ public abstract class Serializer extends
BeanTraverseContext {
@Override /* Context */
public SerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Context */
- public final SerializerSessionArgs createDefaultSessionArgs() {
+ public final SerializerSessionArgs defaultArgs() {
return new
SerializerSessionArgs().mediaType(getResponseContentType());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index d3adff2..bc1cef2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -71,7 +71,7 @@ public abstract class WriterSerializer extends Serializer {
@Override /* Context */
public WriterSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
@@ -88,7 +88,7 @@ public abstract class WriterSerializer extends Serializer {
*/
@Override /* Serializer */
public final String serialize(Object o) throws SerializeException {
- return createSession(createDefaultSessionArgs()).serialize(o);
+ return createSession(defaultArgs()).serialize(o);
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index 27ddedd..7bfe6b2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -77,7 +77,7 @@ public final class SoapXmlSerializer extends XmlSerializer
implements SoapXmlMet
@Override /* Serializer */
public SoapXmlSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 84dc155..4e5dc52 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -164,7 +164,7 @@ public class UonParser extends ReaderParser implements
HttpPartParser, UonMetaPr
* @return A new parser session.
*/
protected final UonParserSession createParameterSession() {
- return new UonParserSession(this, createDefaultSessionArgs(),
false);
+ return new UonParserSession(this, defaultArgs(), false);
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index a478f62..3959ef9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -254,7 +254,7 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
@Override /* Context */
public UonSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 91c73e0..a6209a9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -94,7 +94,7 @@ public class UrlEncodingParser extends UonParser implements
UrlEncodingMetaProvi
@Override /* Parser */
public UrlEncodingParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index eaeadf9..4172fb1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -230,7 +230,7 @@ public class UrlEncodingSerializer extends UonSerializer
implements UrlEncodingM
@Override /* Context */
public UrlEncodingSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
index 6ea3530..33add97 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
@@ -64,7 +64,7 @@ public class XmlDocSerializer extends XmlSerializer {
@Override /* Serializer */
public XmlDocSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
index 4219e50..8b4bd7b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -106,7 +106,7 @@ public class XmlParser extends ReaderParser implements
XmlMetaProvider {
@Override /* Parser */
public XmlParserSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Parser */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index e0d4861..e874086 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -273,7 +273,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
@Override /* Serializer */
public XmlSerializerSession createSession() {
- return createSession(createDefaultSessionArgs());
+ return createSession(defaultArgs());
}
@Override /* Serializer */
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 09f155a..95d42a0 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -1626,7 +1626,7 @@ public class RestContext extends Context {
}
@Override /* Context */
- public Context.Args createDefaultSessionArgs() {
+ public Context.Args defaultArgs() {
throw unsupportedOperationException("Method not implemented.");
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 24dcd21..d019deb 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -596,7 +596,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
}
@Override /* Context */
- public Context.Args createDefaultSessionArgs() {
+ public Context.Args defaultArgs() {
throw unsupportedOperationException("Method not implemented.");
}
