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/12/10 23:47:21 UTC

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

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

commit eca9f87cc126de1026a67713adfc672e3f1159b2
Author: matrei <ma...@users.noreply.github.com>
AuthorDate: Wed Dec 10 23:47:12 2025 +0000

    Deploying to documentation branch - 23:47:10
---
 docs/snapshot/api/deprecated-list.html             |  2 +-
 docs/snapshot/api/index-all.html                   | 24 ++++++++--------
 .../bson/codecs/decoders/InstantDecoder.html       |  4 +--
 .../bson/codecs/decoders/LocalDateDecoder.html     |  4 +--
 .../bson/codecs/decoders/LocalDateTimeDecoder.html |  4 +--
 .../bson/codecs/decoders/LocalTimeDecoder.html     |  4 +--
 .../codecs/decoders/OffsetDateTimeDecoder.html     |  4 +--
 .../bson/codecs/decoders/OffsetTimeDecoder.html    |  4 +--
 .../bson/codecs/decoders/PeriodDecoder.html        |  4 +--
 .../bson/codecs/decoders/SimpleDecoder.1.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.10.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.11.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.12.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.13.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.14.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.15.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.16.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.2.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.3.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.4.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.5.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.6.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.7.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.8.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.9.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.html        |  4 +--
 .../bson/codecs/decoders/ZonedDateTimeDecoder.html |  4 +--
 .../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/mapping/reflect/EntityReflector.html |  8 +++---
 .../gradle/plugin/core/GrailsGradlePlugin.html     | 28 +++++++++++++++++--
 .../plugin/core/GrailsPluginGradlePlugin.html      |  2 +-
 .../gradle/plugin/web/GrailsWebGradlePlugin.html   |  2 +-
 .../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 +--
 .../PluginAwareResourceBundleMessageSource.html    | 16 +++++------
 ...leMessageSource.PropertiesHolderCacheEntry.html |  8 +++---
 .../ReloadableResourceBundleMessageSource.html     | 16 +++++------
 .../api/org/grails/web/json/JSONWriter.html        | 22 +++++++--------
 .../web/json/PathCapturingJSONWriterWrapper.html   | 20 +++++++-------
 .../org/grails/web/json/PrettyPrintJSONWriter.html |  8 +++---
 .../api/org/grails/web/xml/XMLStreamWriter.html    |  4 +--
 docs/snapshot/grails-data/api/index-all.html       | 10 +++----
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 ++--
 .../datastore/mapping/model/MappingContext.html    |  6 ++--
 .../datastore/mapping/query/AssociationQuery.html  |  8 +++---
 .../datastore/mapping/query/Query.Conjunction.html | 25 +----------------
 .../datastore/mapping/query/Query.Disjunction.html | 25 +----------------
 .../datastore/mapping/query/Query.Junction.html    |  4 +--
 .../datastore/mapping/query/Query.Negation.html    | 25 +----------------
 .../org/grails/datastore/mapping/query/Query.html  | 32 +++++++++++-----------
 .../datastore/mapping/reflect/EntityReflector.html |  8 +++---
 .../developer-manual/gettingStarted.html           |  2 +-
 .../grails-data/developer-manual/introduction.html |  2 +-
 .../grails-data/developer-manual/stepByStep.html   |  2 +-
 .../grails-data/developer-manual/testing.html      |  2 +-
 .../developer-manual/understandingApi.html         |  2 +-
 .../understandingApi/datastoreBasics.html          |  2 +-
 .../understandingApi/gormApis.html                 |  2 +-
 .../understandingApi/gormEnhancer.html             |  2 +-
 .../understandingApi/implementingCrud.html         |  2 +-
 .../understandingApi/implementingQueries.html      |  2 +-
 .../understandingApi/secondaryIndexes.html         |  2 +-
 .../hibernate5/api/deprecated-list.html            |  2 +-
 .../grails-data/hibernate5/api/index-all.html      | 12 ++++----
 .../bson/codecs/decoders/InstantDecoder.html       |  4 +--
 .../bson/codecs/decoders/LocalDateDecoder.html     |  4 +--
 .../bson/codecs/decoders/LocalDateTimeDecoder.html |  4 +--
 .../bson/codecs/decoders/LocalTimeDecoder.html     |  4 +--
 .../codecs/decoders/OffsetDateTimeDecoder.html     |  4 +--
 .../bson/codecs/decoders/OffsetTimeDecoder.html    |  4 +--
 .../bson/codecs/decoders/PeriodDecoder.html        |  4 +--
 .../bson/codecs/decoders/SimpleDecoder.1.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.10.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.11.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.12.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.13.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.14.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.15.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.16.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.2.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.3.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.4.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.5.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.6.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.7.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.8.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.9.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.html        |  4 +--
 .../bson/codecs/decoders/ZonedDateTimeDecoder.html |  4 +--
 .../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 +--
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 ++--
 .../datastore/mapping/model/MappingContext.html    |  6 ++--
 .../mapping/mongo/config/MongoMappingContext.html  |  2 +-
 .../datastore/mapping/reflect/EntityReflector.html |  8 +++---
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 ++--
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +--
 .../GrailsHibernateTransactionManager.html         | 22 +++++++--------
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 +++---
 .../orm/hibernate/cfg/HibernateMappingContext.html |  2 +-
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +--
 .../hibernate/support/HibernateVersionSupport.html | 10 +++----
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +--
 .../grails-data/mongodb/api/deprecated-list.html   |  2 +-
 .../grails-data/mongodb/api/index-all.html         | 14 +++++-----
 .../bson/codecs/decoders/InstantDecoder.html       |  4 +--
 .../bson/codecs/decoders/LocalDateDecoder.html     |  4 +--
 .../bson/codecs/decoders/LocalDateTimeDecoder.html |  4 +--
 .../bson/codecs/decoders/LocalTimeDecoder.html     |  4 +--
 .../codecs/decoders/OffsetDateTimeDecoder.html     |  4 +--
 .../bson/codecs/decoders/OffsetTimeDecoder.html    |  4 +--
 .../bson/codecs/decoders/PeriodDecoder.html        |  4 +--
 .../bson/codecs/decoders/SimpleDecoder.1.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.10.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.11.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.12.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.13.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.14.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.15.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.16.html     | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.2.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.3.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.4.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.5.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.6.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.7.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.8.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.9.html      | 20 +++++++++++++-
 .../bson/codecs/decoders/SimpleDecoder.html        |  4 +--
 .../bson/codecs/decoders/ZonedDateTimeDecoder.html |  4 +--
 .../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 +--
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 ++--
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +--
 .../GrailsHibernateTransactionManager.html         | 22 +++++++--------
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 +++---
 .../orm/hibernate/cfg/CompositeIdentity.html       | 26 ++----------------
 .../orm/hibernate/cfg/GrailsDomainBinder.html      | 26 +++++++++---------
 .../api/org/grails/orm/hibernate/cfg/Identity.html | 26 ++----------------
 .../api/org/grails/orm/hibernate/cfg/Mapping.html  |  4 +--
 .../grails/orm/hibernate/cfg/PropertyConfig.html   | 26 ++----------------
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +--
 .../hibernate/support/HibernateVersionSupport.html | 10 +++----
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +--
 .../grails-data/whats-new-manual/index.html        |  2 +-
 212 files changed, 1339 insertions(+), 1282 deletions(-)

diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index 54cce141c8f..59291b81ceb 100644
--- a/docs/snapshot/api/deprecated-list.html
+++ b/docs/snapshot/api/deprecated-list.html
@@ -533,7 +533,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 1081d420a5e..37127b32e05 100644
--- a/docs/snapshot/api/index-all.html
+++ b/docs/snapshot/api/index-all.html
@@ -11601,11 +11601,11 @@ if (location.href.indexOf('is-external=true') == -1) {
  <a href='../../../org/grails/encoder/EncodingStateRegistry.html' title='EncodingStateRegistry'>EncodingStateRegistry</a></div></dd>
 <dt><span class="strong"><a href="org/grails/encoder/EncodingStateRegistryLookupHolder.html" title="Class in org.grails.encoder">EncodingStateRegistryLookupHolder</a></span> - Class in <a href="./org/grails/encoder/package-summary.html">org.grails.encoder</a>
 </dt><dd><div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#end(Mode, char)" title="Method in JSONWriter">end(Mode, char)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#end(org.grails.web.json.JSONWriter.Mode, char)" title="Method in JSONWriter">end(org.grails.web.json.JSONWriter.Mode, char)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
 </dt><dd> <div class="block">End something.</div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#end(Mode, char)" title="Method in PathCapturingJSONWriterWrapper">end(Mode, char)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
+<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#end(org.grails.web.json.JSONWriter.Mode, char)" title="Method in PathCapturingJSONWriterWrapper">end(org.grails.web.json.JSONWriter.Mode, char)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PrettyPrintJSONWriter.html#end(Mode, char)" title="Method in PrettyPrintJSONWriter">end(Mode, char)</a></span> - Method in <a href="org/grails/web/json/PrettyPrintJSONWriter.html">PrettyPrintJSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/PrettyPrintJSONWriter.html#end(org.grails.web.json.JSONWriter.Mode, char)" title="Method in PrettyPrintJSONWriter">end(org.grails.web.json.JSONWriter.Mode, char)</a></span> - Method in <a href="org/grails/web/json/PrettyPrintJSONWriter.html">PrettyPrintJSONWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/xml/PrettyPrintXMLStreamWriter.html#end()" title="Method in PrettyPrintXMLStreamWriter">end()</a></span> - Method in <a href="org/grails/web/xml/PrettyPrintXMLStreamWriter.html">PrettyPrintXMLStreamWriter</a>
 </dt><dd> <div class="block"></div></dd>
@@ -22150,7 +22150,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>
@@ -33366,11 +33366,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html#pooled" title="Property in DataSourceSettings">pooled</a></span> - Property in <a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html">DataSourceSettings</a>
 </dt><dd> <div class="block">Whether the data source is pooled</div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#pop(Mode)" title="Method in JSONWriter">pop(Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#pop(org.grails.web.json.JSONWriter.Mode)" title="Method in JSONWriter">pop(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
 </dt><dd> <div class="block">Pop an array or object scope.</div></dd>
 <dt><span class="strong"><a href="org/grails/taglib/encoder/OutputEncodingStack.html#pop(boolean)" title="Method in OutputEncodingStack">pop(boolean)</a></span> - Method in <a href="org/grails/taglib/encoder/OutputEncodingStack.html">OutputEncodingStack</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#pop(Mode)" title="Method in PathCapturingJSONWriterWrapper">pop(Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
+<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#pop(org.grails.web.json.JSONWriter.Mode)" title="Method in PathCapturingJSONWriterWrapper">pop(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesPageContext.html#popBody()" title="Method in GroovyPagesPageContext">popBody()</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesPageContext.html">GroovyPagesPageContext</a>
 </dt><dd> <div class="block"></div></dd>
@@ -34618,11 +34618,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block">Handles generating the checksum file, published artifact list, and grails-publish configuration</div></dd>
 <dt><span class="strong"><a href="org/apache/grails/buildsrc/PublishPlugin.html#PublishPlugin()" title="Constructor in PublishPlugin">PublishPlugin()</a></span> - Constructor in <a href="org/apache/grails/buildsrc/PublishPlugin.html">PublishPlugin</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#push(Mode)" title="Method in JSONWriter">push(Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#push(org.grails.web.json.JSONWriter.Mode)" title="Method in JSONWriter">push(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
 </dt><dd> <div class="block">Push an array or object scope.</div></dd>
 <dt><span class="strong"><a href="org/grails/taglib/encoder/OutputEncodingStack.html#push(org.grails.taglib.encoder.OutputEncodingStackAttributes, boolean)" title="Method in OutputEncodingStack">push(org.grails.taglib.encoder.OutputEncodingStackAttributes, boolean)</a></span> - Method in <a href="org/grails/taglib/encoder/OutputEncodingStack.html">OutputEncodingStack</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#push(Mode)" title="Method in PathCapturingJSONWriterWrapper">push(Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
+<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#push(org.grails.web.json.JSONWriter.Mode)" title="Method in PathCapturingJSONWriterWrapper">push(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesPageContext.html#pushBody()" title="Method in GroovyPagesPageContext">pushBody()</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesPageContext.html">GroovyPagesPageContext</a>
 </dt><dd> <div class="block"></div></dd>
@@ -38366,7 +38366,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>
@@ -43446,7 +43446,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/gsp/GroovyPagesTemplateRenderer.html#updateValue(groovy.text.Template, Callable<Template>, java.lang.Object)" title="Method in GroovyPagesTemplateRenderer">updateValue(groovy.text.Template, Callable&lt;Template&gt;, java.lang.Object)</a></span> - Method in <a href="org/grails/web/gsp/GroovyPagesTemplateRenderer.html">GroovyPagesTemplateRenderer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html#updateValue(PropertiesHolder, Callable<PropertiesHolder>, java.lang.Object)" title="Method in ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry">updateValue(PropertiesHolder, Callable&lt;PropertiesHolder&gt;, java.lang.Object)</a></span> - Method in <a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.Properti [...]
+<dt><span class="strong"><a href="org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html#updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable<PropertiesHolder>, java.lang.Object)" title="Method in ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry">updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable&lt;Properti [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/apache/grails/data/testing/tck/tests/UpdateWithProxyPresentSpec.html" title="Class in org.apache.grails.data.testing.tck.tests">UpdateWithProxyPresentSpec</a></span> - Class in <a href="./org/apache/grails/data/testing/tck/tests/package-summary.html">org.apache.grails.data.testing.tck.tests</a>
 </dt><dd><div class="block"> <DL><DT><B>Authors:</B></DT><DD>graemerocher</DD></DL></div></dd>
@@ -44899,9 +44899,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/datastore/bson/codecs/decoders/InstantDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.html
index ef0517e472a..725ee4d9b48 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class InstantDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalDateDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.html
index 4334507a237..29169eec91f 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalDateTimeDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.html
index 0c66412158a..e1f7eaed470 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalTimeDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.html
index 2ebefa13c28..b2b46e89996 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/OffsetDateTimeDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.html
index ee828fae90b..29e98c5e71b 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/OffsetTimeDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.html
index bb8014610cf..69a58570e36 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/PeriodDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.html
index d7342a8cc78..1018812ceca 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class PeriodDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/SimpleDecoder.1.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
index 461d8823c1e..4d49b3749a1 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.1
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
index e2cef318a4e..41b013ea99c 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.10
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
index 3a08eddc2d7..e45d746988a 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.11
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
index 9715e5052c5..e0143b21117 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.12
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
index b89c66a87fe..c2609e5023f 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.13
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
index e4c5e8a7554..ee08fc75e87 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.14
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
index 8bd510a0b34..0ba24daeb3a 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.15
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
index b16d551f712..13427e979bb 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.16
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
index adedc4734cc..cc9fe688a68 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.2
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
index 5e8afefb0dd..3cc26633e2f 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.3
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
index 692b8ce31b1..866664e1f88 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.4
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
index dbcd00ea4f0..0675d2f99af 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.5
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
index 47489f1a3e0..7b094af6609 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.6
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
index e4247ffe837..94e7ffd8506 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.7
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
index 41c68aaa897..eff5e04aa2e 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.8
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
index 04ac93adb20..1877701e211 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.9
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
index 0216ea8cd7a..f05cf38d154 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
@@ -259,7 +259,7 @@ implements PropertyDecoder&lt;Simple&gt;</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#DEFAULT_DECODER">DEFAULT_DECODER</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -377,7 +377,7 @@ implements PropertyDecoder&lt;Simple&gt;</pre>
                         <a name="DEFAULT_DECODER"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../TypeDecoder.html'>TypeDecoder</a> <strong>DEFAULT_DECODER</strong></h4>
+                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a> <strong>DEFAULT_DECODER</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
index 085ee4b2d60..577117f92c4 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../TypeDecoder.html'>TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class ZonedDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></pre>
 
     <p> A simple decoder for java.time.ZonedDateTime <DL><DT><B>Authors:</B></DT><DD>James Kleeh</DD></DL></p>
 
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 c1925a5f18e..38b5c5f6cae 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 1c219c56459..deefd57c3df 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 867d123c7da..0e6828adc09 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 d1122c5bd7a..cb49558fd0e 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 a9dd623c67b..e22c6e04ae5 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 e301edf1fe0..7c65a045075 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 b80ec8db267..a8e0b29983c 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 debbfbd0191..ac0669679cc 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 1ad71fea968..306e8c3dab2 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 a853ebb8a66..e8f64e54b1c 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 6c23501d308..dd9eeb7dae4 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 761c2b1270d..0f74501a051 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 3e92d9919ec..c37eed13d64 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 7113754f70d..fd57a14568f 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 31ddbb1b398..f96228cff57 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 a74d775d25b..9271947b634 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 b219c687b76..4617c4df9f6 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 5ff25ed76b9..0e7a3d45209 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 e4a4b83724a..5fc2e8443bd 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 081f140cf20..4bc3495db32 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 4d2b2377934..b91d1698e58 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/mapping/reflect/EntityReflector.html b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 8b8105bd19b..513907fd9f7 100644
--- a/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsGradlePlugin.html b/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsGradlePlugin.html
index 41be4d9c922..a7e807d234a 100644
--- a/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsGradlePlugin.html
+++ b/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsGradlePlugin.html
@@ -91,19 +91,25 @@ if (location.href.indexOf('is-external=true') == -1) {
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.gradle.plugin.core.GrailsGradlePlugin
+<li><ul class="inheritance"></ul></li><li>org.grails.gradle.plugin.core.GrailsGradlePlugin
 </ul>
 <div class="description">
     <ul class="blockList">
         <li class="blockList">
 
+            <dl>
+                <dt>All Implemented Interfaces and Traits:</dt>
+                <dd>Plugin&lt;Project&gt;</dd>
+            </dl>
+    
 
             <!-- todo: direct known subclasses -->
             <hr>
 
 <pre>@groovy.transform.CompileStatic
 class GrailsGradlePlugin
-extends <a href='../../../../../org.gradle.api.plugins.GroovyPlugin.html'>GroovyPlugin</a></pre>
+extends java.lang.Object
+implements Plugin&lt;Project&gt;</pre>
 
     <p> The main Grails gradle plugin implementation <DL><DT><B>Since:</B></DT><DD>3.0</DD></DL><DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL></p>
 
@@ -419,6 +425,24 @@ extends <a href='../../../../../org.gradle.api.plugins.GroovyPlugin.html'>Groovy
                    </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 java.lang.Object</code></td>
+                            <td class="colLast"><code>java.lang.Object#equals(java.lang.Object), java.lang.Object#getClass(), java.lang.Object#hashCode(), java.lang.Object#notify(), java.lang.Object#notifyAll(), java.lang.Object#toString(), java.lang.Object#wait(), java.lang.Object#wait(long), java.lang.Object#wait(long, int)</code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.html b/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.html
index 21fbcbb440c..a394a69d9d7 100644
--- a/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.html
+++ b/docs/snapshot/api/org/grails/gradle/plugin/core/GrailsPluginGradlePlugin.html
@@ -91,7 +91,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.gradle.plugin.core.GrailsPluginGradlePlugin
+<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.gradle.plugin.core.GrailsPluginGradlePlugin
 </ul>
 <div class="description">
     <ul class="blockList">
diff --git a/docs/snapshot/api/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.html b/docs/snapshot/api/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.html
index d125446464a..e2ad6a187b2 100644
--- a/docs/snapshot/api/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.html
+++ b/docs/snapshot/api/org/grails/gradle/plugin/web/GrailsWebGradlePlugin.html
@@ -91,7 +91,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
-<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.gradle.plugin.web.GrailsWebGradlePlugin
+<li><ul class="inheritance"></ul></li><li><ul class="inheritance"></ul></li><li>org.grails.gradle.plugin.web.GrailsWebGradlePlugin
 </ul>
 <div class="description">
     <ul class="blockList">
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 17e470d69ed..c180ccc26f3 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 228844cf922..bd2ca8185de 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 4123547f0a3..0a3e0e38a5c 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 aefa7b81064..cebb0470213 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 15cba492ce5..4aa86209291 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 41f012b314c..2b2e747a871 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 e835119edc5..eb7a05ef8a3 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/spring/context/support/PluginAwareResourceBundleMessageSource.html b/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html
index 4fb392e7124..a4c2137758a 100644
--- a/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html
+++ b/docs/snapshot/api/org/grails/spring/context/support/PluginAwareResourceBundleMessageSource.html
@@ -244,25 +244,25 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMergedBinaryPluginProperties(java.util.Locale)">getMergedBinaryPluginProperties</a></strong>(java.util.Locale locale)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMergedPluginProperties(java.util.Locale)">getMergedPluginProperties</a></strong>(java.util.Locale locale)</code><br>Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  </td>
@@ -470,7 +470,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -478,7 +478,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -486,7 +486,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="getMergedBinaryPluginProperties(java.util.Locale)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getMergedBinaryPluginProperties</strong>(java.util.Locale locale)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getMergedBinaryPluginProperties</strong>(java.util.Locale locale)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -494,7 +494,7 @@ implements <a href='../../../../../grails/core/support/GrailsApplicationAware.ht
                         <a name="getMergedPluginProperties(java.util.Locale)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getMergedPluginProperties</strong>(java.util.Locale locale)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getMergedPluginProperties</strong>(java.util.Locale locale)</h4>
                                 <p> Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  Either fetches the holder from the cache or freshly loads it.
diff --git a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html
index 58e24c1d5a9..be7751c8c2b 100644
--- a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html
+++ b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolderCacheEntry.html
@@ -165,8 +165,8 @@ extends <a href='../../../../../grails/util/CacheEntry.html'>CacheEntry</a></pre
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
-                            <td class="colLast"><code><strong><a href="#updateValue(PropertiesHolder, Callable, java.lang.Object)">updateValue</a></strong>(<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> oldValue, java.util.concurrent.Callable&lt;PropertiesHolder&gt; updater, java.lang.Object cacheRequestObject)</code><br></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
+                            <td class="colLast"><code><strong><a href="#updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable, java.lang.Object)">updateValue</a></strong>(<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> oldValue, java.util.concurrent.Callable&lt;PropertiesHolder&gt; updater, java.lang.Obj [...]
                         </tr>
                         
                     </table>
@@ -237,10 +237,10 @@ extends <a href='../../../../../grails/util/CacheEntry.html'>CacheEntry</a></pre
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="updateValue(PropertiesHolder, Callable, java.lang.Object)"><!-- --></a>
+                        <a name="updateValue(org.grails.spring.context.support.ReloadableResourceBundleMessageSource.PropertiesHolder, Callable, java.lang.Object)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>updateValue</strong>(<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> oldValue, java.util.concurrent.Callable&lt;PropertiesHolder&gt; updater, java.lang.Object cacheRequestObject)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>updateValue</strong>(<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> oldValue, java.util.concurrent.Ca [...]
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
index d9247832ac9..2edc59751e1 100644
--- a/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
+++ b/docs/snapshot/api/org/grails/spring/context/support/ReloadableResourceBundleMessageSource.html
@@ -269,7 +269,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
@@ -281,7 +281,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#call()">call</a></strong>()</code><br></td>
                         </tr>
                         
@@ -318,7 +318,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getMergedProperties(java.util.Locale)">getMergedProperties</a></strong>(java.util.Locale locale)</code><br>Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  </td>
@@ -326,7 +326,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a></code></td>
                             <td class="colLast"><code><strong><a href="#getProperties(java.lang.String, org.springframework.core.io.Resource)">getProperties</a></strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</code><br>Get a PropertiesHolder for the given filename, either from the
  cache or freshly loaded.</td>
                         </tr>
@@ -524,7 +524,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -540,7 +540,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="call()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>call</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>call</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -592,7 +592,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="getMergedProperties(java.util.Locale)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getMergedProperties</strong>(java.util.Locale locale)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getMergedProperties</strong>(java.util.Locale locale)</h4>
                                 <p> Get a PropertiesHolder that contains the actually visible properties
  for a Locale, after merging all specified resource bundles.
  Either fetches the holder from the cache or freshly loads it.
@@ -606,7 +606,7 @@ implements <a href='../../../../../org.springframework.context.ResourceLoaderAwa
                         <a name="getProperties(java.lang.String, org.springframework.core.io.Resource)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.SuppressWarnings("rawtypes")<br>protected&nbsp;<a href='../../../../../PropertiesHolder.html'>PropertiesHolder</a> <strong>getProperties</strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</h4>
+                                <h4>@java.lang.SuppressWarnings("rawtypes")<br>protected&nbsp;<a href='../../../../../org/grails/spring/context/support/ReloadableResourceBundleMessageSource.PropertiesHolder.html'>ReloadableResourceBundleMessageSource.PropertiesHolder</a> <strong>getProperties</strong>(java.lang.String filename, <a href='../../../../../org.springframework.core.io.Resource.html'>Resource</a> resource)</h4>
                                 <p> Get a PropertiesHolder for the given filename, either from the
  cache or freshly loaded.
       <DL><DT><B>Parameters:</B></DT><DD><code>filename</code> -  the bundle filename (basename + Locale)</DD></DL><DL><DT><B>Returns:</B></DT><DD>the current PropertiesHolder for the bundle</DD></DL></p>
diff --git a/docs/snapshot/api/org/grails/web/json/JSONWriter.html b/docs/snapshot/api/org/grails/web/json/JSONWriter.html
index 500bcccb332..f2e0b6acc76 100644
--- a/docs/snapshot/api/org/grails/web/json/JSONWriter.html
+++ b/docs/snapshot/api/org/grails/web/json/JSONWriter.html
@@ -188,7 +188,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../Mode.html'>Mode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code></td>
                             <td class="colLast">The current mode. </td>
                         </tr>
@@ -277,7 +277,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#end(Mode, char)">end</a></strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</code><br>End something.</td>
+                            <td class="colLast"><code><strong><a href="#end(org.grails.web.json.JSONWriter.Mode, char)">end</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</code><br>End something.</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -307,13 +307,13 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#pop(Mode)">pop</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br>Pop an array or object scope.</td>
+                            <td class="colLast"><code><strong><a href="#pop(org.grails.web.json.JSONWriter.Mode)">pop</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br>Pop an array or object scope.</td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#push(Mode)">push</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br>Push an array or object scope.</td>
+                            <td class="colLast"><code><strong><a href="#push(org.grails.web.json.JSONWriter.Mode)">push</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br>Push an array or object scope.</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -407,7 +407,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../Mode.html'>Mode</a> <strong>mode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> <strong>mode</strong></h4>
                                 <p> The current mode. Values:
      </p>
                             </li>
@@ -496,10 +496,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="end(Mode, char)"><!-- --></a>
+                        <a name="end(org.grails.web.json.JSONWriter.Mode, char)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</h4>
                                 <p> End something.
       <DL><DT><B>Parameters:</B></DT><DD><code>m</code> -  Mode</DD><DD><code>c</code> -  Closing character</DD></DL><DL><DT><B>Returns:</B></DT><DD>this</DD></DL></p>
                             </li>
@@ -546,19 +546,19 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="pop(Mode)"><!-- --></a>
+                        <a name="pop(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>pop</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>protected&nbsp;void <strong>pop</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p> Pop an array or object scope.
       <DL><DT><B>Parameters:</B></DT><DD><code>c</code> -  The scope to close.</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="push(Mode)"><!-- --></a>
+                        <a name="push(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>push</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>protected&nbsp;void <strong>push</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p> Push an array or object scope.
       <DL><DT><B>Parameters:</B></DT><DD><code>c</code> -  The scope to open.</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html b/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html
index 58df81ab4ff..f21a108f400 100644
--- a/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html
+++ b/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html
@@ -208,7 +208,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#end(Mode, char)">end</a></strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#end(org.grails.web.json.JSONWriter.Mode, char)">end</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -250,13 +250,13 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         <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="#pop(Mode)">pop</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#pop(org.grails.web.json.JSONWriter.Mode)">pop</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br></td>
                         </tr>
                         
                         <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="#push(Mode)">push</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#push(org.grails.web.json.JSONWriter.Mode)">push</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -299,7 +299,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(Mode, char)'>end</a>, <a href [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(org.grails.web.json.JSONWrite [...]
                         </tr>
                     </table>
                    </ul>
@@ -375,10 +375,10 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                             </li>
                         </ul>
                     
-                        <a name="end(Mode, char)"><!-- --></a>
+                        <a name="end(org.grails.web.json.JSONWriter.Mode, char)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -431,18 +431,18 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                             </li>
                         </ul>
                     
-                        <a name="pop(Mode)"><!-- --></a>
+                        <a name="pop(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>pop</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>pop</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="push(Mode)"><!-- --></a>
+                        <a name="push(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>push</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>push</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html b/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html
index d28fcf1e2a6..bc10d62a7c8 100644
--- a/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html
+++ b/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html
@@ -233,7 +233,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#end(Mode, char)">end</a></strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#end(org.grails.web.json.JSONWriter.Mode, char)">end</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -276,7 +276,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(Mode, char)'>end</a>, <a href [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(org.grails.web.json.JSONWrite [...]
                         </tr>
                     </table>
                    </ul>
@@ -378,10 +378,10 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                             </li>
                         </ul>
                     
-                        <a name="end(Mode, char)"><!-- --></a>
+                        <a name="end(org.grails.web.json.JSONWriter.Mode, char)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html b/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html
index d8e27fcf169..6b0853994d3 100644
--- a/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html
+++ b/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html
@@ -157,7 +157,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../Mode.html'>Mode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -311,7 +311,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../Mode.html'>Mode</a> <strong>mode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> <strong>mode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/index-all.html b/docs/snapshot/grails-data/api/index-all.html
index 5a3b8eb8752..6146afe0096 100644
--- a/docs/snapshot/grails-data/api/index-all.html
+++ b/docs/snapshot/grails-data/api/index-all.html
@@ -319,7 +319,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/collection/PersistentList.html#add(int, java.lang.Object)" title="Method in PersistentList">add(int, java.lang.Object)</a></span> - Method in <a href="org/grails/datastore/mapping/collection/PersistentList.html">PersistentList</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query">add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query">add(Junction, org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
 </dt><dd> <div class="block">Adds the specified criterion instance to the given junction</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)" title="Method in Query.Junction">add(org.grails.datastore.mapping.query.Query.Criterion)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.Junction.html">Query.Junction</a>
 </dt><dd> <div class="block"></div></dd>
@@ -394,9 +394,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html#addListener(ConnectionSourcesListener<T,S>)" title="Method in ConnectionSources">addListener(ConnectionSourcesListener&lt;T,S&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html">ConnectionSources</a>
 </dt><dd> <div class="block">Adds a listener</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in AbstractMappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in MappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(Listener)" title="Method in MappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
 </dt><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="grails/gorm/validation/DefaultConstrainedProperty.html#addMetaConstraint(java.lang.String, java.lang.Object)" title="Method in DefaultConstrainedProperty">addMetaConstraint(java.lang.String, java.lang.Object)</a></span> - Method in <a href="grails/gorm/validation/DefaultConstrainedProperty.html">DefaultConstrainedProperty</a>
 </dt><dd> <div class="block">Adds a meta constraints which is a non-validating informational constraint.</div></dd>
@@ -2866,7 +2866,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/AbstractSession.html#executePendings(Collection<? extends Runnable>)" title="Method in AbstractSession">executePendings(Collection&lt;? extends Runnable&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/AbstractSession.html">AbstractSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/AssociationQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)" title="Method in AssociationQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/AssociationQuery.html">AssociationQuery</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/AssociationQuery.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in AssociationQuery">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/AssociationQuery.html">AssociationQuery</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/GormEntity.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in GormEntity">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/GormEntity.html">GormEntity</a>
 </dt><dd> <div class="block">Executes a query for the given String</div></dd>
@@ -2874,7 +2874,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/gorm/api/GormStaticOperations.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in GormStaticOperations">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="grails/gorm/api/GormStaticOperations.html">GormStaticOperations</a>
 </dt><dd> <div class="block">Executes a query for the given String</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)" title="Method in Query">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/query/Query.html#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)" title="Method in Query">executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)</a></span> - Method in <a href="org/grails/datastore/mapping/query/Query.html">Query</a>
 </dt><dd> <div class="block">Subclasses should implement this to provide the concrete implementation
  of querying</div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.html#executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)" title="Method in TenantDelegatingGormOperations">executeQuery(java.lang.CharSequence, java.util.Collection, java.util.Map)</a></span> - Method in <a href="org/grails/datastore/gorm/multitenancy/TenantDelegatingGormOperations.html">TenantDelegatingGormOperations</a>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 8db3036154a..8bc0a516060 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
@@ -288,7 +288,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
index 5002561796d..6e07f80f391 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
@@ -294,7 +294,7 @@ extends <a href='../../../../../../../org/grails/datastore/mapping/model/Abstrac
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
+                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
index 51415f0e815..3cf8198aa86 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
@@ -283,7 +283,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
index ccf68bd1a14..c7da1193435 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/model/MappingContext.html
@@ -193,7 +193,7 @@ public interface MappingContext</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p> Adds a new mapping context listener instance
       <DL><DT><B>Parameters:</B></DT><DD><code>listener</code> -  The listener</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
index a777dd2267e..8ff7586abd8 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/AssociationQuery.html
@@ -196,7 +196,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> j)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../Junction.html'>Junction</a> j)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -221,7 +221,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.html'>Query</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#allEq(Map)'>allEq</a>, <a href='../../../../. [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/datastore/mapping/query/Quer [...]
                         </tr>
                     </table>
                    </ul>
@@ -273,10 +273,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                 </a>
                     <h3>Method Detail</h3>
                     
-                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)"><!-- --></a>
+                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> j)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> e, <a href='../../../../../Junction.html'>Junction</a> j)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
index b584b6f1daa..adb9914b9c4 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Conjunction.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Conjunction
-extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
+extends <a href='../../../../../Junction.html'>Junction</a></pre>
 
     <p> A Criterion used to combine to criterion in a logical AND
      </p>
@@ -157,29 +157,6 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junctio
         
 
         
-        <!-- ========== METHOD SUMMARY =========== -->
-        <ul class="blockList">
-            
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
-        </ul>
-        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
index 1afa68e4146..ec63c3897f9 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Disjunction.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Disjunction
-extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
+extends <a href='../../../../../Junction.html'>Junction</a></pre>
 
     <p> A Criterion used to combine to criterion in a logical OR
      </p>
@@ -157,29 +157,6 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junctio
         
 
         
-        <!-- ========== METHOD SUMMARY =========== -->
-        <ul class="blockList">
-            
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
-        </ul>
-        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
index f98d7de6937..ead93be1dab 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Junction.html
@@ -176,7 +176,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#add(org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</code><br></td>
                         </tr>
                         
@@ -271,7 +271,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/query/Query.Crit
                         <a name="add(org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
index 7412678cccc..d1bc1c001da 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.Negation.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>public static class Query.Negation
-extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></pre>
+extends <a href='../../../../../Junction.html'>Junction</a></pre>
 
     <p> A criterion used to negate several other criterion
      </p>
@@ -131,29 +131,6 @@ extends <a href='../../../../../org/grails/datastore/mapping/query/Query.Junctio
         
 
         
-        <!-- ========== METHOD SUMMARY =========== -->
-        <ul class="blockList">
-            
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#add(org.grails.datastore.mapping.query.Query.Criterion)'>add</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#getCriteria()'>getCriteria</a>, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html#isEmpty()'>isEmpty</a></code></td>
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
-        </ul>
-        
     </li>
     </ul>
 </div>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
index d921bc23424..f949172d240 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/query/Query.html
@@ -542,7 +542,7 @@ implements java.lang.Cloneable</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../Junction.html'>Junction</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#criteria">criteria</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -673,7 +673,7 @@ implements java.lang.Cloneable</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</code><br>Adds the specified criterion instance to the given junction</td>
+                            <td class="colLast"><code><strong><a href="#add(Junction, org.grails.datastore.mapping.query.Query.Criterion)">add</a></strong>(<a href='../../../../../Junction.html'>Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</code><br>Adds the specified criterion instance to the given junction</td>
                         </tr>
                         
                         <tr class="altColor">
@@ -708,7 +708,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#conjunction()">conjunction</a></strong>()</code><br>Creates a conjunction (AND) query</td>
                         </tr>
                         
@@ -720,7 +720,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#disjunction()">disjunction</a></strong>()</code><br>Creates a disjunction (OR) query</td>
                         </tr>
                         
@@ -733,7 +733,7 @@ implements java.lang.Cloneable</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;abstract&nbsp;java.util.List</code></td>
-                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> criteria)</code><br>Subclasses should implement this to provide th [...]
+                            <td class="colLast"><code><strong><a href="#executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)">executeQuery</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../Junction.html'>Junction</a> criteria)</code><br>Subclasses should implement this to provide the concrete implementation
  of querying</td>
                         </tr>
                         
@@ -764,7 +764,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#getCriteria()">getCriteria</a></strong>()</code><br> <DL><DT><B>Returns:</B></DT><DD>The criteria defined by this query</DD></DL></td>
                         </tr>
                         
@@ -908,7 +908,7 @@ implements java.lang.Cloneable</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../Junction.html'>Junction</a></code></td>
                             <td class="colLast"><code><strong><a href="#negation()">negation</a></strong>()</code><br>Creates a negation of several criterion</td>
                         </tr>
                         
@@ -1016,7 +1016,7 @@ implements java.lang.Cloneable</pre>
                         <a name="criteria"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>criteria</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>criteria</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1155,10 +1155,10 @@ implements java.lang.Cloneable</pre>
                             </li>
                         </ul>
                     
-                        <a name="add(org.grails.datastore.mapping.query.Query.Junction, org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
+                        <a name="add(Junction, org.grails.datastore.mapping.query.Query.Criterion)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>add</strong>(<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</h4>
+                                <h4>public&nbsp;void <strong>add</strong>(<a href='../../../../../Junction.html'>Junction</a> currentJunction, <a href='../../../../../org/grails/datastore/mapping/query/Query.Criterion.html'>Query.Criterion</a> criterion)</h4>
                                 <p> Adds the specified criterion instance to the given junction
       <DL><DT><B>Parameters:</B></DT><DD><code>currentJunction</code> -  The junction to add the criterion to</DD><DD><code>criterion</code> -  The criterion instance</DD></DL></p>
                             </li>
@@ -1211,7 +1211,7 @@ implements java.lang.Cloneable</pre>
                         <a name="conjunction()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>conjunction</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>conjunction</strong>()</h4>
                                 <p> Creates a conjunction (AND) query
       <DL><DT><B>Returns:</B></DT><DD>The Junction instance</DD></DL></p>
                             </li>
@@ -1229,7 +1229,7 @@ implements java.lang.Cloneable</pre>
                         <a name="disjunction()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>disjunction</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>disjunction</strong>()</h4>
                                 <p> Creates a disjunction (OR) query
       <DL><DT><B>Returns:</B></DT><DD>The Junction instance</DD></DL></p>
                             </li>
@@ -1244,10 +1244,10 @@ implements java.lang.Cloneable</pre>
                             </li>
                         </ul>
                     
-                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.query.Query.Junction)"><!-- --></a>
+                        <a name="executeQuery(org.grails.datastore.mapping.model.PersistentEntity, Junction)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;abstract&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> criteria)</h4>
+                                <h4>protected&nbsp;abstract&nbsp;java.util.List <strong>executeQuery</strong>(<a href='../../../../../org/grails/datastore/mapping/model/PersistentEntity.html'>PersistentEntity</a> entity, <a href='../../../../../Junction.html'>Junction</a> criteria)</h4>
                                 <p> Subclasses should implement this to provide the concrete implementation
  of querying
       <DL><DT><B>Parameters:</B></DT><DD><code>entity</code> -  The entity</DD><DD><code>criteria</code> -  The criteria</DD></DL><DL><DT><B>Returns:</B></DT><DD>The results</DD></DL></p>
@@ -1294,7 +1294,7 @@ implements java.lang.Cloneable</pre>
                         <a name="getCriteria()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>getCriteria</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>getCriteria</strong>()</h4>
                                 <p>
       <DL><DT><B>Returns:</B></DT><DD>The criteria defined by this query</DD></DL></p>
                             </li>
@@ -1510,7 +1510,7 @@ implements java.lang.Cloneable</pre>
                         <a name="negation()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/query/Query.Junction.html'>Query.Junction</a> <strong>negation</strong>()</h4>
+                                <h4>public&nbsp;<a href='../../../../../Junction.html'>Junction</a> <strong>negation</strong>()</h4>
                                 <p> Creates a negation of several criterion
       <DL><DT><B>Returns:</B></DT><DD>The negation</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 68d6c948ae3..ce5c33f6e5a 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/developer-manual/gettingStarted.html b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
index ca9fd3b478b..b0abd592a71 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 4490b06d83c..fe717423ffb 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 f7b1352b6d1..4c2dabedec4 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 2d8518dd8ac..438e92a996e 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 560805b73ad..3ef21106654 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 db9560b11e8..2c8f0bc8db7 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 1b38dcc3c93..6622105352d 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 1ba258886a4..1423164a178 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 0c3b42b966d..67ecb75e6c1 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 907c9a32bfb..5d64851ad8d 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 fcfc318ad4d..b3ed30f1705 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 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 8743a9f111e..ee71d886ca8 100644
--- a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
@@ -329,7 +329,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 ffd0c0e26fa..82b53fbb350 100644
--- a/docs/snapshot/grails-data/hibernate5/api/index-all.html
+++ b/docs/snapshot/grails-data/hibernate5/api/index-all.html
@@ -486,9 +486,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html#addListener(ConnectionSourcesListener<T,S>)" title="Method in ConnectionSources">addListener(ConnectionSourcesListener&lt;T,S&gt;)</a></span> - Method in <a href="org/grails/datastore/mapping/core/connections/ConnectionSources.html">ConnectionSources</a>
 </dt><dd> <div class="block">Adds a listener</div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in AbstractMappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/AbstractMappingContext.html#addMappingContextListener(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/AbstractMappingContext.html">AbstractMappingContext</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)" title="Method in MappingContext">addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
+<dt><span class="strong"><a href="org/grails/datastore/mapping/model/MappingContext.html#addMappingContextListener(Listener)" title="Method in MappingContext">addMappingContextListener(Listener)</a></span> - Method in <a href="org/grails/datastore/mapping/model/MappingContext.html">MappingContext</a>
 </dt><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollec [...]
 </dt><dd> <div class="block">Add a Hibernate filter for multitenancy if the persistent class is multitenant</div></dd>
@@ -7793,7 +7793,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>
@@ -13747,7 +13747,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>
@@ -15614,9 +15614,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/decoders/InstantDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.html
index 85087e1e043..234cb08280a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class InstantDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalDateDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.html
index e215d2695a6..8f15080dcb0 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalDateTimeDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.html
index 2a127f42809..fdac76dde92 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalTimeDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.html
index 17ad9cac8b0..c3113233e89 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/OffsetDateTimeDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.html
index 240519cd92b..bcfa94d169a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/OffsetTimeDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.html
index dc87c6b1550..30348b72b1a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/PeriodDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.html
index 724587e64d0..d40a25b7a20 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class PeriodDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/SimpleDecoder.1.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
index 75fd66e6999..938a5312eb7 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.1
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
index 771e58edabe..a069905d581 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.10
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
index 0444a0c0d87..ee349b00386 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.11
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
index f0664976bb4..c71775b72a9 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.12
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
index 54760dba9de..98ecebb841d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.13
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
index fdf82e36f78..3019ea1b49f 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.14
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
index 5a338387f4c..6a59d05501b 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.15
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
index 530e76c6141..4cf3e174523 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.16
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
index 1165d814d3b..25c107b97e2 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.2
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
index 25b48207843..8aa9b69c810 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.3
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
index eeb4ec01e7e..9b0d40af66d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.4
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
index c393dbd025b..30bc3cf593d 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.5
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
index 542fc10af79..91ad571a0c0 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.6
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
index b75e0e20508..7d759948497 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.7
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
index f73c5a07040..ed9efd1deaf 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.8
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
index b1e14f30adb..dd3ec82baf8 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.9
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
index 445f12599cd..22706bdae2a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
@@ -259,7 +259,7 @@ implements PropertyDecoder&lt;<a href='../../../../../../org/grails/datastore/ma
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#DEFAULT_DECODER">DEFAULT_DECODER</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -377,7 +377,7 @@ implements PropertyDecoder&lt;<a href='../../../../../../org/grails/datastore/ma
                         <a name="DEFAULT_DECODER"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../TypeDecoder.html'>TypeDecoder</a> <strong>DEFAULT_DECODER</strong></h4>
+                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a> <strong>DEFAULT_DECODER</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
index a67cbb5dc31..e957edff9cc 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../TypeDecoder.html'>TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class ZonedDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></pre>
 
     <p> A simple decoder for java.time.ZonedDateTime <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/InstantEncoder.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
index d44c3251d90..cecb5583e5d 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 5bf0efd0207..977dbd57a66 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 0bcc1b31dea..fb73c43ba33 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 2d51abb3f3f..7185a6e3dc9 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 abc628e2a2a..8342d8e138f 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 96c9d8cb70c..4adfbcbf075 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 ad562f8c7cc..52c44f443a3 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 7824f2310cd..8402666076c 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 e571d72f661..8519fb192b9 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 511a653009f..e05b5369e81 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 fda7ba85fe8..0a21c2731e1 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 e9ba5a6afa5..4f186141583 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 920abf0dc99..29f99f9145e 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 698b6f93f2a..6b16220ccf0 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 be90c189850..51fe0e63f2a 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 0371852dd6d..455ddb54199 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 feb10642b25..1f105bf863d 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 c0555ea3e24..1e4a632dbe8 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 779c4af4b95..9fd807495b7 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 bde7684fa5a..6c65a6000d9 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 eb0ed446dbc..141859bbdbc 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/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 12428eb9a96..818e834e4c8 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
@@ -288,7 +288,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMa
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
index 2f02960dabf..fe6361eff49 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/keyvalue/mapping/config/KeyValueMappingContext.html
@@ -294,7 +294,7 @@ extends <a href='../../../../../../../org/grails/datastore/mapping/model/Abstrac
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
+                            <td class="colLast"><code><a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../../org/ [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
index ae70f9aee4c..1db2a51e95f 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/AbstractMappingContext.html
@@ -283,7 +283,7 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
index 9beceac667e..b659c4a05a5 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/model/MappingContext.html
@@ -193,7 +193,7 @@ public interface MappingContext</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)">addMappingContextListener</a></strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
+                            <td class="colLast"><code><strong><a href="#addMappingContextListener(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
                                 <p> Adds a new mapping context listener instance
       <DL><DT><B>Parameters:</B></DT><DD><code>listener</code> -  The listener</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
index e4a0a81fe2f..22d6768195a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/mongo/config/MongoMappingContext.html
@@ -321,7 +321,7 @@ extends <a href='../../../../../../org/grails/datastore/mapping/document/config/
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../../org/grails/da [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 8825568feee..805142ae9ae 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index f3dd8456c2e..55af0f08cdc 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 0d8e34c184b..946fd384e10 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 c46a76fbeab..59e95146438 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 31b31b4e9d0..830d1b8f0d6 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/cfg/HibernateMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
index cc04f3704fe..982660849eb 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
@@ -272,7 +272,7 @@ extends <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappi
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html'>AbstractMappingContext</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../org/grails/datastore/m [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addEntityValidator(org.grails.datastore.mapping.model.PersistentEntity, org.springframework.validation.Validator)'>addEntityValidator</a>, <a href='../../../../../org/grails/datastore/mapping/model/AbstractMappingContext.html#addExternalPersistentEntity(java.lang.Class)'>addExternalPersistentEntity</a>, <a href='../../../../../org/grails/datastore/m [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/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 9d0bb0f69b2..c159b45bf0f 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 410f66b291f..43b93dd6d12 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 370bd848a0b..5c86c1f1ff7 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 945e383aaa7..76562d0873c 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/index-all.html b/docs/snapshot/grails-data/mongodb/api/index-all.html
index 09681fff95b..dca06a3879c 100644
--- a/docs/snapshot/grails-data/mongodb/api/index-all.html
+++ b/docs/snapshot/grails-data/mongodb/api/index-all.html
@@ -626,7 +626,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/cfg/GrailsDomainBinder.html#bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)" title="Method in GrailsDomainBinder">bindOneToOneInternal(org.grails.datastore.mapping.model.types.OneToOne, org.hibernate.mapping.OneToOne, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/gra [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)" title="Method in GrailsDomainBinder">bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/Grails [...]
 </dt><dd> <div class="block">Binds a property to Hibernate runtime meta model. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">bindRoot(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block">Binds a root class (one with no super classes) to the runtime meta model
@@ -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>
@@ -4197,7 +4197,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/cfg/GrailsDomainBinder.html#isBidirectionalManyToOne(org.grails.datastore.mapping.model.PersistentProperty)" title="Method in GrailsDomainBinder">isBidirectionalManyToOne(org.grails.datastore.mapping.model.PersistentProperty)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)" title="Method in GrailsDomainBinder">isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html" [...]
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)" title="Method in GrailsDomainBinder">isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#isBidirectionalOneToManyMap(org.grails.datastore.mapping.model.types.Association)" title="Method in GrailsDomainBinder">isBidirectionalOneToManyMap(org.grails.datastore.mapping.model.types.Association)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
@@ -5938,7 +5938,7 @@ if (location.href.indexOf('is-external=true') == -1) {
  resource "/WEB-INF/mapping/example.hbm.xml". </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html#setCacheQueries(boolean)" title="Method in GrailsHibernateTemplate">setCacheQueries(boolean)</a></span> - Method in <a href="org/grails/orm/hibernate/GrailsHibernateTemplate.html">GrailsHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)" title="Method in GrailsDomainBinder">setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)" title="Method in GrailsDomainBinder">setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)</a></span> - Method in <a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html">GrailsDomainBinder</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.html#setChangeLogProperties(java.util.Map, liquibase.changelog.ChangeLogParameters)" title="Method in GroovyChangeLogParser">setChangeLogProperties(java.util.Map, liquibase.changelog.ChangeLogParameters)</a></span> - Method in <a href="org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.html">GroovyChangeLogParser</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/decoders/InstantDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.html
index 5ebf1abb295..2cb93ad92fe 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/InstantDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class InstantDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/InstantBsonConverter.html'>InstantBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalDateDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.html
index 1b2b5f1200f..efb13822603 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalDateDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateBsonConverter.html'>LocalDateBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalDateTimeDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.html
index 8be4cdb8c79..904a8d8288a 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalDateTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalDateTimeBsonConverter.html'>LocalDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/LocalTimeDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.html
index e52f1cb6abd..0b878ce5e59 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/LocalTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class LocalTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/LocalTimeBsonConverter.html'>LocalTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/OffsetDateTimeDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.html
index 96a06b90931..b8dca54fbfa 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/OffsetDateTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetDateTimeBsonConverter.html'>OffsetDateTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/OffsetTimeDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.html
index df09912e584..ad36c918d68 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/OffsetTimeDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class OffsetTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/OffsetTimeBsonConverter.html'>OffsetTimeBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/PeriodDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.html
index 7af66613192..5d1c043609d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/PeriodDecoder.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='../../../../../../TypeDecoder.html'>TypeDecoder</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class PeriodDecoder
 extends java.lang.Object
-implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/PeriodBsonConverter.html'>PeriodBsonConverter</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
     <p> A simple decoder 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/decoders/SimpleDecoder.1.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
index 19f08e80762..0134bbcb66e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.1.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.1
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
index 3cbebc4d8c2..2b8a4d53c3f 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.10.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.10
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
index f41a71b2489..be10504e98d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.11.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.11
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
index ef22dc49fb0..7303ebd1a7d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.12.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.12
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
index 8ae07883fee..1573a5531c8 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.13.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.13
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
index 6a0888baac6..d68e56aed49 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.14.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.14
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
index 09489dd5aa3..d4f1df19b12 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.15.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.15
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
index 440b9fc3a4b..3730732b0e0 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.16.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.16
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
index 33588a9e999..75bdd8fcdc0 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.2.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.2
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
index 45eb16a3163..54b9a805028 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.3.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.3
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
index 143a73850b3..e0330d4aaec 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.4.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.4
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
index 726fec45a5d..e7feac6ec3f 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.5.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.5
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
index 6930b8b8cc5..faac4423fc9 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.6.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.6
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
index 506f2212391..2c7a056319d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.7.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.7
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
index 38f685d8253..69fcfdcc513 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.8.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.8
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
index d22789861fe..d79de261c1b 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.9.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>class SimpleDecoder.9
-extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></pre>
+extends <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></pre>
 
           </li>
     </ul>
@@ -179,6 +179,24 @@ extends <a href='../../../../../../TypeDecoder.html'>TypeDecoder</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>interface <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></code></td>
+                            <td class="colLast"><code><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#bsonType()'>bsonType</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html#decode(BsonReader, PersistentProperty, EntityAccess)'>decode</a></code></td>
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
index 2b561b763fa..caad0274170 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/SimpleDecoder.html
@@ -259,7 +259,7 @@ implements <a href='../../../../../../org/grails/datastore/bson/codecs/PropertyD
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../TypeDecoder.html'>TypeDecoder</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>static&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#DEFAULT_DECODER">DEFAULT_DECODER</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -377,7 +377,7 @@ implements <a href='../../../../../../org/grails/datastore/bson/codecs/PropertyD
                         <a name="DEFAULT_DECODER"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../TypeDecoder.html'>TypeDecoder</a> <strong>DEFAULT_DECODER</strong></h4>
+                                <h4>public&nbsp;static&nbsp;final&nbsp;<a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a> <strong>DEFAULT_DECODER</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
index edf67a8db61..02a23aec8d1 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/decoders/ZonedDateTimeDecoder.html
@@ -99,7 +99,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 
             <dl>
                 <dt>All Implemented Interfaces and Traits:</dt>
-                <dd><a href='../../../../../../TypeDecoder.html'>TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></dd>
+                <dd><a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></dd>
             </dl>
     
 
@@ -109,7 +109,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 class ZonedDateTimeDecoder
 extends java.lang.Object
-implements <a href='../../../../../../TypeDecoder.html'>TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></pre>
+implements <a href='../../../../../../org/grails/datastore/bson/codecs/decoders/SimpleDecoder.TypeDecoder.html'>SimpleDecoder.TypeDecoder</a>, <a href='../../../../../../org/grails/datastore/bson/codecs/temporal/ZonedDateTimeBsonConverter.html'>ZonedDateTimeBsonConverter</a></pre>
 
     <p> A simple decoder for java.time.ZonedDateTime <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/InstantEncoder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/codecs/encoders/InstantEncoder.html
index 9e80206baba..28b93c9e81e 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 959993f2939..6c3a745b352 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 7d795f9b750..4d64d895857 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 65246a6e078..28e728b126b 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 7f857e80280..8df940f261c 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 04f5d6854b7..17097372b16 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 3634a4a263d..144fcaadda7 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 f059ee634ab..bd82e2b53b2 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 dfd671354cd..a4dd2a921c8 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 21e00048039..20887481e84 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 810f113455b..808f44174ab 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 47169425a5a..31adb5a3201 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 66c00609d7b..23ca848688b 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 a86c386566e..8c76acbc65f 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 f1d54c13e7d..38672ada2b8 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 bc81159b05e..5fc69f41ae9 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 066187caff6..28ed70b6f3f 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 cf8b85bc305..be63ae29284 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 507b353b782..4d0ebc4a4ce 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 f5ff0487089..8ea0bfddae1 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 52004b97168..5c2d8b57d96 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/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index e09a2b79c17..37d69db3b59 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 9ba6fe06789..0c4593a880a 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 a49cca206b9..355130a7156 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 2282d2942ac..09a6ed8b850 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/cfg/CompositeIdentity.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html
index 65f50a0a415..a73c889cad0 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/CompositeIdentity.html
@@ -105,7 +105,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 @groovy.transform.CompileStatic
 class CompositeIdentity
-extends org.grails.datastore.mapping.config.Property</pre>
+extends org.hibernate.mapping.Property</pre>
 
     <p> Represents a composite identity, equivalent to Hibernate <composite-id> mapping. <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0</DD></DL></p>
 
@@ -123,26 +123,6 @@ extends org.grails.datastore.mapping.config.Property</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
-            <ul class="blockList">
-                <li class="blockList"><a name="field_summary"><!--   --></a>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
-                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Fields inherited from class</th>
-                            <th class="colLast" scope="col">Fields</th>
-                        </tr>
-                                                <tr class="altColor">
-                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.config.Property</code></strong></td>
-                            <td class="colLast"><code>__$stMC</code></td>
-                        </tr>
-
-                    </table>
-                    </ul>
-                </li>
-                
-            </ul>
-        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -215,8 +195,8 @@ extends org.grails.datastore.mapping.config.Property</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>class org.grails.datastore.mapping.config.Property</code></td>
-                            <td class="colLast"><code>org.grails.datastore.mapping.config.Property#$getLookup(), org.grails.datastore.mapping.config.Property#accessType(jakarta.persistence.AccessType), org.grails.datastore.mapping.config.Property#auditMetadataType(org.grails.datastore.mapping.config.AuditMetadataType), org.grails.datastore.mapping.config.Property#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastor [...]
+                            <td class="colFirst"><code>class org.hibernate.mapping.Property</code></td>
+                            <td class="colLast"><code>org.hibernate.mapping.Property#addCallbackDefinitions(java.util.List), org.hibernate.mapping.Property#equals(java.lang.Object), org.hibernate.mapping.Property#getAccessorPropertyName(org.hibernate.EntityMode), org.hibernate.mapping.Property#getCallbackDefinitions(), org.hibernate.mapping.Property#getCascade(), org.hibernate.mapping.Property#getCascadeStyle(), org.hibernate.mapping.Property#getClass(), org.hibernate.mapping.Property#ge [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
index 71d00c85afb..f45e134f6ce 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/GrailsDomainBinder.html
@@ -534,7 +534,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)">bindProperty</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</code><br>Binds a property to Hibernate runtime m [...]
+                            <td class="colLast"><code><strong><a href="#bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)">bindProperty</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</code><br>Binds a property to Hibernate runtime meta model. </td>
                         </tr>
                         
                         <tr class="altColor">
@@ -723,7 +723,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.config.Property</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.mapping.Property</code></td>
                             <td class="colLast"><code><strong><a href="#createProperty(org.hibernate.mapping.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)">createProperty</a></strong>(org.hibernate.mapping.Value value, org.hibernate.mapping.PersistentClass persistentClass, org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.boot.spi.InFlightMetadataColl [...]
                         </tr>
                         
@@ -855,7 +855,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.grails.datastore.mapping.config.Property</code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.mapping.Property</code></td>
                             <td class="colLast"><code><strong><a href="#getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)">getProperty</a></strong>(org.hibernate.mapping.PersistentClass associatedClass, java.lang.String propertyName)</code><br></td>
                         </tr>
                         
@@ -940,7 +940,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;boolean</code></td>
-                            <td class="colLast"><code><strong><a href="#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)">isBidirectionalManyToOneWithListMapping</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)">isBidirectionalManyToOneWithListMapping</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1036,7 +1036,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)">setCascadeBehaviour</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)">setCascadeBehaviour</a></strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1649,10 +1649,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
+                        <a name="bindProperty(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>bindProperty</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
+                                <h4>protected&nbsp;void <strong>bindProperty</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
                                 <p> Binds a property to Hibernate runtime meta model. Deals with cascade strategy based on the Grails domain model
       <DL><DT><B>Parameters:</B></DT><DD><code>grailsProperty</code> -  The grails property instance</DD><DD><code>prop</code> -            The Hibernate property</DD><DD><code>mappings</code> -        The Hibernate mappings</DD></DL></p>
                             </li>
@@ -1924,7 +1924,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="createProperty(org.hibernate.mapping.Value, org.hibernate.mapping.PersistentClass, org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.boot.spi.InFlightMetadataCollector)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.grails.datastore.mapping.config.Property <strong>createProperty</strong>(org.hibernate.mapping.Value value, org.hibernate.mapping.PersistentClass persistentClass, org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
+                                <h4>protected&nbsp;org.hibernate.mapping.Property <strong>createProperty</strong>(org.hibernate.mapping.Value value, org.hibernate.mapping.PersistentClass persistentClass, org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.boot.spi.InFlightMetadataCollector mappings)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2104,7 +2104,7 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                         <a name="getProperty(org.hibernate.mapping.PersistentClass, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.grails.datastore.mapping.config.Property <strong>getProperty</strong>(org.hibernate.mapping.PersistentClass associatedClass, java.lang.String propertyName)</h4>
+                                <h4>protected&nbsp;org.hibernate.mapping.Property <strong>getProperty</strong>(org.hibernate.mapping.PersistentClass associatedClass, java.lang.String propertyName)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2214,10 +2214,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)"><!-- --></a>
+                        <a name="isBidirectionalManyToOneWithListMapping(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;boolean <strong>isBidirectionalManyToOneWithListMapping</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</h4>
+                                <h4>protected&nbsp;boolean <strong>isBidirectionalManyToOneWithListMapping</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2346,10 +2346,10 @@ implements org.hibernate.boot.spi.MetadataContributor</pre>
                             </li>
                         </ul>
                     
-                        <a name="setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.grails.datastore.mapping.config.Property)"><!-- --></a>
+                        <a name="setCascadeBehaviour(org.grails.datastore.mapping.model.PersistentProperty, org.hibernate.mapping.Property)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>setCascadeBehaviour</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.grails.datastore.mapping.config.Property prop)</h4>
+                                <h4>protected&nbsp;void <strong>setCascadeBehaviour</strong>(org.grails.datastore.mapping.model.PersistentProperty grailsProperty, org.hibernate.mapping.Property prop)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html
index 987be8aab19..f8d8430efca 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Identity.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 class Identity
-extends org.grails.datastore.mapping.config.Property</pre>
+extends org.hibernate.mapping.Property</pre>
 
     <p> Defines the identity generation strategy. In the case of a 'composite' identity the properties
  array defines the property names that formulate the composite id. <DL><DT><B>Authors:</B></DT><DD>Graeme Rocher</DD></DL><DL><DT><B>Since:</B></DT><DD>1.0</DD></DL></p>
@@ -123,26 +123,6 @@ extends org.grails.datastore.mapping.config.Property</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
-            <ul class="blockList">
-                <li class="blockList"><a name="field_summary"><!--   --></a>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
-                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Fields inherited from class</th>
-                            <th class="colLast" scope="col">Fields</th>
-                        </tr>
-                                                <tr class="altColor">
-                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.config.Property</code></strong></td>
-                            <td class="colLast"><code>__$stMC</code></td>
-                        </tr>
-
-                    </table>
-                    </ul>
-                </li>
-                
-            </ul>
-        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -280,8 +260,8 @@ extends org.grails.datastore.mapping.config.Property</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>class org.grails.datastore.mapping.config.Property</code></td>
-                            <td class="colLast"><code>org.grails.datastore.mapping.config.Property#$getLookup(), org.grails.datastore.mapping.config.Property#accessType(jakarta.persistence.AccessType), org.grails.datastore.mapping.config.Property#auditMetadataType(org.grails.datastore.mapping.config.AuditMetadataType), org.grails.datastore.mapping.config.Property#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastor [...]
+                            <td class="colFirst"><code>class org.hibernate.mapping.Property</code></td>
+                            <td class="colLast"><code>org.hibernate.mapping.Property#addCallbackDefinitions(java.util.List), org.hibernate.mapping.Property#equals(java.lang.Object), org.hibernate.mapping.Property#getAccessorPropertyName(org.hibernate.EntityMode), org.hibernate.mapping.Property#getCallbackDefinitions(), org.hibernate.mapping.Property#getCascade(), org.hibernate.mapping.Property#getCascadeStyle(), org.hibernate.mapping.Property#getClass(), org.hibernate.mapping.Property#ge [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html
index a9259d69896..f970880db5d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/Mapping.html
@@ -177,7 +177,7 @@ extends org.grails.datastore.mapping.config.Entity&lt;<a href='../../../../../or
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>org.grails.datastore.mapping.config.Property</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.mapping.Property</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#identity">identity</a></code><br>The identity definition</td>
                         </tr>
                         
@@ -583,7 +583,7 @@ extends org.grails.datastore.mapping.config.Entity&lt;<a href='../../../../../or
                         <a name="identity"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>org.grails.datastore.mapping.config.Property <strong>identity</strong></h4>
+                                <h4>org.hibernate.mapping.Property <strong>identity</strong></h4>
                                 <p> The identity definition</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html
index 33bf83bdf07..78139ae3a6d 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/cfg/PropertyConfig.html
@@ -104,7 +104,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 <pre>@groovy.transform.CompileStatic
 @groovy.transform.builder.Builder(builderStrategy: SimpleStrategy, prefix: )
 class PropertyConfig
-extends org.grails.datastore.mapping.config.Property</pre>
+extends org.hibernate.mapping.Property</pre>
 
     <p> Custom mapping for a single domain property. Note that a property
  can have multiple columns via a component or a user type. <DL><DT><B>Since:</B></DT><DD>1.0.4</DD></DL><DL><DT><B>Authors:</B></DT><DD>pledbrook</DD></DL></p>
@@ -123,26 +123,6 @@ extends org.grails.datastore.mapping.config.Property</pre>
         
         <!-- =========== FIELD SUMMARY =========== -->
         
-            <ul class="blockList">
-                <li class="blockList"><a name="field_summary"><!--   --></a>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited fields summary table">
-                        <caption><span>Inherited fields</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Fields inherited from class</th>
-                            <th class="colLast" scope="col">Fields</th>
-                        </tr>
-                                                <tr class="altColor">
-                            <td class="colFirst"><strong><code>class org.grails.datastore.mapping.config.Property</code></strong></td>
-                            <td class="colLast"><code>__$stMC</code></td>
-                        </tr>
-
-                    </table>
-                    </ul>
-                </li>
-                
-            </ul>
-        
 
         <!-- =========== PROPERTY SUMMARY =========== -->
         
@@ -477,8 +457,8 @@ extends org.grails.datastore.mapping.config.Property</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code>class org.grails.datastore.mapping.config.Property</code></td>
-                            <td class="colLast"><code>org.grails.datastore.mapping.config.Property#$getLookup(), org.grails.datastore.mapping.config.Property#accessType(jakarta.persistence.AccessType), org.grails.datastore.mapping.config.Property#auditMetadataType(org.grails.datastore.mapping.config.AuditMetadataType), org.grails.datastore.mapping.config.Property#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastor [...]
+                            <td class="colFirst"><code>class org.hibernate.mapping.Property</code></td>
+                            <td class="colLast"><code>org.hibernate.mapping.Property#addCallbackDefinitions(java.util.List), org.hibernate.mapping.Property#equals(java.lang.Object), org.hibernate.mapping.Property#getAccessorPropertyName(org.hibernate.EntityMode), org.hibernate.mapping.Property#getCallbackDefinitions(), org.hibernate.mapping.Property#getCascade(), org.hibernate.mapping.Property#getCascadeStyle(), org.hibernate.mapping.Property#getClass(), org.hibernate.mapping.Property#ge [...]
                         </tr>
                     </table>
                    </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 620159af7d1..b1fa94f53de 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/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index d2a21a54b7a..fc93b223e65 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 1d50c9ee418..e4dd5684bf9 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 18e0af0a0be..8fd75f29f81 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 8.0.0-SNAPSHOT<br>
-Last updated 2025-12-10 15:40:50 UTC
+Last updated 2025-12-10 23:35:19 UTC
 </div>
 </div>
 </body>