You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by as...@apache.org on 2025/11/05 22:33:00 UTC

(grails-website) branch asf-site-production updated: Deploying to documentation branch - 22:32:50

This is an automated email from the ASF dual-hosted git repository.

asf-ci-deploy pushed a commit to branch asf-site-production
in repository https://gitbox.apache.org/repos/asf/grails-website.git


The following commit(s) were added to refs/heads/asf-site-production by this push:
     new 851f0afb5e2 Deploying to documentation branch - 22:32:50
851f0afb5e2 is described below

commit 851f0afb5e2008890aeae546da05c8ad64385a69
Author: codeconsole <co...@users.noreply.github.com>
AuthorDate: Wed Nov 5 22:32:53 2025 +0000

    Deploying to documentation branch - 22:32:50
---
 docs/snapshot/api/allclasses-frame.html            |  2 +
 docs/snapshot/api/deprecated-list.html             | 10 +++
 docs/snapshot/api/index-all.html                   | 21 +++--
 .../grails/buffer/GrailsLazyProxyPrintWriter.html  | 12 +--
 .../grails/buffer/GrailsRoutablePrintWriter.html   | 18 ++--
 .../datastore/bson/json/JsonReader.Context.html    |  4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  4 +-
 .../datastore/bson/json/JsonWriter.Context.html    | 10 +--
 .../org/grails/datastore/bson/json/JsonWriter.html |  4 +-
 .../datastore/mapping/reflect/EntityReflector.html |  8 +-
 .../PluginAwareResourceBundleMessageSource.html    | 16 ++--
 ...leMessageSource.PropertiesHolderCacheEntry.html |  8 +-
 .../ReloadableResourceBundleMessageSource.html     | 16 ++--
 .../OutputEncodingStack.OutputProxyWriter.html     |  2 +-
 .../converters/marshaller/json/EnumMarshaller.html |  7 +-
 ...umMarshaller.html => SimpleEnumMarshaller.html} | 23 ++---
 .../converters/marshaller/json/package-frame.html  |  2 +-
 .../marshaller/json/package-summary.html           |  9 ++
 .../converters/marshaller/xml/EnumMarshaller.html  |  7 +-
 ...umMarshaller.html => SimpleEnumMarshaller.html} | 23 ++---
 .../converters/marshaller/xml/package-frame.html   |  2 +-
 .../converters/marshaller/xml/package-summary.html |  9 ++
 .../org/grails/web/pages/GSPResponseWriter.html    |  2 +-
 docs/snapshot/grails-data/api/index-all.html       | 10 +--
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 +-
 .../datastore/mapping/model/MappingContext.html    |  6 +-
 .../datastore/mapping/query/AssociationQuery.html  |  8 +-
 .../datastore/mapping/query/Query.Conjunction.html | 25 +++++-
 .../datastore/mapping/query/Query.Disjunction.html | 25 +++++-
 .../datastore/mapping/query/Query.Junction.html    |  4 +-
 .../datastore/mapping/query/Query.Negation.html    | 25 +++++-
 .../org/grails/datastore/mapping/query/Query.html  | 32 +++----
 .../datastore/mapping/reflect/EntityReflector.html |  8 +-
 .../developer-manual/gettingStarted.html           |  2 +-
 .../grails-data/developer-manual/introduction.html |  2 +-
 .../grails-data/developer-manual/stepByStep.html   |  2 +-
 .../grails-data/developer-manual/testing.html      |  2 +-
 .../developer-manual/understandingApi.html         |  2 +-
 .../understandingApi/datastoreBasics.html          |  2 +-
 .../understandingApi/gormApis.html                 |  2 +-
 .../understandingApi/gormEnhancer.html             |  2 +-
 .../understandingApi/implementingCrud.html         |  2 +-
 .../understandingApi/implementingQueries.html      |  2 +-
 .../understandingApi/secondaryIndexes.html         |  2 +-
 .../grails-data/hibernate5/api/index-all.html      |  6 +-
 .../datastore/bson/json/JsonReader.Context.html    |  4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  4 +-
 .../datastore/bson/json/JsonWriter.Context.html    | 10 +--
 .../org/grails/datastore/bson/json/JsonWriter.html |  4 +-
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 +-
 .../datastore/mapping/model/MappingContext.html    |  6 +-
 .../mapping/mongo/config/MongoMappingContext.html  |  2 +-
 .../datastore/mapping/reflect/EntityReflector.html |  8 +-
 .../orm/hibernate/cfg/HibernateMappingContext.html |  2 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |  2 +-
 .../grails-data/mongodb/api/index-all.html         |  6 +-
 .../datastore/bson/json/JsonReader.Context.html    |  4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  4 +-
 .../datastore/bson/json/JsonWriter.Context.html    | 10 +--
 .../org/grails/datastore/bson/json/JsonWriter.html |  4 +-
 .../query/AbstractHibernateCriteriaBuilder.html    | 14 ++--
 ...ctHibernateQuery.HibernateAssociationQuery.html |  6 +-
 ...ractHibernateQuery.HibernateProjectionList.html | 56 +++++--------
 .../hibernate/query/AbstractHibernateQuery.html    | 10 +--
 .../grails/orm/hibernate/query/HibernateQuery.html |  2 +-
 .../grails-data/whats-new-manual/index.html        |  2 +-
 docs/snapshot/guide/pages/upgrading60x.html        | 98 ++++++++++++++++++++++
 docs/snapshot/guide/single.html                    | 98 ++++++++++++++++++++++
 docs/snapshot/guide/upgrading.html                 | 98 ++++++++++++++++++++++
 73 files changed, 627 insertions(+), 237 deletions(-)

diff --git a/docs/snapshot/api/allclasses-frame.html b/docs/snapshot/api/allclasses-frame.html
index bfffd9c61dd..c85835a6a08 100644
--- a/docs/snapshot/api/allclasses-frame.html
+++ b/docs/snapshot/api/allclasses-frame.html
@@ -2467,6 +2467,8 @@
 <li><a href="org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html" title="class in org.grails.datastore.bson.codecs.encoders.SimpleEncoder" target="classFrame">SimpleEncoder.8</a></li>
 <li><a href="org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html" title="class in org.grails.datastore.bson.codecs.encoders.SimpleEncoder" target="classFrame">SimpleEncoder.9</a></li>
 <li><a href="org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html" title="interface in org.grails.datastore.bson.codecs.encoders.SimpleEncoder" target="classFrame"><I>SimpleEncoder.TypeEncoder</I></a></li>
+<li><a href="org/grails/web/converters/marshaller/json/SimpleEnumMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">SimpleEnumMarshaller</a></li>
+<li><a href="org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">SimpleEnumMarshaller</a></li>
 <li><a href="org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.html" title="class in org.grails.orm.hibernate.proxy" target="classFrame">SimpleHibernateProxyHandler</a></li>
 <li><a href="org/grails/datastore/mapping/simple/connections/SimpleMapConnectionSourceFactory.html" title="class in org.grails.datastore.mapping.simple.connections" target="classFrame">SimpleMapConnectionSourceFactory</a></li>
 <li><a href="grails/databinding/SimpleMapDataBindingSource.html" title="class in grails.databinding" target="classFrame">SimpleMapDataBindingSource</a></li>
diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index b450ad4ed44..e91b692e850 100644
--- a/docs/snapshot/api/deprecated-list.html
+++ b/docs/snapshot/api/deprecated-list.html
@@ -265,6 +265,16 @@ if (location.href.indexOf('is-external=true') == -1) {
                     <div class="block"><i>Utility class to create a pre-configured <a href='../../../../../org/grails/cli/compiler/grape/AetherGrapeEngine.html' title='AetherGrapeEngine'>AetherGrapeEngine</a>.</i></div>
                 </td>
             </tr>
+            <tr class="altColor">
+                <td class="colOne"><a href="org/grails/web/converters/marshaller/json/EnumMarshaller.html">EnumMarshaller</a>
+                    <div class="block"><i> <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL></i></div>
+                </td>
+            </tr>
+            <tr class="rowColor">
+                <td class="colOne"><a href="org/grails/web/converters/marshaller/xml/EnumMarshaller.html">EnumMarshaller</a>
+                    <div class="block"><i> <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL></i></div>
+                </td>
+            </tr>
             <tr class="altColor">
                 <td class="colOne"><a href="reactor/bus/Event.html">Event</a>
                     <div class="block"><i><DL><DT><B>deprecated:</B></DT><DD>Here for compatibility only.</DD></DL>  </i></div>
diff --git a/docs/snapshot/api/index-all.html b/docs/snapshot/api/index-all.html
index 4cad80ad98d..e95aab82abe 100644
--- a/docs/snapshot/api/index-all.html
+++ b/docs/snapshot/api/index-all.html
@@ -6368,7 +6368,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="grails/doc/DocEngine.html#CONTEXT_PATH" title="Property in DocEngine">CONTEXT_PATH</a></span> - Property in <a href="grails/doc/DocEngine.html">DocEngine</a>
 </dt><dd> <div class="block"></div></dd>
@@ -22089,7 +22089,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html" title="Interface in org.grails.buffer.GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter.DestinationFactory</a></span> - Interface in <a href="./org/grails/buffer/package-summary.html">org.grails.buffer</a>
 </dt><dd><div class="block">Factory to lazily instantiate the destination.</div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Constructor in GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Constructor in GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/scaffolding/registry/DomainRendererRegisterer.html#grailsLinkGenerator" title="Property in DomainRendererRegisterer">grailsLinkGenerator</a></span> - Property in <a href="org/grails/scaffolding/registry/DomainRendererRegisterer.html">DomainRendererRegisterer</a>
 </dt><dd> <div class="block"></div></dd>
@@ -22224,7 +22224,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html" title="Interface in org.grails.buffer.GrailsRoutablePrintWriter">GrailsRoutablePrintWriter.DestinationFactory</a></span> - Interface in <a href="./org/grails/buffer/package-summary.html">org.grails.buffer</a>
 </dt><dd><div class="block">Factory to lazily instantiate the destination.</div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Constructor in GrailsRoutablePrintWriter">GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Constructor in GrailsRoutablePrintWriter">GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gradle/plugin/run/GrailsRunTask.html" title="Class in org.grails.gradle.plugin.run">GrailsRunTask</a></span> - Class in <a href="./org/grails/gradle/plugin/run/package-summary.html">org.grails.gradle.plugin.run</a>
 </dt><dd><div class="block">Extension to the standard JavaExec task to run Grails applications</div></dd>
@@ -29570,6 +29570,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.html#marshalObject(java.lang.Object, C)" title="Method in ProxyUnwrappingMarshaller">marshalObject(java.lang.Object, C)</a></span> - Method in <a href="org/grails/web/converters/marshaller/ProxyUnwrappingMarshaller.html">ProxyUnwrappingMarshaller</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html#marshalObject(java.lang.Object, grails.converters.XML)" title="Method in SimpleEnumMarshaller">marshalObject(java.lang.Object, grails.converters.XML)</a></span> - Method in <a href="org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html">SimpleEnumMarshaller</a>
+</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.html#marshalObject(java.lang.Object, grails.converters.XML)" title="Method in ToStringBeanMarshaller">marshalObject(java.lang.Object, grails.converters.XML)</a></span> - Method in <a href="org/grails/web/converters/marshaller/xml/ToStringBeanMarshaller.html">ToStringBeanMarshaller</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.html#marshalObject(java.lang.Object, grails.converters.XML)" title="Method in ValidationErrorsMarshaller">marshalObject(java.lang.Object, grails.converters.XML)</a></span> - Method in <a href="org/grails/web/converters/marshaller/xml/ValidationErrorsMarshaller.html">ValidationErrorsMarshaller</a>
@@ -31168,7 +31170,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Creates a new instance of this class.</div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsPrintWriterAdapter.html#newInstance(java.io.Writer)" title="Method in GrailsPrintWriterAdapter">newInstance(java.io.Writer)</a></span> - Method in <a href="org/grails/buffer/GrailsPrintWriterAdapter.html">GrailsPrintWriterAdapter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/PersistentEntity.html#newInstance()" title="Method in PersistentEntity">newInstance()</a></span> - Method in <a href="org/grails/datastore/mapping/model/PersistentEntity.html">PersistentEntity</a>
 </dt><dd> <div class="block">Constructs a new instance</div></dd>
@@ -39955,6 +39957,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html#SimpleEncoder()" title="Constructor in SimpleEncoder">SimpleEncoder()</a></span> - Constructor in <a href="org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html">SimpleEncoder</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html" title="Class in org.grails.web.converters.marshaller.xml">SimpleEnumMarshaller</a></span> - Class in <a href="./org/grails/web/converters/marshaller/xml/package-summary.html">org.grails.web.converters.marshaller.xml</a>
+</dt><dd><div class="block">Marshals enums as simple string values (just the enum name) for symmetric serialization/deserialization.
+ </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/proxy/SimpleHibernateProxyHandler.html" title="Class in org.grails.orm.hibernate.proxy">SimpleHibernateProxyHandler</a></span> - Class in <a href="./org/grails/orm/hibernate/proxy/package-summary.html">org.grails.orm.hibernate.proxy</a>
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/plugin/json/view/api/internal/DefaultJsonViewHelper.html#simpleIncludeExcludeSupport" title="Property in DefaultJsonViewHelper">simpleIncludeExcludeSupport</a></span> - Property in <a href="grails/plugin/json/view/api/internal/DefaultJsonViewHelper.html">DefaultJsonViewHelper</a>
@@ -41125,6 +41130,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/constraints/ScaleConstraint.html#supports(java.lang.Class)" title="Method in ScaleConstraint">supports(java.lang.Class)</a></span> - Method in <a href="org/grails/datastore/gorm/validation/constraints/ScaleConstraint.html">ScaleConstraint</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html#supports(java.lang.Object)" title="Method in SimpleEnumMarshaller">supports(java.lang.Object)</a></span> - Method in <a href="org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html">SimpleEnumMarshaller</a>
+</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/validation/constraints/SizeConstraint.html#supports(java.lang.Class)" title="Method in SizeConstraint">supports(java.lang.Class)</a></span> - Method in <a href="org/grails/datastore/gorm/validation/constraints/SizeConstraint.html">SizeConstraint</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/scaffolding/registry/input/StringInputRenderer.html#supports(org.grails.scaffolding.model.property.DomainProperty)" title="Method in StringInputRenderer">supports(org.grails.scaffolding.model.property.DomainProperty)</a></span> - Method in <a href="org/grails/scaffolding/registry/input/StringInputRenderer.html">StringInputRenderer</a>
@@ -43149,9 +43156,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/rest/render/atom/AtomRenderer.html#UPDATED_TAG" title="Field in AtomRenderer">UPDATED_TAG</a></span> - Field in <a href="grails/rest/render/atom/AtomRenderer.html">AtomRenderer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Method in GrailsLazyProxyPrintWriter">updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Method in GrailsLazyProxyPrintWriter">updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.html#updateEntry(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, java.lang.Object, org.bson.Document)" title="Method in MongoEntityPersister">updateEntry(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, java.lang.Object, org.bson.Document)</a></span> - Method in <a href="org/grails/dat [...]
 </dt><dd> <div class="block"></div></dd>
@@ -43199,7 +43206,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/gsp/GroovyPagesTemplateRenderer.html#updateValue(groovy.text.Template, Callable<Template>, java.lang.Object)" title="Method in GroovyPagesTemplateRenderer">updateValue(groovy.text.Template, Callable&lt;Template&gt;, java.lang.Object)</a></span> - Method in <a href="org/grails/web/gsp/GroovyPagesTemplateRenderer.html">GroovyPagesTemplateRenderer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html#updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable<PropertiesHolder>, java.lang.Object)" title="Method in ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry">updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable&lt;Properti [...]
+<dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html#updateValue(PropertiesHolder, Callable<PropertiesHolder>, java.lang.Object)" title="Method in ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry">updateValue(PropertiesHolder, Callable&lt;PropertiesHolder&gt;, java.lang.Object)</a></span> - Method in <a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.Properti [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/apache/grails/data/testing/tck/tests/UpdateWithProxyPresentSpec.html" title="Class in org.apache.grails.data.testing.tck.tests">UpdateWithProxyPresentSpec</a></span> - Class in <a href="./org/apache/grails/data/testing/tck/tests/package-summary.html">org.apache.grails.data.testing.tck.tests</a>
 </dt><dd><div class="block"> <DL><DT><B>Authors:</B></DT><DD>graemerocher</DD></DL></div></dd>
diff --git a/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html b/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
index cf643f07b38..793ad8806ed 100644
--- a/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
+++ b/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
@@ -182,7 +182,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">GrailsLazyProxyPrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</code><br></td>
+                                <code><strong><a href="#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">GrailsLazyProxyPrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</code><br></td>
                         </tr>
                         
                     </table>
@@ -239,7 +239,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</code><br></td>
                         </tr>
                         
                     </table>
@@ -289,10 +289,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>GrailsLazyProxyPrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</h4>
+                                <h4>public&nbsp;<strong>GrailsLazyProxyPrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -350,10 +350,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                             </li>
                         </ul>
                     
-                        <a name="updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</h4>
+                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html b/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html
index ceafe65e5e6..914d4fd4a0f 100644
--- a/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html
+++ b/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html
@@ -182,7 +182,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">GrailsRoutablePrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</code><br></td>
+                                <code><strong><a href="#GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">GrailsRoutablePrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</code><br></td>
                         </tr>
                         
                     </table>
@@ -299,7 +299,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">newInstance</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">newInstance</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -449,7 +449,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -529,10 +529,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>GrailsRoutablePrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</h4>
+                                <h4>public&nbsp;<strong>GrailsRoutablePrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -670,10 +670,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                             </li>
                         </ul>
                     
-                        <a name="newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a> <strong>newInstance</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</h4>
+                                <h4>public&nbsp;static&nbsp;<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a> <strong>newInstance</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -870,10 +870,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                             </li>
                         </ul>
                     
-                        <a name="updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</h4>
+                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 2072f980df2..4fc8f79aa85 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
index 8af03527851..e516a258aef 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -659,7 +659,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 35fb8d077e8..82919cc9d93 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
index c32883600db..1ec9e193845 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -687,7 +687,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 3ef79e671ea..469ea498256 100644
--- a/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html b/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html
index 33512e31f27..cd36458bfd8 100644
--- a/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html
+++ b/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html
@@ -244,25 +244,25 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMergedBinaryPluginProperties(java.util.Locale)">getMergedBinaryPluginProperties</a></strong>(java.util.Locale locale)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMergedPluginProperties(java.util.Locale)">getMergedPluginProperties</a></strong>(java.util.Locale locale)</code><br>Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  </td>
@@ -470,7 +470,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -478,7 +478,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -486,7 +486,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="getMergedBinaryPluginProperties(java.util.Locale)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getMergedBinaryPluginProperties</strong>(java.util.Locale locale)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getMergedBinaryPluginProperties</strong>(java.util.Locale locale)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -494,7 +494,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="getMergedPluginProperties(java.util.Locale)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getMergedPluginProperties</strong>(java.util.Locale locale)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getMergedPluginProperties</strong>(java.util.Locale locale)</h4>
                                 <p> Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  Either fetches the holder from the cache or freshly loads it.
diff --git a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html
index 259b9184c85..acbf0a19b6a 100644
--- a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html
+++ b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html
@@ -165,8 +165,8 @@ extends <a href='../../../../../grails/util/CacheEntry.html'>CacheEntry</a></pre
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable, java.lang.Object)">updateValue</a></strong>(<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> oldValue, java.util.concurrent.Callable&lt;PropertiesHolder&gt; updater, java.lang.Obj [...]
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code><strong><a href="#updateValue(PropertiesHolder, Callable, java.lang.Object)">updateValue</a></strong>(<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> oldValue, java.util.concurrent.Callable&lt;PropertiesHolder&gt; updater, java.lang.Object cacheRequestObject)</code><br></td>
                         </tr>
                         
                     </table>
@@ -237,10 +237,10 @@ extends <a href='../../../../../grails/util/CacheEntry.html'>CacheEntry</a></pre
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable, java.lang.Object)"><!-- --></a>
+                        <a name="updateValue(PropertiesHolder, Callable, java.lang.Object)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>updateValue</strong>(<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> oldValue, java.util.concurrent.Ca [...]
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>updateValue</strong>(<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> oldValue, java.util.concurrent.Callable&lt;PropertiesHolder&gt; updater, java.lang.Object cacheRequestObject)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
index 1cc5903f59b..ecace5764fc 100644
--- a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
+++ b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
@@ -269,7 +269,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
@@ -281,7 +281,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
@@ -318,7 +318,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMergedProperties(java.util.Locale)">getMergedProperties</a></strong>(java.util.Locale locale)</code><br>Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  </td>
@@ -326,7 +326,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getProperties(java.lang.String, org.springframework.core.io.Resource)">getProperties</a></strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</code><br>Get a PropertiesHolder for the given filename, either from the
  cache or freshly loaded.</td>
                         </tr>
@@ -524,7 +524,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -540,7 +540,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -592,7 +592,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="getMergedProperties(java.util.Locale)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getMergedProperties</strong>(java.util.Locale locale)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getMergedProperties</strong>(java.util.Locale locale)</h4>
                                 <p> Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  Either fetches the holder from the cache or freshly loads it.
@@ -606,7 +606,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="getProperties(java.lang.String, org.springframework.core.io.Resource)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("rawtypes")<br>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getProperties</strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</h4>
+                                <h4>@java.lang.SuppressWarnings("rawtypes")<br>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getProperties</strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</h4>
                                 <p> Get a PropertiesHolder for the given filename, either from the
  cache or freshly loaded.
       <DL><DT><B>Parameters:</B></DT><DD><code>filename</code> -  the bundle filename (basename + Locale)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the current PropertiesHolder for the bundle</DD></DL></p>
diff --git a/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html b/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html
index b23b4c587c7..978dd419605 100644
--- a/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html
+++ b/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html
@@ -208,7 +208,7 @@ implements <a href='../../../../org/grails/encoder/EncodedAppenderFactory.html'>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html'>GrailsLazyProxyPrintWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#getOut()'>getOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isAllowUnwrappingOut()'>isAllowUnwrappingOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isDestinationActivated()'>isDestinationActivated</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#setDestinationActivated(bool [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#getOut()'>getOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isAllowUnwrappingOut()'>isAllowUnwrappingOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isDestinationActivated()'>isDestinationActivated</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#setDestinationActivated(bool [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintWriter</a></code></td>
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html b/docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html
index f7b02e5441e..ea503d56f96 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html
@@ -106,11 +106,14 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>public class EnumMarshaller
+<pre>@java.lang.Deprecated(forRemoval = true, since = "7.0.2")
+public class EnumMarshaller
 extends java.lang.Object
 implements <a href='../../../../../../org/grails/web/converters/marshaller/ObjectMarshaller.html'>ObjectMarshaller</a></pre>
 
-    <p>
+    <p><DL><DT><B>deprecated:</B></DT><DD>As of 7.0.2, replaced by <a href='../../../../../../org/grails/web/converters/marshaller/json/SimpleEnumMarshaller.html' title='SimpleEnumMarshaller'>SimpleEnumMarshaller</a> for round-trip compatibility.
+             This marshaller will no longer be registered by default in Grails 8.0.
+             To opt-in to the new behavior now, set <CODE>grails.converters.json.enum.format=simple</CODE> in application.yml.</DD></DL>
   <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL><DL><DT><B>Since:</B></DT><DD>1.1</DD></DL></p>
 
           </li>
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html b/docs/snapshot/api/org/grails/web/converters/marshaller/json/SimpleEnumMarshaller.html
similarity index 92%
copy from docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html
copy to docs/snapshot/api/org/grails/web/converters/marshaller/json/SimpleEnumMarshaller.html
index f7b02e5441e..2acb3a007ff 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/json/EnumMarshaller.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/json/SimpleEnumMarshaller.html
@@ -27,7 +27,7 @@
 <html>
 <head>
     <!-- Generated by groovydoc (4.0.29) -->
-    <title>EnumMarshaller (Grails 7.0.2-SNAPSHOT)</title>
+    <title>SimpleEnumMarshaller (Grails 7.0.2-SNAPSHOT)</title>
     
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link href="../../../../../../groovy.ico" type="image/x-icon" rel="shortcut icon">
@@ -37,7 +37,7 @@
 <body class="center">
 <script type="text/javascript"><!--
 if (location.href.indexOf('is-external=true') == -1) {
-    parent.document.title="EnumMarshaller (Grails 7.0.2-SNAPSHOT)";
+    parent.document.title="SimpleEnumMarshaller (Grails 7.0.2-SNAPSHOT)";
 }
 //-->
 </script>
@@ -63,8 +63,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 <div class="subNav">
     <div>
         <ul class="navList">
-            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/json/EnumMarshaller" target="_top">Frames</a></li>
-            <li><a href="EnumMarshaller.html" target="_top">No Frames</a></li>
+            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/json/SimpleEnumMarshaller" target="_top">Frames</a></li>
+            <li><a href="SimpleEnumMarshaller.html" target="_top">No Frames</a></li>
         </ul>
     </div>
     <div>
@@ -87,11 +87,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 
     <div class="subTitle">Package: <strong>org.grails.web.converters.marshaller.json</strong></div>
 
-    <h2 title="[Java] Class EnumMarshaller" class="title">[Java] Class EnumMarshaller</h2>
+    <h2 title="[Java] Class SimpleEnumMarshaller" class="title">[Java] Class SimpleEnumMarshaller</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li>org.grails.web.converters.marshaller.json.EnumMarshaller
+<li><ul class="inheritance"></ul></li><li>org.grails.web.converters.marshaller.json.SimpleEnumMarshaller
 </ul>
 <div class="description">
     <ul class="blockList">
@@ -106,12 +106,13 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>public class EnumMarshaller
+<pre>public class SimpleEnumMarshaller
 extends java.lang.Object
 implements <a href='../../../../../../org/grails/web/converters/marshaller/ObjectMarshaller.html'>ObjectMarshaller</a></pre>
 
-    <p>
-  <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL><DL><DT><B>Since:</B></DT><DD>1.1</DD></DL></p>
+    <p> Marshals enums as simple string values (just the enum name) for symmetric serialization/deserialization.
+ This provides round-trip compatibility where POSTing JSON returns the same format when GETting.
+  <DL><DT><B>Since:</B></DT><DD>7.0.2</DD></DL></p>
 
           </li>
     </ul>
@@ -256,8 +257,8 @@ implements <a href='../../../../../../org/grails/web/converters/marshaller/Objec
 <div class="subNav">
     <div>
         <ul class="navList">
-            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/json/EnumMarshaller" target="_top">Frames</a></li>
-            <li><a href="EnumMarshaller.html" target="_top">No Frames</a></li>
+            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/json/SimpleEnumMarshaller" target="_top">Frames</a></li>
+            <li><a href="SimpleEnumMarshaller.html" target="_top">No Frames</a></li>
         </ul>
     </div>
     <div>
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-frame.html b/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-frame.html
index b110cabcb40..471d8c44ba3 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-frame.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-frame.html
@@ -43,7 +43,7 @@
 <div class="indexContainer">
     <h2>Classes</h2>
     <ul>
-        <li><a href="ArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">ArrayMarshaller</a></li><li><a href="ByteArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">ByteArrayMarshaller</a></li><li><a href="CalendarMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">CalendarMarshaller</a></li><li><a href="CollectionMarshaller.html" title="class in  [...]
+        <li><a href="ArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">ArrayMarshaller</a></li><li><a href="ByteArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">ByteArrayMarshaller</a></li><li><a href="CalendarMarshaller.html" title="class in org.grails.web.converters.marshaller.json" target="classFrame">CalendarMarshaller</a></li><li><a href="CollectionMarshaller.html" title="class in  [...]
     </ul>
 </div>
 
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-summary.html b/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-summary.html
index 642b83fab5f..4de5e8ce26d 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-summary.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/json/package-summary.html
@@ -225,6 +225,15 @@ function windowTitle()
                             </td>
                             <td>JSON ObjectMarshaller which converts an OffsetDateTime to ISO-8601 format with timezone offset.</td>
                         </tr>
+<tr class="altColor">
+                            <td class="colOne">
+                                <strong><a href="SimpleEnumMarshaller.html" title="class in org/grails/web/converters/marshaller/json">
+                                    SimpleEnumMarshaller
+                                </a></strong>
+                            </td>
+                            <td>Marshals enums as simple string values (just the enum name) for symmetric serialization/deserialization.
+ </td>
+                        </tr>
 <tr class="altColor">
                             <td class="colOne">
                                 <strong><a href="ToStringBeanMarshaller.html" title="class in org/grails/web/converters/marshaller/json">
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html
index 409f041ee37..68712324d11 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html
@@ -106,11 +106,14 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>public class EnumMarshaller
+<pre>@java.lang.Deprecated(forRemoval = true, since = "7.0.2")
+public class EnumMarshaller
 extends java.lang.Object
 implements <a href='../../../../../../org/grails/web/converters/marshaller/ObjectMarshaller.html'>ObjectMarshaller</a></pre>
 
-    <p>
+    <p><DL><DT><B>deprecated:</B></DT><DD>As of 7.0.2, replaced by <a href='../../../../../../org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html' title='SimpleEnumMarshaller'>SimpleEnumMarshaller</a> for round-trip compatibility.
+             This marshaller will no longer be registered by default in Grails 8.0.
+             To opt-in to the new behavior now, set <CODE>grails.converters.xml.enum.format=simple</CODE> in application.yml.</DD></DL>
   <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL><DL><DT><B>Since:</B></DT><DD>1.1</DD></DL></p>
 
           </li>
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html
similarity index 92%
copy from docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html
copy to docs/snapshot/api/org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html
index 409f041ee37..9d61064075f 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/EnumMarshaller.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller.html
@@ -27,7 +27,7 @@
 <html>
 <head>
     <!-- Generated by groovydoc (4.0.29) -->
-    <title>EnumMarshaller (Grails 7.0.2-SNAPSHOT)</title>
+    <title>SimpleEnumMarshaller (Grails 7.0.2-SNAPSHOT)</title>
     
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <link href="../../../../../../groovy.ico" type="image/x-icon" rel="shortcut icon">
@@ -37,7 +37,7 @@
 <body class="center">
 <script type="text/javascript"><!--
 if (location.href.indexOf('is-external=true') == -1) {
-    parent.document.title="EnumMarshaller (Grails 7.0.2-SNAPSHOT)";
+    parent.document.title="SimpleEnumMarshaller (Grails 7.0.2-SNAPSHOT)";
 }
 //-->
 </script>
@@ -63,8 +63,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 <div class="subNav">
     <div>
         <ul class="navList">
-            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/xml/EnumMarshaller" target="_top">Frames</a></li>
-            <li><a href="EnumMarshaller.html" target="_top">No Frames</a></li>
+            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller" target="_top">Frames</a></li>
+            <li><a href="SimpleEnumMarshaller.html" target="_top">No Frames</a></li>
         </ul>
     </div>
     <div>
@@ -87,11 +87,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 
     <div class="subTitle">Package: <strong>org.grails.web.converters.marshaller.xml</strong></div>
 
-    <h2 title="[Java] Class EnumMarshaller" class="title">[Java] Class EnumMarshaller</h2>
+    <h2 title="[Java] Class SimpleEnumMarshaller" class="title">[Java] Class SimpleEnumMarshaller</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li>org.grails.web.converters.marshaller.xml.EnumMarshaller
+<li><ul class="inheritance"></ul></li><li>org.grails.web.converters.marshaller.xml.SimpleEnumMarshaller
 </ul>
 <div class="description">
     <ul class="blockList">
@@ -106,12 +106,13 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>public class EnumMarshaller
+<pre>public class SimpleEnumMarshaller
 extends java.lang.Object
 implements <a href='../../../../../../org/grails/web/converters/marshaller/ObjectMarshaller.html'>ObjectMarshaller</a></pre>
 
-    <p>
-  <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL><DL><DT><B>Since:</B></DT><DD>1.1</DD></DL></p>
+    <p> Marshals enums as simple string values (just the enum name) for symmetric serialization/deserialization.
+ This provides round-trip compatibility where POSTing XML returns the same format when GETting.
+  <DL><DT><B>Since:</B></DT><DD>7.0.2</DD></DL></p>
 
           </li>
     </ul>
@@ -256,8 +257,8 @@ implements <a href='../../../../../../org/grails/web/converters/marshaller/Objec
 <div class="subNav">
     <div>
         <ul class="navList">
-            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/xml/EnumMarshaller" target="_top">Frames</a></li>
-            <li><a href="EnumMarshaller.html" target="_top">No Frames</a></li>
+            <li><a href="../../../../../../index.html?org/grails/web/converters/marshaller/xml/SimpleEnumMarshaller" target="_top">Frames</a></li>
+            <li><a href="SimpleEnumMarshaller.html" target="_top">No Frames</a></li>
         </ul>
     </div>
     <div>
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-frame.html b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-frame.html
index 02d4f4c6cc2..fa94379df73 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-frame.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-frame.html
@@ -43,7 +43,7 @@
 <div class="indexContainer">
     <h2>Classes</h2>
     <ul>
-        <li><a href="ArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">ArrayMarshaller</a></li><li><a href="Base64ByteArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">Base64ByteArrayMarshaller</a></li><li><a href="CollectionMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">CollectionMarshaller</a></li><li><a href="DateMarshaller.html" title="cl [...]
+        <li><a href="ArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">ArrayMarshaller</a></li><li><a href="Base64ByteArrayMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">Base64ByteArrayMarshaller</a></li><li><a href="CollectionMarshaller.html" title="class in org.grails.web.converters.marshaller.xml" target="classFrame">CollectionMarshaller</a></li><li><a href="DateMarshaller.html" title="cl [...]
     </ul>
 </div>
 
diff --git a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-summary.html b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-summary.html
index b332efdf205..8071f9a7e18 100644
--- a/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-summary.html
+++ b/docs/snapshot/api/org/grails/web/converters/marshaller/xml/package-summary.html
@@ -176,6 +176,15 @@ function windowTitle()
                             </td>
                             <td> <DL><DT><B>Authors:</B></DT><DD>Siegfried Puchbauer</DD></DL></td>
                         </tr>
+<tr class="altColor">
+                            <td class="colOne">
+                                <strong><a href="SimpleEnumMarshaller.html" title="class in org/grails/web/converters/marshaller/xml">
+                                    SimpleEnumMarshaller
+                                </a></strong>
+                            </td>
+                            <td>Marshals enums as simple string values (just the enum name) for symmetric serialization/deserialization.
+ </td>
+                        </tr>
 <tr class="altColor">
                             <td class="colOne">
                                 <strong><a href="ToStringBeanMarshaller.html" title="class in org/grails/web/converters/marshaller/xml">
diff --git a/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html b/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
index 940cf4703fd..9b482de3ee9 100644
--- a/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
+++ b/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
@@ -280,7 +280,7 @@ implements <a href='../../../../org/grails/encoder/EncodedAppenderFactory.html'>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#activateDestination()'>activateDestination</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(char)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence, int, int) [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#activateDestination()'>activateDestination</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(char)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence, int, int) [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>GrailsPrintWriterAdapter</a></code></td>
diff --git a/docs/snapshot/grails-data/api/index-all.html b/docs/snapshot/grails-data/api/index-all.html
index 2d7a0a32c34..0d640b9702a 100644
--- a/docs/snapshot/grails-data/api/index-all.html
+++ b/docs/snapshot/grails-data/api/index-all.html
@@ -319,7 +319,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/collection/PersistentList.html#add(int, java.lang.Object)" title="Method in PersistentList">add(int, java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/mapping/collection/PersistentList.html">PersistentList</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query">add(Junction, org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query">add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
 </dt><dd> <div class="block">Adds the specified criterion instance to the given junction</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query.Junction">add(org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.Junction.html">Query.Junction</a>
 </dt><dd> <div class="block"></div></dd>
@@ -394,9 +394,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html#addListener(ConnectionSourcesListener<T,S>)" title="Method in ConnectionSources">addListener(ConnectionSourcesListener&lt;T,S&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html">ConnectionSources</a>
 </dt><dd> <div class="block">Adds a listener</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in AbstractMappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in MappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(Listener)" title="Method in MappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
 </dt><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="grails/gorm/validation/DefaultConstrainedProperty.html#addMetaConstraint(java.lang.String, java.lang.Object)" title="Method in DefaultConstrainedProperty">addMetaConstraint(java.lang.String, java.lang.Object)</a></span> - Method in <a href="grails/gorm/validation/DefaultConstrainedProperty.html">DefaultConstrainedProperty</a>
 </dt><dd> <div class="block">Adds a meta constraints which is a non-validating informational constraint.</div></dd>
@@ -2832,7 +2832,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/AbstractSession.html#executePendings(Collection<? extends Runnable>)" title="Method in AbstractSession">executePendings(Collection&lt;? extends Runnable&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/AbstractSession.html">AbstractSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/AssociationQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in AssociationQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/AssociationQuery.html">AssociationQuery</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/AssociationQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)" title="Method in AssociationQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/AssociationQuery.html">AssociationQuery</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/GormEntity.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in GormEntity">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/GormEntity.html">GormEntity</a>
 </dt><dd> <div class="block">Executes a query for the given String</div></dd>
@@ -2840,7 +2840,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/gorm/api/GormStaticOperations.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in GormStaticOperations">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="grails/gorm/api/GormStaticOperations.html">GormStaticOperations</a>
 </dt><dd> <div class="block">Executes a query for the given String</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in Query">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)" title="Method in Query">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
 </dt><dd> <div class="block">Subclasses should implement this to provide the concrete implementation
  of querying</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in TenantDelegatingGormOperations">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.html">TenantDelegatingGormOperations</a>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 131483373a8..7cb93e3c663 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
@@ -288,7 +288,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
index cf86108aba3..a3c25b1af5d 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
@@ -294,7 +294,7 @@ extends <a href='../../../../../../../org/grails/datastore/mapping/model/Abstrac
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
+                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
index 7d52a9865c1..cc6eba2836a 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
@@ -283,7 +283,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
index ce6fa1d5770..4932d8d75bf 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
@@ -193,7 +193,7 @@ public interface MappingContext</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p> Adds a new mapping context listener instance
       <DL><DT><B>Parameters:</B></DT><DD><code>listener</code> -  The listener</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
index 2754ea435bc..57ae0d37540 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
@@ -196,7 +196,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../Junction.html'>Junction</a> j)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> j)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -221,7 +221,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.html'>Query</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/datastore/mapping/query/Quer [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#allEq(Map)'>allEq</a>, <a href='../../../../. [...]
                         </tr>
                     </table>
                    </ul>
@@ -273,10 +273,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)"><!-- --></a>
+                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../Junction.html'>Junction</a> j)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> j)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
index 850cf4f797f..677099c9e08 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Conjunction
-extends <a href='../../../../../Junction.html'>Junction</a></pre>
+extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
 
     <p> A Criterion used to combine to criterion in a logical AND
      </p>
@@ -157,6 +157,29 @@ extends <a href='../../../../../Junction.html'>Junction</a></pre>
         
 
         
+        <!-- ========== METHOD SUMMARY =========== -->
+        <ul class="blockList">
+            
+            <li class="blockList"><a name="method_summary"><!--   --></a>
+                    <h3>Inherited Methods Summary</h3>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
+                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Methods inherited from class</th>
+                            <th class="colLast" scope="col">Name</th>
+                        </tr>
+                        
+                        <tr class="altColor">
+                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
+        </ul>
+        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
index 407c795dc0d..eb28383b827 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Disjunction
-extends <a href='../../../../../Junction.html'>Junction</a></pre>
+extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
 
     <p> A Criterion used to combine to criterion in a logical OR
      </p>
@@ -157,6 +157,29 @@ extends <a href='../../../../../Junction.html'>Junction</a></pre>
         
 
         
+        <!-- ========== METHOD SUMMARY =========== -->
+        <ul class="blockList">
+            
+            <li class="blockList"><a name="method_summary"><!--   --></a>
+                    <h3>Inherited Methods Summary</h3>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
+                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Methods inherited from class</th>
+                            <th class="colLast" scope="col">Name</th>
+                        </tr>
+                        
+                        <tr class="altColor">
+                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
+        </ul>
+        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
index 45c4856ca28..9020340075f 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
@@ -176,7 +176,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#add(org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</code><br></td>
                         </tr>
                         
@@ -271,7 +271,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         <a name="add(org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
index 7a86a84f11c..719371251d0 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Negation
-extends <a href='../../../../../Junction.html'>Junction</a></pre>
+extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
 
     <p> A criterion used to negate several other criterion
      </p>
@@ -131,6 +131,29 @@ extends <a href='../../../../../Junction.html'>Junction</a></pre>
         
 
         
+        <!-- ========== METHOD SUMMARY =========== -->
+        <ul class="blockList">
+            
+            <li class="blockList"><a name="method_summary"><!--   --></a>
+                    <h3>Inherited Methods Summary</h3>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
+                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Methods inherited from class</th>
+                            <th class="colLast" scope="col">Name</th>
+                        </tr>
+                        
+                        <tr class="altColor">
+                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
+        </ul>
+        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
index bda9eec19b0..da69a5eae8c 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
@@ -542,7 +542,7 @@ implements java.lang.Cloneable</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../Junction.html'>Junction</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#criteria">criteria</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -673,7 +673,7 @@ implements java.lang.Cloneable</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../Junction.html'>Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</code><br>Adds the specified criterion instance to the given junction</td>
+                            <td class="colLast"><code><strong><a href="#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</code><br>Adds the specified criterion instance to the given junction</td>
                         </tr>
                         
                         <tr class="altColor">
@@ -708,7 +708,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#conjunction()">conjunction</a></strong>()</code><br>Creates a conjunction (AND) query</td>
                         </tr>
                         
@@ -720,7 +720,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#disjunction()">disjunction</a></strong>()</code><br>Creates a disjunction (OR) query</td>
                         </tr>
                         
@@ -733,7 +733,7 @@ implements java.lang.Cloneable</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;abstract&nbsp;java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../Junction.html'>Junction</a> criteria)</code><br>Subclasses should implement this to provide the concrete implementation
+                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> criteria)</code><br>Subclasses should implement this to provide th [...]
  of querying</td>
                         </tr>
                         
@@ -764,7 +764,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#getCriteria()">getCriteria</a></strong>()</code><br> <DL><DT><B>Returns:</B></DT><DD>The criteria defined by this query</DD></DL></td>
                         </tr>
                         
@@ -908,7 +908,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#negation()">negation</a></strong>()</code><br>Creates a negation of several criterion</td>
                         </tr>
                         
@@ -1016,7 +1016,7 @@ implements java.lang.Cloneable</pre>
                         <a name="criteria"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>criteria</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>criteria</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1155,10 +1155,10 @@ implements java.lang.Cloneable</pre>
                             </li>
                         </ul>
                     
-                        <a name="add(Junction, org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
+                        <a name="add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>add</strong>(<a href='../../../../../Junction.html'>Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</h4>
+                                <h4>public&nbsp;void <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</h4>
                                 <p> Adds the specified criterion instance to the given junction
       <DL><DT><B>Parameters:</B></DT><DD><code>currentJunction</code> -  The junction to add the criterion to</DD><DD><code>criterion</code> -  The criterion instance</DD></DL></p>
                             </li>
@@ -1211,7 +1211,7 @@ implements java.lang.Cloneable</pre>
                         <a name="conjunction()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>conjunction</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>conjunction</strong>()</h4>
                                 <p> Creates a conjunction (AND) query
       <DL><DT><B>Returns:</B></DT><DD>The Junction instance</DD></DL></p>
                             </li>
@@ -1229,7 +1229,7 @@ implements java.lang.Cloneable</pre>
                         <a name="disjunction()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>disjunction</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>disjunction</strong>()</h4>
                                 <p> Creates a disjunction (OR) query
       <DL><DT><B>Returns:</B></DT><DD>The Junction instance</DD></DL></p>
                             </li>
@@ -1244,10 +1244,10 @@ implements java.lang.Cloneable</pre>
                             </li>
                         </ul>
                     
-                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)"><!-- --></a>
+                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;abstract&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../Junction.html'>Junction</a> criteria)</h4>
+                                <h4>protected&nbsp;abstract&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> criteria)</h4>
                                 <p> Subclasses should implement this to provide the concrete implementation
  of querying
       <DL><DT><B>Parameters:</B></DT><DD><code>entity</code> -  The entity</DD><DD><code>criteria</code> -  The criteria</DD></DL><DL><DT><B>Returns:</B></DT><DD>The results</DD></DL></p>
@@ -1294,7 +1294,7 @@ implements java.lang.Cloneable</pre>
                         <a name="getCriteria()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>getCriteria</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>getCriteria</strong>()</h4>
                                 <p>
       <DL><DT><B>Returns:</B></DT><DD>The criteria defined by this query</DD></DL></p>
                             </li>
@@ -1510,7 +1510,7 @@ implements java.lang.Cloneable</pre>
                         <a name="negation()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>negation</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>negation</strong>()</h4>
                                 <p> Creates a negation of several criterion
       <DL><DT><B>Returns:</B></DT><DD>The negation</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 523ff22f914..b4b8e3ee74b 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/developer-manual/gettingStarted.html b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
index def4402c958..1c0a9b33443 100644
--- a/docs/snapshot/grails-data/developer-manual/gettingStarted.html
+++ b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
@@ -523,7 +523,7 @@ cd grails-core</pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/introduction.html b/docs/snapshot/grails-data/developer-manual/introduction.html
index 4086b052791..5e165fba5c0 100644
--- a/docs/snapshot/grails-data/developer-manual/introduction.html
+++ b/docs/snapshot/grails-data/developer-manual/introduction.html
@@ -476,7 +476,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/stepByStep.html b/docs/snapshot/grails-data/developer-manual/stepByStep.html
index a2c5b99829b..dc899bbc712 100644
--- a/docs/snapshot/grails-data/developer-manual/stepByStep.html
+++ b/docs/snapshot/grails-data/developer-manual/stepByStep.html
@@ -621,7 +621,7 @@ class XyzTestSuite {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/testing.html b/docs/snapshot/grails-data/developer-manual/testing.html
index 2b9129d231e..7d0fbf17d54 100644
--- a/docs/snapshot/grails-data/developer-manual/testing.html
+++ b/docs/snapshot/grails-data/developer-manual/testing.html
@@ -511,7 +511,7 @@ class PagedResultSpec extends GormDatastoreSpec{
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi.html b/docs/snapshot/grails-data/developer-manual/understandingApi.html
index e7c25f6a47f..6c64d2152c2 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi.html
@@ -454,7 +454,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html b/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
index 4269731e789..e8fcd1e8030 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
@@ -561,7 +561,7 @@ protected Session createSession(PropertyResolver connDetails) {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html b/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
index 7a71b6d264b..fa9046e0279 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
@@ -496,7 +496,7 @@ class Neo4jEntityTraitProvider implements GormEntityTraitProvider {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html b/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
index 1d57584147e..50fe8a2adbc 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
@@ -488,7 +488,7 @@ enhancer.enhance()</code></pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
index dbb6ee2d364..d099cfcb5e1 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
@@ -673,7 +673,7 @@ protected void deleteEntry(String family, final Object key, final Object entry)
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
index 451ba5fece3..92f229cd8d2 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
@@ -588,7 +588,7 @@ If, for instance, the underlying datastore does not support the calculation of a
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html b/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
index 4b1c22c48c4..9a68aefc469 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
@@ -526,7 +526,7 @@ If the underlying datastore supports secondary indexes then it is ok to just ret
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/hibernate5/api/index-all.html b/docs/snapshot/grails-data/hibernate5/api/index-all.html
index ca463d82c8b..d3d7de5a9e4 100644
--- a/docs/snapshot/grails-data/hibernate5/api/index-all.html
+++ b/docs/snapshot/grails-data/hibernate5/api/index-all.html
@@ -486,9 +486,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html#addListener(ConnectionSourcesListener<T,S>)" title="Method in ConnectionSources">addListener(ConnectionSourcesListener&lt;T,S&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html">ConnectionSources</a>
 </dt><dd> <div class="block">Adds a listener</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in AbstractMappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in MappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(Listener)" title="Method in MappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
 </dt><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollec [...]
 </dt><dd> <div class="block">Add a Hibernate filter for multitenancy if the persistent class is multitenant</div></dd>
@@ -2419,7 +2419,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 5bce731d7f3..9997952ad55 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
index 8f7fd6159fb..2376fe5ff1d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -659,7 +659,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index e1af502a5f4..ccffe2e4632 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
index 624dc3d2d01..48fe8e780a3 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -687,7 +687,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 011773b66fd..1cfea6efb26 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
@@ -288,7 +288,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
index ac29c59f101..180230d0163 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
@@ -294,7 +294,7 @@ extends <a href='../../../../../../../org/grails/datastore/mapping/model/Abstrac
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
+                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
index 615d0aa114a..5e5e45372f7 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
@@ -283,7 +283,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
index 1cfc0d80932..11240c720d7 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
@@ -193,7 +193,7 @@ public interface MappingContext</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p> Adds a new mapping context listener instance
       <DL><DT><B>Parameters:</B></DT><DD><code>listener</code> -  The listener</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
index 46d707acd8b..4c30e31368d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
@@ -321,7 +321,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 7bc065a2294..26d42451344 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
index 2bf89320746..b0260274072 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
@@ -272,7 +272,7 @@ extends <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappi
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../org/grails/datastore/m [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../org/grails/datastore/m [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html b/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
index b56d8891831..0c3d4fe9f12 100644
--- a/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
+++ b/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
@@ -534,7 +534,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html'>AbstractHibernateCriteriaBuilder</a></code></td>
-                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
+                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/index-all.html b/docs/snapshot/grails-data/mongodb/api/index-all.html
index a58b3062f76..31e9c2c3627 100644
--- a/docs/snapshot/grails-data/mongodb/api/index-all.html
+++ b/docs/snapshot/grails-data/mongodb/api/index-all.html
@@ -1258,7 +1258,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
@@ -5240,9 +5240,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#order(java.lang.String, java.lang.String)" title="Method in AbstractHibernateCriteriaBuilder">order(java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html">AbstractHibernateCriteriaBuilder</a>
 </dt><dd> <div class="block">Orders by the specified property name and direction</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#order(org.hibernate.criterion.Order)" title="Method in AbstractHibernateQuery">order(org.hibernate.criterion.Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#order(Order)" title="Method in AbstractHibernateQuery">order(Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html#order(org.hibernate.criterion.Order)" title="Method in AbstractHibernateQuery.HibernateAssociationQuery">order(org.hibernate.criterion.Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html">AbstractHibernateQuery.HibernateAssociationQuery</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html#order(Order)" title="Method in AbstractHibernateQuery.HibernateAssociationQuery">order(Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html">AbstractHibernateQuery.HibernateAssociationQuery</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html#ORDER_ASC" title="Field in GrailsHibernateUtil">ORDER_ASC</a></span> - Field in <a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html">GrailsHibernateUtil</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
index b509e4926f7..27f8d4ce1ba 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
index d0a82213fab..81c73316b19 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends org.bson.AbstractBsonReader</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -677,7 +677,7 @@ extends org.bson.AbstractBsonReader</pre>
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 6c32e3c6d67..ee446f1e40c 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
index 29a58117846..351402aaf93 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends org.bson.AbstractBsonWriter</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -705,7 +705,7 @@ extends org.bson.AbstractBsonWriter</pre>
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
index 1a20aecf216..432f1d65de7 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
@@ -488,7 +488,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.criterion.ProjectionList</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#projectionList">projectionList</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -666,7 +666,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.criterion.Order</code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../Order.html'>Order</a></code></td>
                             <td class="colLast"><code><strong><a href="#convertOrder(org.grails.datastore.mapping.query.Query$Order, java.lang.String)">convertOrder</a></strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</code><br></td>
                         </tr>
                         
@@ -1247,7 +1247,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.api.Criteria</code></td>
-                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order o)</code><br>Orders by the specified property name (defaults to ascending)</td>
+                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> o)</code><br>Orders by the specified property name (defaults to ascending)</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1906,7 +1906,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="projectionList"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.criterion.ProjectionList <strong>projectionList</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projectionList</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2122,7 +2122,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="convertOrder(org.grails.datastore.mapping.query.Query$Order, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.criterion.Order <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../Order.html'>Order</a> <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2949,10 +2949,10 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                             </li>
                         </ul>
                     
-                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
+                        <a name="order(Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(org.hibernate.criterion.Order o)</h4>
+                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> o)</h4>
                                 <p> Orders by the specified property name (defaults to ascending)
       <DL><DT><B>Parameters:</B></DT><DD><code>o</code> -  The property name to order by</DD></DL><DL><DT><B>Returns:</B></DT><DD>A Order instance</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
index 32bdb1abeb0..2e9516c1ea1 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
@@ -351,7 +351,7 @@ extends org.grails.datastore.mapping.query.AssociationQuery</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.Query</code></td>
-                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -662,10 +662,10 @@ extends org.grails.datastore.mapping.query.AssociationQuery</pre>
                             </li>
                         </ul>
                     
-                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
+                        <a name="order(Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
index bbfd98bdd08..df2a32905cd 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>protected class AbstractHibernateQuery.HibernateProjectionList
-extends org.hibernate.criterion.ProjectionList</pre>
+extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
 
           </li>
     </ul>
@@ -144,19 +144,19 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#add(Projection)">add</a></strong>(<a href='../../../../../Projection.html'>Projection</a> p)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#avg(java.lang.String)">avg</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#count()">count</a></strong>()</code><br></td>
                         </tr>
                         
@@ -174,7 +174,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#distinct()">distinct</a></strong>()</code><br></td>
                         </tr>
                         
@@ -186,7 +186,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#id()">id</a></strong>()</code><br></td>
                         </tr>
                         
@@ -204,19 +204,19 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#max(java.lang.String)">max</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#min(java.lang.String)">min</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#property(java.lang.String)">property</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
@@ -228,7 +228,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#sum(java.lang.String)">sum</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
@@ -236,24 +236,6 @@ extends org.hibernate.criterion.ProjectionList</pre>
                    </ul>
               </li>
             
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class org.hibernate.criterion.ProjectionList</code></td>
-                            <td class="colLast"><code>org.hibernate.criterion.ProjectionList#add(org.hibernate.criterion.Projection), org.hibernate.criterion.ProjectionList#add(org.hibernate.criterion.Projection, java.lang.String), org.hibernate.criterion.ProjectionList#create(), org.hibernate.criterion.ProjectionList#equals(java.lang.Object), org.hibernate.criterion.ProjectionList#getAliases(), org.hibernate.criterion.ProjectionList#getClass(), org.hibernate.criterion.ProjectionList#get [...]
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
@@ -285,7 +267,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="add(Projection)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -293,7 +275,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="avg(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>avg</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>avg</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -301,7 +283,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="count()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>count</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>count</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -325,7 +307,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="distinct()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>distinct</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>distinct</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -341,7 +323,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="id()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>id</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>id</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -365,7 +347,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="max(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>max</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>max</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -373,7 +355,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="min(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>min</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>min</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -381,7 +363,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="property(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>property</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>property</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -397,7 +379,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="sum(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>sum</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>sum</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
index 069fe10a32e..ac2e7dda527 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
@@ -647,12 +647,12 @@ extends org.grails.datastore.mapping.query.Query</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.Query</code></td>
-                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#projections()">projections</a></strong>()</code><br></td>
                         </tr>
                         
@@ -1330,10 +1330,10 @@ extends org.grails.datastore.mapping.query.Query</pre>
                             </li>
                         </ul>
                     
-                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
+                        <a name="order(Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1341,7 +1341,7 @@ extends org.grails.datastore.mapping.query.Query</pre>
                         <a name="projections()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>projections</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projections</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
index 6cd75b61ff7..9ecd2362794 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
@@ -293,7 +293,7 @@ extends <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernate
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html'>AbstractHibernateQuery</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#add(org.hibernate.criterion.Criterion)'>add</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/orm/hibernate [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#add(org.hibernate.criterion.Criterion)'>add</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/orm/hibernate [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/whats-new-manual/index.html b/docs/snapshot/grails-data/whats-new-manual/index.html
index 9dd88d8d2e3..ff99582e64a 100644
--- a/docs/snapshot/grails-data/whats-new-manual/index.html
+++ b/docs/snapshot/grails-data/whats-new-manual/index.html
@@ -527,7 +527,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.2-SNAPSHOT<br>
-Last updated 2025-11-05 17:34:54 UTC
+Last updated 2025-11-05 22:20:53 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/guide/pages/upgrading60x.html b/docs/snapshot/guide/pages/upgrading60x.html
index 6d64db337d5..da0e3162cba 100644
--- a/docs/snapshot/guide/pages/upgrading60x.html
+++ b/docs/snapshot/guide/pages/upgrading60x.html
@@ -1200,6 +1200,104 @@ tasks.withType(JavaExec).configureEach {
 </div>
 </div>
 </div>
+<div class="sect4">
+<h5 id="_12_26_enum_jsonxml_serialization">12.26 Enum JSON/XML Serialization</h5>
+<div class="paragraph">
+<p>As of Grails 7.0.2, enum serialization has been enhanced to support round-trip compatibility between JSON/XML serialization and deserialization. The legacy enum marshaller, which produced verbose output with type metadata, has been deprecated in favor of a simpler format that matches how enums are expected on input.</p>
+</div>
+<div class="sect5">
+<h6 id="_legacy_behavior_deprecated">Legacy Behavior (Deprecated)</h6>
+<div class="paragraph">
+<p>Previously, enums were serialized with metadata:</p>
+</div>
+<div class="paragraph">
+<p><strong>JSON:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="json">{
+  <span class="key"><span class="delimiter">&quot;</span><span class="content">stage</span><span class="delimiter">&quot;</span></span>: {
+    <span class="key"><span class="delimiter">&quot;</span><span class="content">enumType</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.example.ChallengeStage</span><span class="delimiter">&quot;</span></span>,
+    <span class="key"><span class="delimiter">&quot;</span><span class="content">name</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">SUBMIT</span><span class="delimiter">&quot;</span></span>
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>XML:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;stage</span> <span class="attribute-name">enumType</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">com.example.ChallengeStage</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>SUBMIT<span class="tag">&lt;/stage&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This format is <strong>asymmetric</strong> - when POSTing data, you send <code>"stage":"SUBMIT"</code>, but when GETting data, you receive the verbose object structure.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_new_behavior_recommended">New Behavior (Recommended)</h6>
+<div class="paragraph">
+<p>The new <code>SimpleEnumMarshaller</code> serializes enums as simple string values, providing <strong>round-trip compatibility</strong>:</p>
+</div>
+<div class="paragraph">
+<p><strong>JSON:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="json">{
+  <span class="key"><span class="delimiter">&quot;</span><span class="content">stage</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">SUBMIT</span><span class="delimiter">&quot;</span></span>
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>XML:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;stage&gt;</span>SUBMIT<span class="tag">&lt;/stage&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now the format you POST is the same format you GET back.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_migration">Migration</h6>
+<div class="paragraph">
+<p>To opt-in to the new behavior, add the following to your <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yml"><span class="key">grails</span>:
+  <span class="key">converters</span>:
+    <span class="key">json</span>:
+      <span class="key">enum</span>:
+        <span class="key">format</span>: <span class="string"><span class="content">simple</span></span>
+    <span class="key">xml</span>:
+      <span class="key">enum</span>:
+        <span class="key">format</span>: <span class="string"><span class="content">simple</span></span></code></pre>
+</div>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_deprecation_timeline">Deprecation Timeline</h6>
+<div class="ulist">
+<ul>
+<li>
+<p><strong>7.0.2</strong>: Legacy <code>EnumMarshaller</code> deprecated (default), <code>SimpleEnumMarshaller</code> available via config</p>
+</li>
+<li>
+<p><strong>8.0</strong>: <code>SimpleEnumMarshaller</code> will become the default</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The legacy <code>org.grails.web.converters.marshaller.json.EnumMarshaller</code> and <code>org.grails.web.converters.marshaller.xml.EnumMarshaller</code> classes are marked as <code>@Deprecated(forRemoval = true, since = "7.0.2")</code> and will be removed in Grails 8.0.</p>
+</div>
+</div>
+</div>
 </div>
 </div>
 
diff --git a/docs/snapshot/guide/single.html b/docs/snapshot/guide/single.html
index fd17610117d..8aa63bbade1 100644
--- a/docs/snapshot/guide/single.html
+++ b/docs/snapshot/guide/single.html
@@ -3373,6 +3373,104 @@ tasks.withType(JavaExec).configureEach {
 </div>
 </div>
 </div>
+<div class="sect4">
+<h5 id="_12_26_enum_jsonxml_serialization">12.26 Enum JSON/XML Serialization</h5>
+<div class="paragraph">
+<p>As of Grails 7.0.2, enum serialization has been enhanced to support round-trip compatibility between JSON/XML serialization and deserialization. The legacy enum marshaller, which produced verbose output with type metadata, has been deprecated in favor of a simpler format that matches how enums are expected on input.</p>
+</div>
+<div class="sect5">
+<h6 id="_legacy_behavior_deprecated">Legacy Behavior (Deprecated)</h6>
+<div class="paragraph">
+<p>Previously, enums were serialized with metadata:</p>
+</div>
+<div class="paragraph">
+<p><strong>JSON:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="json">{
+  <span class="key"><span class="delimiter">&quot;</span><span class="content">stage</span><span class="delimiter">&quot;</span></span>: {
+    <span class="key"><span class="delimiter">&quot;</span><span class="content">enumType</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.example.ChallengeStage</span><span class="delimiter">&quot;</span></span>,
+    <span class="key"><span class="delimiter">&quot;</span><span class="content">name</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">SUBMIT</span><span class="delimiter">&quot;</span></span>
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>XML:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;stage</span> <span class="attribute-name">enumType</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">com.example.ChallengeStage</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>SUBMIT<span class="tag">&lt;/stage&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This format is <strong>asymmetric</strong> - when POSTing data, you send <code>"stage":"SUBMIT"</code>, but when GETting data, you receive the verbose object structure.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_new_behavior_recommended">New Behavior (Recommended)</h6>
+<div class="paragraph">
+<p>The new <code>SimpleEnumMarshaller</code> serializes enums as simple string values, providing <strong>round-trip compatibility</strong>:</p>
+</div>
+<div class="paragraph">
+<p><strong>JSON:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="json">{
+  <span class="key"><span class="delimiter">&quot;</span><span class="content">stage</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">SUBMIT</span><span class="delimiter">&quot;</span></span>
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>XML:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;stage&gt;</span>SUBMIT<span class="tag">&lt;/stage&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now the format you POST is the same format you GET back.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_migration">Migration</h6>
+<div class="paragraph">
+<p>To opt-in to the new behavior, add the following to your <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yml"><span class="key">grails</span>:
+  <span class="key">converters</span>:
+    <span class="key">json</span>:
+      <span class="key">enum</span>:
+        <span class="key">format</span>: <span class="string"><span class="content">simple</span></span>
+    <span class="key">xml</span>:
+      <span class="key">enum</span>:
+        <span class="key">format</span>: <span class="string"><span class="content">simple</span></span></code></pre>
+</div>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_deprecation_timeline">Deprecation Timeline</h6>
+<div class="ulist">
+<ul>
+<li>
+<p><strong>7.0.2</strong>: Legacy <code>EnumMarshaller</code> deprecated (default), <code>SimpleEnumMarshaller</code> available via config</p>
+</li>
+<li>
+<p><strong>8.0</strong>: <code>SimpleEnumMarshaller</code> will become the default</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The legacy <code>org.grails.web.converters.marshaller.json.EnumMarshaller</code> and <code>org.grails.web.converters.marshaller.xml.EnumMarshaller</code> classes are marked as <code>@Deprecated(forRemoval = true, since = "7.0.2")</code> and will be removed in Grails 8.0.</p>
+</div>
+</div>
+</div>
 </div>
 </div>
 
diff --git a/docs/snapshot/guide/upgrading.html b/docs/snapshot/guide/upgrading.html
index 70d49b522ec..a6c3ddd7aff 100644
--- a/docs/snapshot/guide/upgrading.html
+++ b/docs/snapshot/guide/upgrading.html
@@ -1229,6 +1229,104 @@ tasks.withType(JavaExec).configureEach {
 </div>
 </div>
 </div>
+<div class="sect4">
+<h5 id="_12_26_enum_jsonxml_serialization">12.26 Enum JSON/XML Serialization</h5>
+<div class="paragraph">
+<p>As of Grails 7.0.2, enum serialization has been enhanced to support round-trip compatibility between JSON/XML serialization and deserialization. The legacy enum marshaller, which produced verbose output with type metadata, has been deprecated in favor of a simpler format that matches how enums are expected on input.</p>
+</div>
+<div class="sect5">
+<h6 id="_legacy_behavior_deprecated">Legacy Behavior (Deprecated)</h6>
+<div class="paragraph">
+<p>Previously, enums were serialized with metadata:</p>
+</div>
+<div class="paragraph">
+<p><strong>JSON:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="json">{
+  <span class="key"><span class="delimiter">&quot;</span><span class="content">stage</span><span class="delimiter">&quot;</span></span>: {
+    <span class="key"><span class="delimiter">&quot;</span><span class="content">enumType</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">com.example.ChallengeStage</span><span class="delimiter">&quot;</span></span>,
+    <span class="key"><span class="delimiter">&quot;</span><span class="content">name</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">SUBMIT</span><span class="delimiter">&quot;</span></span>
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>XML:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;stage</span> <span class="attribute-name">enumType</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">com.example.ChallengeStage</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>SUBMIT<span class="tag">&lt;/stage&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>This format is <strong>asymmetric</strong> - when POSTing data, you send <code>"stage":"SUBMIT"</code>, but when GETting data, you receive the verbose object structure.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_new_behavior_recommended">New Behavior (Recommended)</h6>
+<div class="paragraph">
+<p>The new <code>SimpleEnumMarshaller</code> serializes enums as simple string values, providing <strong>round-trip compatibility</strong>:</p>
+</div>
+<div class="paragraph">
+<p><strong>JSON:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="json">{
+  <span class="key"><span class="delimiter">&quot;</span><span class="content">stage</span><span class="delimiter">&quot;</span></span>: <span class="string"><span class="delimiter">&quot;</span><span class="content">SUBMIT</span><span class="delimiter">&quot;</span></span>
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p><strong>XML:</strong></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="xml"><span class="tag">&lt;stage&gt;</span>SUBMIT<span class="tag">&lt;/stage&gt;</span></code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Now the format you POST is the same format you GET back.</p>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_migration">Migration</h6>
+<div class="paragraph">
+<p>To opt-in to the new behavior, add the following to your <code>application.yml</code>:</p>
+</div>
+<div class="listingblock">
+<div class="title">application.yml</div>
+<div class="content">
+<pre class="CodeRay highlight"><code data-lang="yml"><span class="key">grails</span>:
+  <span class="key">converters</span>:
+    <span class="key">json</span>:
+      <span class="key">enum</span>:
+        <span class="key">format</span>: <span class="string"><span class="content">simple</span></span>
+    <span class="key">xml</span>:
+      <span class="key">enum</span>:
+        <span class="key">format</span>: <span class="string"><span class="content">simple</span></span></code></pre>
+</div>
+</div>
+</div>
+<div class="sect5">
+<h6 id="_deprecation_timeline">Deprecation Timeline</h6>
+<div class="ulist">
+<ul>
+<li>
+<p><strong>7.0.2</strong>: Legacy <code>EnumMarshaller</code> deprecated (default), <code>SimpleEnumMarshaller</code> available via config</p>
+</li>
+<li>
+<p><strong>8.0</strong>: <code>SimpleEnumMarshaller</code> will become the default</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The legacy <code>org.grails.web.converters.marshaller.json.EnumMarshaller</code> and <code>org.grails.web.converters.marshaller.xml.EnumMarshaller</code> classes are marked as <code>@Deprecated(forRemoval = true, since = "7.0.2")</code> and will be removed in Grails 8.0.</p>
+</div>
+</div>
+</div>
 </div>
 </div>