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 e8b94b6 Context API refactoring.
e8b94b6 is described below
commit e8b94b608d2ef23c7fadd2fe5bb86e68c7c78916
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Sat Oct 2 12:29:28 2021 -0400
Context API refactoring.
---
.../main/java/org/apache/juneau/config/Config.java | 2 +-
.../apache/juneau/config/store/ConfigStore.java | 2 +-
.../org/apache/juneau/jena/RdfParserSession.java | 2 +-
.../apache/juneau/jena/RdfSerializerSession.java | 2 +-
.../main/java/org/apache/juneau/BeanContext.java | 2 +-
.../java/org/apache/juneau/BeanContextable.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 8 +-
.../org/apache/juneau/BeanTraverseSession.java | 4 +-
.../src/main/java/org/apache/juneau/Context.java | 191 +-------------------
.../java/org/apache/juneau/ContextSession.java | 198 +++++++++++++++++++++
.../org/apache/juneau/csv/CsvParserSession.java | 2 +-
.../apache/juneau/csv/CsvSerializerSession.java | 2 +-
.../juneau/html/HtmlDocSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlParserSession.java | 4 +-
.../juneau/html/HtmlSchemaSerializerSession.java | 2 +-
.../apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../html/HtmlStrippedDocSerializerSession.java | 2 +-
.../org/apache/juneau/jso/JsoParserSession.java | 2 +-
.../apache/juneau/jso/JsoSerializerSession.java | 2 +-
.../org/apache/juneau/json/JsonParserSession.java | 2 +-
.../juneau/json/JsonSchemaSerializerSession.java | 2 +-
.../apache/juneau/json/JsonSerializerSession.java | 2 +-
.../jsonschema/JsonSchemaGeneratorSession.java | 2 +-
.../juneau/msgpack/MsgPackParserSession.java | 2 +-
.../juneau/msgpack/MsgPackSerializerSession.java | 2 +-
.../apache/juneau/oapi/OpenApiParserSession.java | 2 +-
.../juneau/oapi/OpenApiSerializerSession.java | 2 +-
.../juneau/parser/InputStreamParserSession.java | 2 +-
.../org/apache/juneau/parser/ParserSession.java | 2 +-
.../apache/juneau/parser/ReaderParserSession.java | 2 +-
.../juneau/plaintext/PlainTextParserSession.java | 2 +-
.../plaintext/PlainTextSerializerSession.java | 2 +-
.../serializer/OutputStreamSerializerSession.java | 2 +-
.../juneau/serializer/SerializerSession.java | 2 +-
.../juneau/serializer/WriterSerializerSession.java | 2 +-
.../juneau/soap/SoapXmlSerializerSession.java | 2 +-
.../org/apache/juneau/uon/UonParserSession.java | 2 +-
.../apache/juneau/uon/UonSerializerSession.java | 2 +-
.../urlencoding/UrlEncodingParserSession.java | 2 +-
.../urlencoding/UrlEncodingSerializerSession.java | 2 +-
.../apache/juneau/xml/XmlDocSerializerSession.java | 2 +-
.../org/apache/juneau/xml/XmlParserSession.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 2 +-
juneau-doc/src/main/javadoc/overview.html | 8 +-
.../org/apache/juneau/rest/client/RestRequest.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 2 +-
.../java/org/apache/juneau/rest/RestOpContext.java | 2 +-
47 files changed, 256 insertions(+), 239 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 0302ac4..5f5958b 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
@@ -1592,7 +1592,7 @@ public final class Config extends Context implements
ConfigEventListener, Writab
* Unused.
*/
@Override /* Context */
- public Session createSession(Context.Args args) {
+ public ContextSession createSession(Context.Args args) {
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 e4179b2..3cbe351 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
@@ -189,7 +189,7 @@ public abstract class ConfigStore extends Context
implements Closeable {
* Unused.
*/
@Override /* Context */
- public final Session createSession(Context.Args args) {
+ public final ContextSession createSession(Context.Args args) {
throw new NoSuchMethodError();
}
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 130dea0..f85c1b5 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -578,7 +578,7 @@ public class RdfParserSession extends ReaderParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 7af0f6e..1e9a27f 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
@@ -588,7 +588,7 @@ public final class RdfSerializerSession extends
WriterSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 fff6077..10c49f7 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
@@ -360,7 +360,7 @@ public class BeanContext extends Context {
}
@Override /* Context */
- public final Session createSession(Context.Args args) {
+ public final ContextSession createSession(Context.Args args) {
throw new NoSuchMethodError();
}
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 2c5dd36..e920454 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
@@ -67,7 +67,7 @@ public abstract class BeanContextable extends Context {
}
@Override /* Context */
- public final Session createSession(Context.Args args) {
+ public final ContextSession createSession(Context.Args args) {
throw new NoSuchMethodError();
}
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 be3c531..c6177de 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
@@ -40,13 +40,13 @@ import org.apache.juneau.serializer.*;
import org.apache.juneau.transform.*;
/**
- * Session object that lives for the duration of a single use of {@link
Serializer} or {@link Parser}.
+ * ContextSession object that lives for the duration of a single use of {@link
Serializer} or {@link Parser}.
*
* <p>
* This class is NOT thread safe. It is meant to be discarded after one-time
use.
*/
@SuppressWarnings({"unchecked","rawtypes"})
-public class BeanSession extends Context.Session {
+public class BeanSession extends ContextSession {
private static Logger LOG =
Logger.getLogger(BeanSession.class.getName());
@@ -1588,13 +1588,13 @@ public class BeanSession extends Context.Session {
return schema;
}
- @Override /* Session */
+ @Override /* ContextSession */
public void checkForWarnings() {
if (isDebug())
super.checkForWarnings();
}
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a("Context", ctx.toMap())
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 dbae1b4..e67cc21 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
@@ -21,7 +21,7 @@ import java.util.*;
import org.apache.juneau.collections.*;
/**
- * Session that lives for the duration of a single use of {@link
BeanTraverseContext}.
+ * ContextSession that lives for the duration of a single use of {@link
BeanTraverseContext}.
*
* <p>
* Used by serializers and other classes that traverse POJOs for the following
purposes:
@@ -349,7 +349,7 @@ public class BeanTraverseSession extends BeanSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 1b2e8f1..f3ecf24 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
@@ -16,7 +16,6 @@ import static org.apache.juneau.Visibility.*;
import static org.apache.juneau.internal.ClassUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ExceptionUtils.*;
-import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.SystemEnv.*;
import static org.apache.juneau.reflect.ReflectionFilters.*;
import static java.util.Arrays.*;
@@ -25,7 +24,6 @@ import static java.util.stream.Collectors.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.*;
-import java.text.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.function.*;
@@ -66,7 +64,7 @@ import org.apache.juneau.xml.annotation.*;
* <ul>
* <li>This bean is thread-safe and cacheable/reusable.
* </ul>
- * <li>A {@link Session} class for doing work.
+ * <li>A {@link ContextSession} class for doing work.
* <ul>
* <li>This bean is non-thread-safe and meant for one-time use.
* </ul>
@@ -736,185 +734,6 @@ public abstract class Context implements MetaProvider {
}
//-----------------------------------------------------------------------------------------------------------------
- // Session
-
//-----------------------------------------------------------------------------------------------------------------
-
- /**
- * A one-time-use non-thread-safe object that's meant to be used once
and then thrown away.
- */
- public static abstract class Session {
-
- private final OMap properties;
- private Map<String,Object> cache;
- private List<String> warnings; // Any warnings encountered.
-
- private final Context ctx;
- private final boolean debug;
- private final boolean unmodifiable;
-
-
- /**
- * Default constructor.
- *
- * @param ctx The context object.
- * @param args
- * Runtime arguments.
- */
- protected Session(Context ctx, Args args) {
- this.ctx = ctx;
- this.unmodifiable = args.unmodifiable;
- OMap sp = args.properties;
- if (args.unmodifiable)
- sp = sp.unmodifiable();
- properties = sp;
- debug = ofNullable(args.debug).orElse(ctx.isDebug());
- }
-
- /**
- * Returns the session properties on this session.
- *
- * @return The session properties on this session. Never
<jk>null</jk>.
- */
- public final OMap getSessionProperties() {
- return properties;
- }
-
- /**
- * Returns the context that created this session.
- *
- * @return The context that created this session.
- */
- public Context getContext() {
- return ctx;
- }
-
- /**
- * 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.
- * @param args Optional {@link MessageFormat}-style arguments.
- */
- public void addWarning(String msg, Object... args) {
- if (unmodifiable)
- return;
- if (warnings == null)
- warnings = new LinkedList<>();
- warnings.add((warnings.size() + 1) + ": " + format(msg,
args));
- }
-
- /**
- * 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;
- }
-
- /**
- * Throws a {@link BeanRuntimeException} if any warnings
occurred in this session.
- */
- public void checkForWarnings() {
- if (warnings != null && ! warnings.isEmpty())
- throw new BeanRuntimeException("Warnings
occurred in session: \n" + join(getWarnings(), "\n"));
- }
-
-
//-----------------------------------------------------------------------------------------------------------------
- // Configuration properties
-
//-----------------------------------------------------------------------------------------------------------------
-
- /**
- * Configuration property: Debug mode.
- *
- * @see Context.Builder#debug()
- * @return
- * <jk>true</jk> if debug mode is enabled.
- */
- public boolean isDebug() {
- return debug;
- }
-
-
//-----------------------------------------------------------------------------------------------------------------
- // Other methods
-
//-----------------------------------------------------------------------------------------------------------------
-
- /**
- * Returns the properties defined on this bean as a simple map
for debugging purposes.
- *
- * <p>
- * Use
<c>SimpleJson.<jsf>DEFAULT</jsf>.println(<jv>thisBean</jv>)</c> to dump the
contents of this bean to the console.
- *
- * @return A new map containing this bean's properties.
- */
- public OMap toMap() {
- return OMap.create().filtered();
- }
-
- @Override /* Object */
- public String toString() {
- return
SimpleJsonSerializer.DEFAULT_READABLE.toString(toMap());
- }
- }
-
-
//-----------------------------------------------------------------------------------------------------------------
// Args
//-----------------------------------------------------------------------------------------------------------------
@@ -922,7 +741,7 @@ public abstract class Context implements MetaProvider {
* Runtime arguments bean.
*
* <p>
- * These are passed to {@link Session} beans to modify select settings
defined on the {@link Context} bean.
+ * These are passed to {@link ContextSession} beans to modify select
settings defined on the {@link Context} bean.
*/
@FluentSetters
public static class Args {
@@ -966,7 +785,7 @@ public abstract class Context implements MetaProvider {
* Create an unmodifiable session.
*
* <p>
- * The created Session object will be unmodifiable which makes
it suitable for caching and reuse.
+ * The created ContextSession object will be unmodifiable which
makes it suitable for caching and reuse.
*
* @return This object (for method chaining).
*/
@@ -1130,7 +949,7 @@ public abstract class Context implements MetaProvider {
*
* @return A new session object.
*/
- public Session createSession() {
+ public ContextSession createSession() {
return createSession(defaultArgs());
}
@@ -1146,7 +965,7 @@ public abstract class Context implements MetaProvider {
* The session arguments.
* @return A new session object.
*/
- public abstract Session createSession(Args args);
+ public abstract ContextSession createSession(Args args);
/**
* Defines default session arguments used when calling the {@link
#createSession()} method.
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
new file mode 100644
index 0000000..322e310
--- /dev/null
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java
@@ -0,0 +1,198 @@
+//
***************************************************************************************************************************
+// * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file *
+// * distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file *
+// * to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance *
+// * with the License. You may obtain a copy of the License at
*
+// *
*
+// * http://www.apache.org/licenses/LICENSE-2.0
*
+// *
*
+// * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an *
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the *
+// * specific language governing permissions and limitations under the
License. *
+//
***************************************************************************************************************************
+package org.apache.juneau;
+
+import static java.util.Optional.*;
+import static org.apache.juneau.internal.StringUtils.*;
+
+import java.text.*;
+import java.util.*;
+
+import org.apache.juneau.Context.Args;
+import org.apache.juneau.collections.*;
+import org.apache.juneau.json.*;
+
+/**
+ * A one-time-use non-thread-safe object that's meant to be used once and then
thrown away.
+ */
+public abstract class ContextSession {
+
+ private final OMap properties;
+ private Map<String,Object> cache;
+ private List<String> warnings; // Any warnings encountered.
+
+ private final Context ctx;
+ private final boolean debug;
+ private final boolean unmodifiable;
+
+
+ /**
+ * Default constructor.
+ *
+ * @param ctx The context object.
+ * @param args
+ * Runtime arguments.
+ */
+ protected ContextSession(Context ctx, Args args) {
+ this.ctx = ctx;
+ this.unmodifiable = args.unmodifiable;
+ OMap sp = args.properties;
+ if (args.unmodifiable)
+ sp = sp.unmodifiable();
+ properties = sp;
+ debug = ofNullable(args.debug).orElse(ctx.isDebug());
+ }
+
+ /**
+ * Returns the session properties on this session.
+ *
+ * @return The session properties on this session. Never <jk>null</jk>.
+ */
+ public final OMap getSessionProperties() {
+ return properties;
+ }
+
+ /**
+ * Returns the context that created this session.
+ *
+ * @return The context that created this session.
+ */
+ public Context getContext() {
+ return ctx;
+ }
+
+ /**
+ * 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.
+ * @param args Optional {@link MessageFormat}-style arguments.
+ */
+ public void addWarning(String msg, Object... args) {
+ if (unmodifiable)
+ return;
+ if (warnings == null)
+ warnings = new LinkedList<>();
+ warnings.add((warnings.size() + 1) + ": " + format(msg, args));
+ }
+
+ /**
+ * 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;
+ }
+
+ /**
+ * Throws a {@link BeanRuntimeException} if any warnings occurred in
this session.
+ */
+ public void checkForWarnings() {
+ if (warnings != null && ! warnings.isEmpty())
+ throw new BeanRuntimeException("Warnings occurred in
session: \n" + join(getWarnings(), "\n"));
+ }
+
+
//-----------------------------------------------------------------------------------------------------------------
+ // Configuration properties
+
//-----------------------------------------------------------------------------------------------------------------
+
+ /**
+ * Configuration property: Debug mode.
+ *
+ * @see Context.Builder#debug()
+ * @return
+ * <jk>true</jk> if debug mode is enabled.
+ */
+ public boolean isDebug() {
+ return debug;
+ }
+
+
//-----------------------------------------------------------------------------------------------------------------
+ // Other methods
+
//-----------------------------------------------------------------------------------------------------------------
+
+ /**
+ * Returns the properties defined on this bean as a simple map for
debugging purposes.
+ *
+ * <p>
+ * Use <c>SimpleJson.<jsf>DEFAULT</jsf>.println(<jv>thisBean</jv>)</c>
to dump the contents of this bean to the console.
+ *
+ * @return A new map containing this bean's properties.
+ */
+ public OMap toMap() {
+ return OMap.create().filtered();
+ }
+
+ @Override /* Object */
+ public String toString() {
+ return SimpleJsonSerializer.DEFAULT_READABLE.toString(toMap());
+ }
+}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
index d7d8845..be7011a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParserSession.java
@@ -58,7 +58,7 @@ public final class CsvParserSession extends
ReaderParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 7eb3b0f..6635e65 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
@@ -107,7 +107,7 @@ public final class CsvSerializerSession extends
WriterSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index c02902d..b923cc1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -253,7 +253,7 @@ public class HtmlDocSerializerSession extends
HtmlStrippedDocSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 5fbc95f..679d34f 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
@@ -30,7 +30,7 @@ import org.apache.juneau.transform.*;
import org.apache.juneau.xml.*;
/**
- * Session object that lives for the duration of a single use of {@link
HtmlParser}.
+ * ContextSession object that lives for the duration of a single use of {@link
HtmlParser}.
*
* <p>
* This class is NOT thread safe.
@@ -785,7 +785,7 @@ public final class HtmlParserSession extends
XmlParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 53f8929..97c1130 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
@@ -56,7 +56,7 @@ public class HtmlSchemaSerializerSession extends
HtmlSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 d6b7370..a9ae451 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
@@ -887,7 +887,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 78b6325..ed75056 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
@@ -56,7 +56,7 @@ public class HtmlStrippedDocSerializerSession extends
HtmlSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 c3964b8..023af14 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
@@ -58,7 +58,7 @@ public class JsoParserSession extends
InputStreamParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 4e366cc..2a0675f 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
@@ -53,7 +53,7 @@ public class JsoSerializerSession extends
OutputStreamSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 f70cbb4..2b92cf7 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
@@ -828,7 +828,7 @@ public final class JsonParserSession extends
ReaderParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 b1190e7..26d44ae 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
@@ -86,7 +86,7 @@ public class JsonSchemaSerializerSession extends
JsonSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 4b0b743..5730123 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
@@ -329,7 +329,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 afb5af9..c98bb14 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
@@ -478,7 +478,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 11b9cf5..4bf2164 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
@@ -217,7 +217,7 @@ public final class MsgPackParserSession extends
InputStreamParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 b931890..306bf37 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
@@ -255,7 +255,7 @@ public final class MsgPackSerializerSession extends
OutputStreamSerializerSessio
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index 48fc4e5..b7970e6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -358,7 +358,7 @@ public class OpenApiParserSession extends UonParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 2bc3518..0169faf 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
@@ -421,7 +421,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 a151444..021df21 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
@@ -88,7 +88,7 @@ public abstract class InputStreamParserSession extends
ParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 f35ee8e..6e19eee 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
@@ -1005,7 +1005,7 @@ public abstract class ParserSession extends BeanSession {
return ctx.getListener();
}
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 fa25705..a8a355b 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
@@ -104,7 +104,7 @@ public abstract class ReaderParserSession extends
ParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 ba61a07..a8a0038 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
@@ -51,7 +51,7 @@ public class PlainTextParserSession extends
ReaderParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 590b51b..ddc9c5a 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
@@ -51,7 +51,7 @@ public class PlainTextSerializerSession extends
WriterSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 a953097..8ac2054 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
@@ -109,7 +109,7 @@ public abstract class OutputStreamSerializerSession extends
SerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 62d224b..66e49d0 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
@@ -839,7 +839,7 @@ public abstract class SerializerSession extends
BeanTraverseSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 e3197f4..9d4e2f1 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
@@ -153,7 +153,7 @@ public abstract class WriterSerializerSession extends
SerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
index b1db57f..0a7dc6d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
@@ -95,7 +95,7 @@ public class SoapXmlSerializerSession extends
XmlSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 1468e1c..99e5e1d 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
@@ -855,7 +855,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 e57fda2..ceb3f03 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
@@ -352,7 +352,7 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index 4c4b26e..157da49 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -407,7 +407,7 @@ public class UrlEncodingParserSession extends
UonParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 0242bce..ea77d9f 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
@@ -297,7 +297,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
index 91f6124..fbbbc8b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
@@ -56,7 +56,7 @@ public class XmlDocSerializerSession extends
XmlSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 887661b..3c4fe42 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -820,7 +820,7 @@ public class XmlParserSession extends ReaderParserSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 a8c8e87..43111de 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
@@ -851,7 +851,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
diff --git a/juneau-doc/src/main/javadoc/overview.html
b/juneau-doc/src/main/javadoc/overview.html
index 81a0e22..d11be9d 100644
--- a/juneau-doc/src/main/javadoc/overview.html
+++ b/juneau-doc/src/main/javadoc/overview.html
@@ -2972,7 +2972,7 @@
<ul class='javatree'>
<li class='jc'><c>Object</c>
<ul>
- <li class='jac'>{@link org.apache.juneau.Session}
+ <li class='jac'>{@link org.apache.juneau.ContextSession}
<ul>
<li class='jc'>{@link org.apache.juneau.BeanSession}
<ul>
@@ -34352,7 +34352,7 @@ Resource bundles are searched using the following base
name patterns:
<ul>
<li>New {@link org.apache.juneau.PropertyStore} class -
Used for creating context objects.
<li>New {@link org.apache.juneau.Context} class -
Read-only configurations for serializers and parsers.
- <li>New {@link org.apache.juneau.Session} class -
One-time use objects used by serializers and parsers.
+ <li>New {@link org.apache.juneau.ContextSession} class
- One-time use objects used by serializers and parsers.
<li>All context context properties can now also be
specified via system properties.
</ul>
</li>
@@ -34531,7 +34531,7 @@ Resource bundles are searched using the following base
name patterns:
</p>
<p>
In particular, this release cleans up the {@link
org.apache.juneau.BeanContext} API to match
- the {@link org.apache.juneau.PropertyStore}/{@link
org.apache.juneau.Context}/{@link org.apache.juneau.Session} paradigm
+ the {@link org.apache.juneau.PropertyStore}/{@link
org.apache.juneau.Context}/{@link org.apache.juneau.ContextSession} paradigm
previously used in the serializer and parser APIs.
It also makes several improvements to the HTML and XML serialization
support and introduces HTML5 DTO beans.
</p>
@@ -36387,7 +36387,7 @@ Resource bundles are searched using the following base
name patterns:
Session objects also now have a consistent
class hierarchy.
<br>For example, the class hierarchy of
<c>JsonSerializerSession</c> is now:
<ul class='doctree'>
- <li class='jac'>{@link
org.apache.juneau.Session}
+ <li class='jac'>{@link
org.apache.juneau.ContextSession}
<ul>
<li class='jc'>{@link
org.apache.juneau.BeanSession}
<ul>
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index d026d2d..267778e 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -3236,7 +3236,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
// Other methods
//-----------------------------------------------------------------------------------------------------------------
- @Override /* Session */
+ @Override /* ContextSession */
public OMap toMap() {
return super.toMap()
.a(
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 95d42a0..bbaa225 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
@@ -1621,7 +1621,7 @@ public class RestContext extends Context {
}
@Override /* Context */
- public Session createSession(Context.Args args) {
+ public ContextSession createSession(Context.Args args) {
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 d019deb..79cc7a0 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
@@ -591,7 +591,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
}
@Override /* Context */
- public Session createSession(Context.Args args) {
+ public ContextSession createSession(Context.Args args) {
throw unsupportedOperationException("Method not implemented.");
}
