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/10/22 23:10:11 UTC

(grails-website) branch asf-site-production updated: Deploying to documentation branch - 23:10:00

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 7afce854940 Deploying to documentation branch - 23:10:00
7afce854940 is described below

commit 7afce854940971b04e8332e77d75ed5e34261912
Author: codeconsole <co...@users.noreply.github.com>
AuthorDate: Wed Oct 22 23:10:03 2025 +0000

    Deploying to documentation branch - 23:10:00
---
 docs/snapshot/api/allclasses-frame.html            |  1 +
 docs/snapshot/api/deprecated-list.html             |  2 +-
 docs/snapshot/api/index-all.html                   | 30 ++++++---
 .../grails/buffer/GrailsLazyProxyPrintWriter.html  | 12 ++--
 .../grails/buffer/GrailsRoutablePrintWriter.html   | 18 +++---
 .../Jsr310ConvertersConfiguration.22.html}         | 66 +++++++++----------
 .../converters/Jsr310ConvertersConfiguration.html  | 74 ++++++++++++++--------
 .../databinding/converters/package-frame.html      |  2 +-
 .../databinding/converters/package-summary.html    |  8 +++
 .../bson/codecs/encoders/InstantEncoder.html       |  4 +-
 .../bson/codecs/encoders/LocalDateEncoder.html     |  4 +-
 .../bson/codecs/encoders/LocalDateTimeEncoder.html |  4 +-
 .../bson/codecs/encoders/LocalTimeEncoder.html     |  4 +-
 .../codecs/encoders/OffsetDateTimeEncoder.html     |  4 +-
 .../bson/codecs/encoders/OffsetTimeEncoder.html    |  4 +-
 .../bson/codecs/encoders/PeriodEncoder.html        |  4 +-
 .../bson/codecs/encoders/SimpleEncoder.1.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.10.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.11.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.12.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.13.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.2.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.3.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.4.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.5.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.6.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.7.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.8.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.9.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.html        |  4 +-
 .../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 +--
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 +++----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 +--
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 +--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../OutputEncodingStack.OutputProxyWriter.html     |  2 +-
 .../org/grails/web/pages/GSPResponseWriter.html    |  2 +-
 .../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 +-
 .../hibernate5/api/deprecated-list.html            |  2 +-
 .../grails-data/hibernate5/api/index-all.html      | 10 +--
 .../bson/codecs/encoders/InstantEncoder.html       |  4 +-
 .../bson/codecs/encoders/LocalDateEncoder.html     |  4 +-
 .../bson/codecs/encoders/LocalDateTimeEncoder.html |  4 +-
 .../bson/codecs/encoders/LocalTimeEncoder.html     |  4 +-
 .../codecs/encoders/OffsetDateTimeEncoder.html     |  4 +-
 .../bson/codecs/encoders/OffsetTimeEncoder.html    |  4 +-
 .../bson/codecs/encoders/PeriodEncoder.html        |  4 +-
 .../bson/codecs/encoders/SimpleEncoder.1.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.10.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.11.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.12.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.13.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.2.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.3.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.4.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.5.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.6.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.7.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.8.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.9.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.html        |  4 +-
 .../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 +--
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 +++----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 +--
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 +--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../grails-data/mongodb/api/deprecated-list.html   |  2 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |  2 +-
 .../grails-data/mongodb/api/index-all.html         | 14 ++--
 .../bson/codecs/encoders/InstantEncoder.html       |  4 +-
 .../bson/codecs/encoders/LocalDateEncoder.html     |  4 +-
 .../bson/codecs/encoders/LocalDateTimeEncoder.html |  4 +-
 .../bson/codecs/encoders/LocalTimeEncoder.html     |  4 +-
 .../codecs/encoders/OffsetDateTimeEncoder.html     |  4 +-
 .../bson/codecs/encoders/OffsetTimeEncoder.html    |  4 +-
 .../bson/codecs/encoders/PeriodEncoder.html        |  4 +-
 .../bson/codecs/encoders/SimpleEncoder.1.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.10.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.11.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.12.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.13.html     | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.2.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.3.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.4.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.5.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.6.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.7.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.8.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.9.html      | 20 +-----
 .../bson/codecs/encoders/SimpleEncoder.html        |  4 +-
 .../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 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +-
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 +++----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 +--
 ...ceSettings.HibernateSettings.FlushSettings.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 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 +--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../grails-data/whats-new-manual/index.html        |  2 +-
 132 files changed, 427 insertions(+), 1072 deletions(-)

diff --git a/docs/snapshot/api/allclasses-frame.html b/docs/snapshot/api/allclasses-frame.html
index f4a5911435c..bfffd9c61dd 100644
--- a/docs/snapshot/api/allclasses-frame.html
+++ b/docs/snapshot/api/allclasses-frame.html
@@ -1701,6 +1701,7 @@
 <li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.2.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.2</a></li>
 <li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.20.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.20</a></li>
 <li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.21.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.21</a></li>
+<li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.22</a></li>
 <li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.3</a></li>
 <li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.4.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.4</a></li>
 <li><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.5.html" title="class in org.grails.databinding.converters.Jsr310ConvertersConfiguration" target="classFrame">Jsr310ConvertersConfiguration.5</a></li>
diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index 39c06f4bd6d..f6dc690eeef 100644
--- a/docs/snapshot/api/deprecated-list.html
+++ b/docs/snapshot/api/deprecated-list.html
@@ -517,7 +517,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/api/index-all.html b/docs/snapshot/api/index-all.html
index 1f35843850f..6928076ab4b 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.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><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><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>
@@ -15863,6 +15863,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.18.html#getDate(java.util.Calendar)" title="Method in Jsr310ConvertersConfiguration.18">getDate(java.util.Calendar)</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.18.html">Jsr310ConvertersConfiguration.18</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html#getDate(java.util.Calendar)" title="Method in Jsr310ConvertersConfiguration.22">getDate(java.util.Calendar)</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html">Jsr310ConvertersConfiguration.22</a>
+</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html#getDate(java.util.Calendar)" title="Method in Jsr310ConvertersConfiguration.3">getDate(java.util.Calendar)</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html">Jsr310ConvertersConfiguration.3</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.6.html#getDate(java.util.Calendar)" title="Method in Jsr310ConvertersConfiguration.6">getDate(java.util.Calendar)</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.6.html">Jsr310ConvertersConfiguration.6</a>
@@ -20574,6 +20576,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.21.html#getTargetType()" title="Method in Jsr310ConvertersConfiguration.21">getTargetType()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.21.html">Jsr310ConvertersConfiguration.21</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html#getTargetType()" title="Method in Jsr310ConvertersConfiguration.22">getTargetType()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html">Jsr310ConvertersConfiguration.22</a>
+</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html#getTargetType()" title="Method in Jsr310ConvertersConfiguration.3">getTargetType()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html">Jsr310ConvertersConfiguration.3</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.4.html#getTargetType()" title="Method in Jsr310ConvertersConfiguration.4">getTargetType()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.4.html">Jsr310ConvertersConfiguration.4</a>
@@ -22025,7 +22029,7 @@ 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/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Constructor in <a href="o [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -22085,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>
@@ -22220,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>
@@ -25168,6 +25172,8 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block">JSON ObjectMarshaller which converts an Instant to ISO-8601 format with Z suffix.</div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.html#instantStringValueConverter()" title="Method in Jsr310ConvertersConfiguration">instantStringValueConverter()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.html">Jsr310ConvertersConfiguration</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.html#instantStructuredBindingEditor()" title="Method in Jsr310ConvertersConfiguration">instantStructuredBindingEditor()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.html">Jsr310ConvertersConfiguration</a>
+</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.html#instantValueConverter()" title="Method in Jsr310ConvertersConfiguration">instantValueConverter()</a></span> - Method in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.html">Jsr310ConvertersConfiguration</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/cli/profile/AbstractProfile.html#instructions" title="Field in AbstractProfile">instructions</a></span> - Field in <a href="org/grails/cli/profile/AbstractProfile.html">AbstractProfile</a>
@@ -27823,6 +27829,10 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.21.html#Jsr310ConvertersConfiguration.21()" title="Constructor in Jsr310ConvertersConfiguration.21">Jsr310ConvertersConfiguration.21()</a></span> - Constructor in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.21.html">Jsr310ConvertersConfiguration.21</a>
 </dt><dd> <div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html" title="Class in org.grails.databinding.converters.Jsr310ConvertersConfiguration">Jsr310ConvertersConfiguration.22</a></span> - Class in <a href="./org/grails/databinding/converters/package-summary.html">org.grails.databinding.converters</a>
+</dt><dd><div class="block"></div></dd>
+<dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html#Jsr310ConvertersConfiguration.22()" title="Constructor in Jsr310ConvertersConfiguration.22">Jsr310ConvertersConfiguration.22()</a></span> - Constructor in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html">Jsr310ConvertersConfiguration.22</a>
+</dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.2.html#Jsr310ConvertersConfiguration.2()" title="Constructor in Jsr310ConvertersConfiguration.2">Jsr310ConvertersConfiguration.2()</a></span> - Constructor in <a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.2.html">Jsr310ConvertersConfiguration.2</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html" title="Class in org.grails.databinding.converters.Jsr310ConvertersConfiguration">Jsr310ConvertersConfiguration.3</a></span> - Class in <a href="./org/grails/databinding/converters/package-summary.html">org.grails.databinding.converters</a>
@@ -31158,7 +31168,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>
@@ -38151,7 +38161,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -43135,9 +43145,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>
@@ -44638,9 +44648,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/artefact/Controller.html#withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)" title="Method in Controller">withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)</a></span> - Method in <a href="grails/artefact/Controller.html">Controller</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html b/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
index 3387b4b0516..cf18999eb59 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 71beae3dee7..7b396cc5d52 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/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html
similarity index 73%
copy from docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
copy to docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html
index cf432e96164..874637ad31c 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html
@@ -27,17 +27,17 @@
 <html>
 <head>
     <!-- Generated by groovydoc (4.0.28) -->
-    <title>JsonReader.Context (GORM for MongoDB - 7.0.1-SNAPSHOT)</title>
+    <title>Jsr310ConvertersConfiguration.22 (Grails 7.0.1-SNAPSHOT)</title>
     
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link href="../../../../../groovy.ico" type="image/x-icon" rel="shortcut icon">
-    <link href="../../../../../groovy.ico" type="image/x-icon" rel="icon">
-    <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+    <link href="../../../../groovy.ico" type="image/x-icon" rel="shortcut icon">
+    <link href="../../../../groovy.ico" type="image/x-icon" rel="icon">
+    <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 
 <body class="center">
 <script type="text/javascript"><!--
 if (location.href.indexOf('is-external=true') == -1) {
-    parent.document.title="JsonReader.Context (GORM for MongoDB - 7.0.1-SNAPSHOT)";
+    parent.document.title="Jsr310ConvertersConfiguration.22 (Grails 7.0.1-SNAPSHOT)";
 }
 //-->
 </script>
@@ -51,20 +51,20 @@ if (location.href.indexOf('is-external=true') == -1) {
     <!--   -->
 </a>
     <ul class="navList" title="Navigation">
-        <li><a href="../../../../../overview-summary.html">Overview</a></li>
+        <li><a href="../../../../overview-summary.html">Overview</a></li>
         <li><a href="package-summary.html">Package</a></li>
         <li class="navBarCell1Rev">Class</li>
-        <li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-        <li><a href="../../../../../index-all.html">Index</a></li>
-        <li><a href="../../../../../help-doc.html">Help</a></li>
+        <li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+        <li><a href="../../../../index-all.html">Index</a></li>
+        <li><a href="../../../../help-doc.html">Help</a></li>
     </ul>
 </div>
 
 <div class="subNav">
     <div>
         <ul class="navList">
-            <li><a href="../../../../../index.html?org/grails/datastore/bson/json/JsonReader.Context" target="_top">Frames</a></li>
-            <li><a href="JsonReader.Context.html" target="_top">No Frames</a></li>
+            <li><a href="../../../../index.html?org/grails/databinding/converters/Jsr310ConvertersConfiguration.22" target="_top">Frames</a></li>
+            <li><a href="Jsr310ConvertersConfiguration.22.html" target="_top">No Frames</a></li>
         </ul>
     </div>
     <div>
@@ -85,13 +85,13 @@ if (location.href.indexOf('is-external=true') == -1) {
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 
-    <div class="subTitle">Package: <strong>org.grails.datastore.bson.json</strong></div>
+    <div class="subTitle">Package: <strong>org.grails.databinding.converters</strong></div>
 
-    <h2 title="[Java] Class JsonReader.Context" class="title">[Java] Class JsonReader.Context</h2>
+    <h2 title="[Groovy] Class Jsr310ConvertersConfiguration.22" class="title">[Groovy] Class Jsr310ConvertersConfiguration.22</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.datastore.bson.json.JsonReader.Context
+<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.databinding.converters.Jsr310ConvertersConfiguration.22
 </ul>
 <div class="description">
     <ul class="blockList">
@@ -101,8 +101,8 @@ if (location.href.indexOf('is-external=true') == -1) {
             <!-- todo: direct known subclasses -->
             <hr>
 
-<pre>protected class JsonReader.Context
-extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonReaderContext</a></pre>
+<pre>class Jsr310ConvertersConfiguration.22
+extends CustomDateBindingEditor&lt;java.time.Instant&gt;</pre>
 
           </li>
     </ul>
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code>protected&nbsp;<strong><a href="#Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)">Context</a></strong>(org.bson.AbstractBsonReader$Context parentContext, org.bson.BsonContextType contextType)</code><br></td>
+                                <code><strong><a href="#Jsr310ConvertersConfiguration.22()">Jsr310ConvertersConfiguration.22</a></strong>()</code><br></td>
                         </tr>
                         
                     </table>
@@ -165,14 +165,14 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.bson.BsonContextType</code></td>
-                            <td class="colLast"><code><strong><a href="#getContextType()">getContextType</a></strong>()</code><br></td>
+                            <td class="colLast"><code>java.time.Instant</code></td>
+                            <td class="colLast"><code><strong><a href="#getDate(java.util.Calendar)">getDate</a></strong>(java.util.Calendar c)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></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>
+                            <td class="colLast"><code>java.lang.Class&lt;?&gt;</code></td>
+                            <td class="colLast"><code><strong><a href="#getTargetType()">getTargetType</a></strong>()</code><br></td>
                         </tr>
                         
                     </table>
@@ -204,10 +204,10 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)"><!-- --></a>
+                        <a name="Jsr310ConvertersConfiguration.22()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<strong>Context</strong>(org.bson.AbstractBsonReader$Context parentContext, org.bson.BsonContextType contextType)</h4>
+                                <h4><strong>Jsr310ConvertersConfiguration.22</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -225,18 +225,18 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="getContextType()"><!-- --></a>
+                        <a name="getDate(java.util.Calendar)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.bson.BsonContextType <strong>getContextType</strong>()</h4>
+                                <h4>@java.lang.Override<br>java.time.Instant <strong>getDate</strong>(java.util.Calendar c)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="getParentContext()"><!-- --></a>
+                        <a name="getTargetType()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>java.lang.Class&lt;?&gt; <strong>getTargetType</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -256,20 +256,20 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
     <!--   -->
 </a>
     <ul class="navList" title="Navigation">
-        <li><a href="../../../../../overview-summary.html">Overview</a></li>
+        <li><a href="../../../../overview-summary.html">Overview</a></li>
         <li><a href="package-summary.html">Package</a></li>
         <li class="navBarCell1Rev">Class</li>
-        <li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
-        <li><a href="../../../../../index-all.html">Index</a></li>
-        <li><a href="../../../../../help-doc.html">Help</a></li>
+        <li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+        <li><a href="../../../../index-all.html">Index</a></li>
+        <li><a href="../../../../help-doc.html">Help</a></li>
     </ul>
 </div>
 
 <div class="subNav">
     <div>
         <ul class="navList">
-            <li><a href="../../../../../index.html?org/grails/datastore/bson/json/JsonReader.Context" target="_top">Frames</a></li>
-            <li><a href="JsonReader.Context.html" target="_top">No Frames</a></li>
+            <li><a href="../../../../index.html?org/grails/databinding/converters/Jsr310ConvertersConfiguration.22" target="_top">Frames</a></li>
+            <li><a href="Jsr310ConvertersConfiguration.22.html" target="_top">No Frames</a></li>
         </ul>
     </div>
     <div>
diff --git a/docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.html b/docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.html
index a5afcb53d84..73377952a93 100644
--- a/docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.html
+++ b/docs/snapshot/api/org/grails/databinding/converters/Jsr310ConvertersConfiguration.html
@@ -212,53 +212,59 @@ extends java.lang.Object</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html'>Jsr310ConvertersConfiguration.3</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.22.html'>Jsr310ConvertersConfiguration.22</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.4.html'>Jsr310ConvertersConfiguration.4</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.3.html'>Jsr310ConvertersConfiguration.3</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.5.html'>Jsr310ConvertersConfiguration.5</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.4.html'>Jsr310ConvertersConfiguration.4</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.6.html'>Jsr310ConvertersConfiguration.6</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.5.html'>Jsr310ConvertersConfiguration.5</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.7.html'>Jsr310ConvertersConfiguration.7</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.6.html'>Jsr310ConvertersConfiguration.6</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.8.html'>Jsr310ConvertersConfiguration.8</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.7.html'>Jsr310ConvertersConfiguration.7</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.9.html'>Jsr310ConvertersConfiguration.9</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.8.html'>Jsr310ConvertersConfiguration.8</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
-                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.CustomDateBindingEditor.html'>Jsr310ConvertersConfiguration.CustomDateBindingEditor</a></code></td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.9.html'>Jsr310ConvertersConfiguration.9</a></code></td>
                             <td class="colLast"></td>
                         </tr>
                         
                         <tr class="altColor">
+                            <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
+                            <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.CustomDateBindingEditor.html'>Jsr310ConvertersConfiguration.CustomDateBindingEditor</a></code></td>
+                            <td class="colLast"></td>
+                        </tr>
+                        
+                        <tr class="rowColor">
                             <td class="colFirst"><code><strong>class</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href='../../../../org/grails/databinding/converters/Jsr310ConvertersConfiguration.Jsr310DateValueConverter.html'>Jsr310ConvertersConfiguration.Jsr310DateValueConverter</a></code></td>
                             <td class="colLast"></td>
@@ -353,120 +359,126 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="rowColor">
+                            <td class="colFirst"><code></code></td>
+                            <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
+                            <td class="colLast"><code><strong><a href="#instantStructuredBindingEditor()">instantStructuredBindingEditor</a></strong>()</code><br></td>
+                        </tr>
+                        
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#instantValueConverter()">instantValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/FormattedValueConverter.html'>FormattedValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#localDateConverter()">localDateConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
                             <td class="colLast"><code><strong><a href="#localDateStructuredBindingEditor()">localDateStructuredBindingEditor</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/FormattedValueConverter.html'>FormattedValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#localDateTimeConverter()">localDateTimeConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
                             <td class="colLast"><code><strong><a href="#localDateTimeStructuredBindingEditor()">localDateTimeStructuredBindingEditor</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#localDateTimeValueConverter()">localDateTimeValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#localDateValueConverter()">localDateValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/FormattedValueConverter.html'>FormattedValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#localTimeConverter()">localTimeConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
                             <td class="colLast"><code><strong><a href="#localTimeStructuredBindingEditor()">localTimeStructuredBindingEditor</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#localTimeValueConverter()">localTimeValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/FormattedValueConverter.html'>FormattedValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#offsetDateTimeConverter()">offsetDateTimeConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
                             <td class="colLast"><code><strong><a href="#offsetDateTimeStructuredBindingEditor()">offsetDateTimeStructuredBindingEditor</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#offsetDateTimeValueConverter()">offsetDateTimeValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/FormattedValueConverter.html'>FormattedValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#offsetTimeConverter()">offsetTimeConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
                             <td class="colLast"><code><strong><a href="#offsetTimeStructuredBindingEditor()">offsetTimeStructuredBindingEditor</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#offsetTimeValueConverter()">offsetTimeValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#periodValueConverter()">periodValueConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/FormattedValueConverter.html'>FormattedValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#zonedDateTimeConverter()">zonedDateTimeConverter</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="rowColor">
+                        <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a></code></td>
                             <td class="colLast"><code><strong><a href="#zonedDateTimeStructuredBindingEditor()">zonedDateTimeStructuredBindingEditor</a></strong>()</code><br></td>
                         </tr>
                         
-                        <tr class="altColor">
+                        <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code><a href='../../../../grails/databinding/converters/ValueConverter.html'>ValueConverter</a></code></td>
                             <td class="colLast"><code><strong><a href="#zonedDateTimeValueConverter()">zonedDateTimeValueConverter</a></strong>()</code><br></td>
@@ -574,6 +586,14 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
+                        <a name="instantStructuredBindingEditor()"><!-- --></a>
+                        <ul class="blockListLast">
+                            <li class="blockList">
+                                <h4>@org.springframework.context.annotation.Bean<br><a href='../../../../grails/databinding/TypedStructuredBindingEditor.html'>TypedStructuredBindingEditor</a> <strong>instantStructuredBindingEditor</strong>()</h4>
+                                <p></p>
+                            </li>
+                        </ul>
+                    
                         <a name="instantValueConverter()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
diff --git a/docs/snapshot/api/org/grails/databinding/converters/package-frame.html b/docs/snapshot/api/org/grails/databinding/converters/package-frame.html
index 61e954c0c20..a3d8912c0b3 100644
--- a/docs/snapshot/api/org/grails/databinding/converters/package-frame.html
+++ b/docs/snapshot/api/org/grails/databinding/converters/package-frame.html
@@ -51,7 +51,7 @@
 <div class="indexContainer">
     <h2>Classes</h2>
     <ul>
-        <li><a href="AbstractStructuredDateBindingEditor.html" title="class in org.grails.databinding.converters" target="classFrame">AbstractStructuredDateBindingEditor</a></li><li><a href="CurrencyValueConverter.html" title="class in org.grails.databinding.converters" target="classFrame">CurrencyValueConverter</a></li><li><a href="DateConversionHelper.html" title="class in org.grails.databinding.converters" target="classFrame">DateConversionHelper</a></li><li><a href="DefaultConverters [...]
+        <li><a href="AbstractStructuredDateBindingEditor.html" title="class in org.grails.databinding.converters" target="classFrame">AbstractStructuredDateBindingEditor</a></li><li><a href="CurrencyValueConverter.html" title="class in org.grails.databinding.converters" target="classFrame">CurrencyValueConverter</a></li><li><a href="DateConversionHelper.html" title="class in org.grails.databinding.converters" target="classFrame">DateConversionHelper</a></li><li><a href="DefaultConverters [...]
     </ul>
 </div>
 
diff --git a/docs/snapshot/api/org/grails/databinding/converters/package-summary.html b/docs/snapshot/api/org/grails/databinding/converters/package-summary.html
index cd66775c062..2f5494305cc 100644
--- a/docs/snapshot/api/org/grails/databinding/converters/package-summary.html
+++ b/docs/snapshot/api/org/grails/databinding/converters/package-summary.html
@@ -282,6 +282,14 @@ function windowTitle()
                             </td>
                             <td></td>
                         </tr>
+<tr class="altColor">
+                            <td class="colOne">
+                                <strong><a href="Jsr310ConvertersConfiguration.22.html" title="class in org/grails/databinding/converters">
+                                    Jsr310ConvertersConfiguration.22
+                                </a></strong>
+                            </td>
+                            <td></td>
+                        </tr>
 <tr class="altColor">
                             <td class="colOne">
                                 <strong><a href="Jsr310ConvertersConfiguration.3.html" title="class in org/grails/databinding/converters">
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
index 8fcfa0cb467..d15b80a063f 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class InstantEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.Instant <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
index e51495a2366..d9679894ab6 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalDate <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
index 955a46125bf..c23d72821a9 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
index 62f92e99b57..fbccedb0933 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
index 8d99f3ea8e3..3baf18ea1c7 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetDateTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.OffsetDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
index 99d6bb140b4..b677e09581a 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.OffsetTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
index e8c1f2ce393..ba534cb21d2 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class PeriodEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.Period <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
index 559e4ef7daa..a13438356eb 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.1
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
index f9aafac9b29..713e31a9e35 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.10
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
index e3300be497e..7179404b233 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.11
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
index 6e3ec582480..7ce49d83f50 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.12
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
index 68b4c9c56c7..776c61c3426 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.13
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
index 1b3d41ffaca..6eae29990d6 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.2
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
index fe6ab660af7..c424e3d7787 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.3
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
index bc718da2dc0..16c8ebdbd72 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.4
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
index 841f0e15eb2..f6858f06fef 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.5
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
index b9f4adc3940..57a52fcee9c 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.6
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
index 965cf61e5c9..cce25628c9e 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.7
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
index 7d62158c4b4..7eb3b3a1973 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.8
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
index 47b6e7392d6..d6f1bb71e22 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.9
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
index 14730059d59..02c05cc9b7b 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
@@ -241,7 +241,7 @@ implements PropertyEncoder&lt;Simple&gt;</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#DEFAULT_ENCODER">DEFAULT_ENCODER</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -359,7 +359,7 @@ implements PropertyEncoder&lt;Simple&gt;</pre>
                         <a name="DEFAULT_ENCODER"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a> <strong>DEFAULT_ENCODER</strong></h4>
+                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../TypeEncoder.html'>TypeEncoder</a> <strong>DEFAULT_ENCODER</strong></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 174f8f4b3b3..44e05a802b5 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 2961e861c87..7c5cbcc89f7 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 74e675f6eaa..b19ca552a17 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.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>
+                                <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>
                         </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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonReader.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/JsonWriter.Context.html'>JsonWriter.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/JsonReader.Context.html'>JsonReader.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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 2a48f14e0e7..14724132705 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 1d1380c1070..4a950c1d7de 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='../../../../../PropertyReader.html'>PropertyReader</a></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><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='../../../../../PropertyWriter.html'>PropertyWriter</a></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><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='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.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='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.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/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 9a97f27b6ca..3a7deab1ff2 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -531,7 +531,7 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 18840a99b00..161758a6964 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 3d44f575f72..ca1630b1b68 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -137,7 +137,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -170,17 +170,17 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore [...]
                         </tr>
                         
                     </table>
@@ -250,7 +250,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -277,26 +277,26 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
index 2cba6e6c81a..54389fc55fb 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -477,7 +477,7 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                         <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="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index 7711250f795..6544aab72fc 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 09fd51be00d..2738621ee3b 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/ [...]
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index 0c88eef1f84..eca1814873a 100644
--- a/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -220,7 +220,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
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 f9637c5d5ef..8ad9a77adfb 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/pages/GSPResponseWriter.html b/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
index 9bf53a03fa2..cc17fd8dc39 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/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 028883f941c..f81e6dde763 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='../../../../../PropertyReader.html'>PropertyReader</a></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><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='../../../../../PropertyWriter.html'>PropertyWriter</a></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><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='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.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='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.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 e11d472b8b9..ad94a17b6c2 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 662b7a0f09b..24798349683 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 4ad5b68a50f..60f3bc4889c 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 0ea7996f35d..a2b8aa3ca82 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 05734549b90..dd9e4f9b3e5 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 03deca8a33f..2c663872973 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 bb61c78287f..018259160ff 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 2cfcf904f22..2885b17aa96 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 cd194dc8b46..9e6412975a8 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 487174ab642..bb8f470b906 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 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 7236b6d7ec0..38bd0324dfb 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 UTC
 </div>
 </div>
 </body>
diff --git a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
index 2ba71f5223a..fb1367c0ca4 100644
--- a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
@@ -305,7 +305,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/grails-data/hibernate5/api/index-all.html b/docs/snapshot/grails-data/hibernate5/api/index-all.html
index 1208ab9661b..277065cef17 100644
--- a/docs/snapshot/grails-data/hibernate5/api/index-all.html
+++ b/docs/snapshot/grails-data/hibernate5/api/index-all.html
@@ -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.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><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><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>
@@ -7751,7 +7751,7 @@ 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/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Constructor in <a href="o [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -13689,7 +13689,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -15546,9 +15546,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.html#withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)" title="Method in ApplicationContextDatabaseMigrationCommand">withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/co [...]
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
index 5f651cc04bb..27ebcc05b66 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class InstantEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.Instant <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
index cd59f4f410b..db83e6c2587 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalDate <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
index 8298938180a..9a90f394090 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
index 660c3b6fd98..dd45fcf90f7 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
index 4610639e58c..d94183b6090 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetDateTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.OffsetDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
index cc9dcc49088..9503e7897ac 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.OffsetTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
index 5fdc665285e..bff3ec67e67 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class PeriodEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.Period <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
index efa628fd518..478af7129c6 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.1
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
index 96b911e385b..cc19565da17 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.10
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
index d1b4c7ac496..f2ac6b1d3a2 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.11
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
index c01dcdd6d72..ae09b8df96a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.12
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
index 0499c9ad881..2395fdcdda3 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.13
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
index e5129d67d77..4df831faf36 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.2
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
index 69812c21a31..7bff97b6c83 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.3
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
index eaad8ecf598..552b84a1f7e 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.4
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
index 3065b80ecdb..d84363d8c03 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.5
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
index e0c181236b7..3fd818cd0e5 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.6
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
index 0103c52831c..6a7f5b5fbf9 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.7
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
index 3b2e58aeb23..01dc2110664 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.8
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
index 2024d9daae8..8c8551a9059 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.9
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
index d227fe45b31..1ea1f6bbbae 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
@@ -241,7 +241,7 @@ implements PropertyEncoder&lt;<a href='../../../../../../org/grails/datastore/ma
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#DEFAULT_ENCODER">DEFAULT_ENCODER</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -359,7 +359,7 @@ implements PropertyEncoder&lt;<a href='../../../../../../org/grails/datastore/ma
                         <a name="DEFAULT_ENCODER"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a> <strong>DEFAULT_ENCODER</strong></h4>
+                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../TypeEncoder.html'>TypeEncoder</a> <strong>DEFAULT_ENCODER</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
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 85acbddd276..42d19bb3688 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 a881b00351e..806d91496b5 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 b612e1cdfb6..8a77a187587 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.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>
+                                <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>
                         </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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonReader.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/JsonWriter.Context.html'>JsonWriter.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/JsonReader.Context.html'>JsonReader.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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 df842ad8e14..c70f2f83847 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </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 81eac770b1c..556ac830201 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='../../../../../PropertyReader.html'>PropertyReader</a></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><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='../../../../../PropertyWriter.html'>PropertyWriter</a></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><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='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.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='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.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/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index ed572167756..02b78c76402 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -531,7 +531,7 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 4799cdb3891..59d4f0c5c67 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 590d8726fd0..9cd25d1dae1 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -157,7 +157,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;org.hibernate.FlushMode <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
index ccff448d06e..a1aa23c5273 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -477,7 +477,7 @@ implements org.springframework.context.MessageSourceAware</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="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index dd8499887da..43ea556c50e 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index c8a73697ee0..06afca79377 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index 05db1ff0bb5..4e3dc4ff15f 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
index ee7d9b9e82f..d94f2bf21ee 100644
--- a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
@@ -167,7 +167,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
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 75ae1434245..25a01342af7 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 75cc6ed7b6f..e462484c8ed 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.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><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><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>
@@ -3532,7 +3532,7 @@ 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/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Constructor in <a href="o [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</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(Order)" title="Method in AbstractHibernateQuery">order(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(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><dd> <div class="block"></div></dd>
-<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><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><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>
@@ -6034,7 +6034,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6894,9 +6894,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Use the given database for this entity for the scope of the closure call</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.html#withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)" title="Method in ApplicationContextDatabaseMigrationCommand">withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/co [...]
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
index 4e9e1a7db6c..ac7c90cc7c8 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class InstantEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.Instant <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
index cd87bbfc128..2e3a6518239 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalDate <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
index 35795cdb026..d605a7a62cc 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalDateTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
index d1284d18939..5d8c035a879 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/LocalTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.LocalTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
index c8079f60bc3..9b0cd65bbc1 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetDateTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetDateTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.OffsetDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
index 0b6a4fbd18a..5488424a857 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/OffsetTimeEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetTimeEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.OffsetTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
index 4d460bf17ec..99aeaa34eb3 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/PeriodEncoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class PeriodEncoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
     <p> A simple encoder for java.time.Period <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
index deec98f651c..2ddd1559080 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.1.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.1
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
index 93ecd61496f..6b248dd7ebf 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.10.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.10
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
index 7bf7998cb25..8df3f5cdc5a 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.11.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.11
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
index d3e59707217..0a56d8feb66 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.12.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.12
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
index 5f258b8b7f4..3099c315dce 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.13.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.13
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
index af1a821a615..e9e23662b33 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.2.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.2
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
index a1a257d299d..fe90e90238c 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.3.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.3
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
index 2ebf06d299d..f7d1f4c9fd3 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.4.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.4
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
index 696cec28f52..31212a3cac6 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.5.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.5
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
index 131e9e01613..6cc244b7bc1 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.6.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.6
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
index a28fb43de7e..dd6637f6c3e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.7.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.7
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
index 7c237bbb8e5..5d7ecf02ce7 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.8.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.8
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
index 00f2bdff590..8e6a19dab80 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.9.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleEncoder.9
-extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></pre>
+extends <a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></pre>
 
           </li>
     </ul>
@@ -173,24 +173,6 @@ extends <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/Sim
                    </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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html#encode(BsonWriter, PersistentProperty, Object)'>encode</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
index d991c4afcae..b7f83d5188b 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/SimpleEncoder.html
@@ -241,7 +241,7 @@ implements <a href='../../../../../../org/grails/datastore/bson/codecs/PropertyE
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../TypeEncoder.html'>TypeEncoder</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#DEFAULT_ENCODER">DEFAULT_ENCODER</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -359,7 +359,7 @@ implements <a href='../../../../../../org/grails/datastore/bson/codecs/PropertyE
                         <a name="DEFAULT_ENCODER"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/encoders/SimpleEncoder.TypeEncoder.html'>SimpleEncoder.TypeEncoder</a> <strong>DEFAULT_ENCODER</strong></h4>
+                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../TypeEncoder.html'>TypeEncoder</a> <strong>DEFAULT_ENCODER</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
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 cf432e96164..9592e18ced7 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 0aa7264c8aa..d952cc41078 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 8a92c2ed317..0482422914d 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.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>
+                                <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>
                         </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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonReader.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/JsonWriter.Context.html'>JsonWriter.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/JsonReader.Context.html'>JsonReader.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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.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 0df3ef688a6..f4638b6a38e 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/JsonWriter.Context.html'>JsonWriter.Context</a></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><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/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 36ae40ce9e1..75b5203ed0e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -514,7 +514,7 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1025,10 +1025,10 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 247eb9ab00c..58c6972a557 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 48bc90f3a92..e8fe601994c 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -157,7 +157,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;org.hibernate.FlushMode <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
index 6d8ef5ea835..d62cdc9553f 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -473,7 +473,7 @@ implements org.springframework.context.MessageSourceAware</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="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -492,7 +492,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                     </table>
                    </ul>
@@ -938,10 +938,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index 3073b128f2c..68c1c0e58f4 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</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 4a036f85a43..795faa4ff20 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;<a href='../../../../../ProjectionList.html'>ProjectionList</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.criterion.ProjectionList</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;<a href='../../../../../Order.html'>Order</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.criterion.Order</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(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> o)</code><br>Orders by the specified property name (defaults to ascending)</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>
                         </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;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projectionList</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.criterion.ProjectionList <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;<a href='../../../../../Order.html'>Order</a> <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
+                                <h4>protected&nbsp;org.hibernate.criterion.Order <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(Order)"><!-- --></a>
+                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> o)</h4>
+                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(org.hibernate.criterion.Order 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 08719fc89be..5ec083d43fe 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(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order 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(Order)"><!-- --></a>
+                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order 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 cb81b397032..f59870971a6 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 <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
+extends org.hibernate.criterion.ProjectionList</pre>
 
           </li>
     </ul>
@@ -144,19 +144,19 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#count()">count</a></strong>()</code><br></td>
                         </tr>
                         
@@ -174,7 +174,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#distinct()">distinct</a></strong>()</code><br></td>
                         </tr>
                         
@@ -186,7 +186,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#id()">id</a></strong>()</code><br></td>
                         </tr>
                         
@@ -204,19 +204,19 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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 <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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,6 +236,24 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></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>
@@ -267,7 +285,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="add(Projection)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -275,7 +293,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="avg(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>avg</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>avg</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -283,7 +301,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="count()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>count</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>count</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -307,7 +325,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="distinct()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>distinct</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>distinct</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -323,7 +341,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="id()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>id</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>id</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -347,7 +365,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="max(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>max</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>max</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -355,7 +373,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="min(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>min</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>min</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -363,7 +381,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="property(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>property</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>property</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -379,7 +397,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="sum(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>sum</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <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 b4d943f56ea..f7aaf1bdc3a 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(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</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(Order)"><!-- --></a>
+                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order 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;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projections</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <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 34bfe997041..584aef74799 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/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 9f2ddb2442e..62550b0fda2 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index 79f3fb1d47e..87b451901de 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/whats-new-manual/index.html b/docs/snapshot/grails-data/whats-new-manual/index.html
index 9e88356ee78..11f9609c9f5 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.1-SNAPSHOT<br>
-Last updated 2025-10-22 16:37:19 UTC
+Last updated 2025-10-22 22:59:09 UTC
 </div>
 </div>
 </body>