You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by as...@apache.org on 2025/10/21 09:44:44 UTC

(grails-website) branch asf-site-production updated: Deploying to documentation branch - 09:44:34

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 d98d4470cc3 Deploying to documentation branch - 09:44:34
d98d4470cc3 is described below

commit d98d4470cc37ca3b8415b089ecbd2e8ed1ef03ad
Author: matrei <ma...@users.noreply.github.com>
AuthorDate: Tue Oct 21 09:44:37 2025 +0000

    Deploying to documentation branch - 09:44:34
---
 docs/snapshot/api/deprecated-list.html             |  2 +-
 docs/snapshot/api/index-all.html                   | 20 ++++----
 .../grails/buffer/GrailsLazyProxyPrintWriter.html  | 12 ++---
 .../grails/buffer/GrailsRoutablePrintWriter.html   | 18 +++----
 .../datastore/bson/json/JsonReader.Context.html    |  4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  4 +-
 .../datastore/bson/json/JsonWriter.Context.html    | 10 ++--
 .../org/grails/datastore/bson/json/JsonWriter.html |  4 +-
 .../datastore/mapping/reflect/EntityReflector.html |  8 ++--
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +--
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 ++++-----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 ++--
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 ++--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../OutputEncodingStack.OutputProxyWriter.html     |  2 +-
 .../org/grails/web/pages/GSPResponseWriter.html    |  2 +-
 docs/snapshot/grails-data/api/index-all.html       |  4 +-
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 +--
 .../datastore/mapping/model/MappingContext.html    |  6 +--
 .../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      | 14 +++---
 .../datastore/bson/json/JsonReader.Context.html    |  4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  4 +-
 .../datastore/bson/json/JsonWriter.Context.html    | 10 ++--
 .../org/grails/datastore/bson/json/JsonWriter.html |  4 +-
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 +--
 .../datastore/mapping/model/MappingContext.html    |  6 +--
 .../mapping/mongo/config/MongoMappingContext.html  |  2 +-
 .../datastore/mapping/reflect/EntityReflector.html |  8 ++--
 .../orm/hibernate/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 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |  2 +-
 .../grails-data/mongodb/api/index-all.html         | 20 ++++----
 .../datastore/bson/json/JsonReader.Context.html    |  4 +-
 .../org/grails/datastore/bson/json/JsonReader.html |  4 +-
 .../datastore/bson/json/JsonWriter.Context.html    | 10 ++--
 .../org/grails/datastore/bson/json/JsonWriter.html |  4 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +--
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 ++++-----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 ++--
 .../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 +-
 .../query/AbstractHibernateCriteriaBuilder.html    | 14 +++---
 ...ctHibernateQuery.HibernateAssociationQuery.html |  6 +--
 ...ractHibernateQuery.HibernateProjectionList.html | 56 ++++++++++++++--------
 .../hibernate/query/AbstractHibernateQuery.html    | 10 ++--
 .../grails/orm/hibernate/query/HibernateQuery.html |  2 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 ++--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../grails-data/whats-new-manual/index.html        |  2 +-
 80 files changed, 289 insertions(+), 331 deletions(-)

diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index f6dc690eeef..39c06f4bd6d 100644
--- a/docs/snapshot/api/deprecated-list.html
+++ b/docs/snapshot/api/deprecated-list.html
@@ -517,7 +517,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.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)
+                <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)
                     <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 0139962cfd9..a6ac23e2b9e 100644
--- a/docs/snapshot/api/index-all.html
+++ b/docs/snapshot/api/index-all.html
@@ -6368,7 +6368,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="grails/doc/DocEngine.html#CONTEXT_PATH" title="Property in DocEngine">CONTEXT_PATH</a></span> - Property in <a href="grails/doc/DocEngine.html">DocEngine</a>
 </dt><dd> <div class="block"></div></dd>
@@ -22025,7 +22025,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.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><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><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -22085,7 +22085,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html" title="Interface in org.grails.buffer.GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter.DestinationFactory</a></span> - Interface in <a href="./org/grails/buffer/package-summary.html">org.grails.buffer</a>
 </dt><dd><div class="block">Factory to lazily instantiate the destination.</div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Constructor in GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Constructor in GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/scaffolding/registry/DomainRendererRegisterer.html#grailsLinkGenerator" title="Property in DomainRendererRegisterer">grailsLinkGenerator</a></span> - Property in <a href="org/grails/scaffolding/registry/DomainRendererRegisterer.html">DomainRendererRegisterer</a>
 </dt><dd> <div class="block"></div></dd>
@@ -22220,7 +22220,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html" title="Interface in org.grails.buffer.GrailsRoutablePrintWriter">GrailsRoutablePrintWriter.DestinationFactory</a></span> - Interface in <a href="./org/grails/buffer/package-summary.html">org.grails.buffer</a>
 </dt><dd><div class="block">Factory to lazily instantiate the destination.</div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Constructor in GrailsRoutablePrintWriter">GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Constructor in GrailsRoutablePrintWriter">GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Constructor in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gradle/plugin/run/GrailsRunTask.html" title="Class in org.grails.gradle.plugin.run">GrailsRunTask</a></span> - Class in <a href="./org/grails/gradle/plugin/run/package-summary.html">org.grails.gradle.plugin.run</a>
 </dt><dd><div class="block">Extension to the standard JavaExec task to run Grails applications</div></dd>
@@ -31158,7 +31158,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Creates a new instance of this class.</div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsPrintWriterAdapter.html#newInstance(java.io.Writer)" title="Method in GrailsPrintWriterAdapter">newInstance(java.io.Writer)</a></span> - Method in <a href="org/grails/buffer/GrailsPrintWriterAdapter.html">GrailsPrintWriterAdapter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/model/PersistentEntity.html#newInstance()" title="Method in PersistentEntity">newInstance()</a></span> - Method in <a href="org/grails/datastore/mapping/model/PersistentEntity.html">PersistentEntity</a>
 </dt><dd> <div class="block">Constructs a new instance</div></dd>
@@ -38151,7 +38151,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.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><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><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -43135,9 +43135,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/rest/render/atom/AtomRenderer.html#UPDATED_TAG" title="Field in AtomRenderer">UPDATED_TAG</a></span> - Field in <a href="grails/rest/render/atom/AtomRenderer.html">AtomRenderer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Method in GrailsLazyProxyPrintWriter">updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Method in GrailsLazyProxyPrintWriter">updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html">GrailsLazyProxyPrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
+<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)" title="Method in GrailsRoutablePrintWriter">updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)</a></span> - Method in <a href="org/grails/buffer/GrailsRoutablePrintWriter.html">GrailsRoutablePrintWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/mapping/mongo/engine/MongoEntityPersister.html#updateEntry(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, java.lang.Object, org.bson.Document)" title="Method in MongoEntityPersister">updateEntry(org.grails.datastore.mapping.model.PersistentEntity, org.grails.datastore.mapping.engine.EntityAccess, java.lang.Object, org.bson.Document)</a></span> - Method in <a href="org/grails/dat [...]
 </dt><dd> <div class="block"></div></dd>
@@ -44638,9 +44638,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.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><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><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.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><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><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/artefact/Controller.html#withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)" title="Method in Controller">withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)</a></span> - Method in <a href="grails/artefact/Controller.html">Controller</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html b/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
index cf18999eb59..3387b4b0516 100644
--- a/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
+++ b/docs/snapshot/api/org/grails/buffer/GrailsLazyProxyPrintWriter.html
@@ -182,7 +182,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">GrailsLazyProxyPrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</code><br></td>
+                                <code><strong><a href="#GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">GrailsLazyProxyPrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</code><br></td>
                         </tr>
                         
                     </table>
@@ -239,7 +239,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</code><br></td>
                         </tr>
                         
                     </table>
@@ -289,10 +289,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="GrailsLazyProxyPrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>GrailsLazyProxyPrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</h4>
+                                <h4>public&nbsp;<strong>GrailsLazyProxyPrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -350,10 +350,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintW
                             </li>
                         </ul>
                     
-                        <a name="updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</h4>
+                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html b/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html
index 7b396cc5d52..71beae3dee7 100644
--- a/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html
+++ b/docs/snapshot/api/org/grails/buffer/GrailsRoutablePrintWriter.html
@@ -182,7 +182,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">GrailsRoutablePrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</code><br></td>
+                                <code><strong><a href="#GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">GrailsRoutablePrintWriter</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</code><br></td>
                         </tr>
                         
                     </table>
@@ -299,7 +299,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">newInstance</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">newInstance</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -449,7 +449,7 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)">updateDestination</a></strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -529,10 +529,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsRoutablePrintWriter(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="GrailsRoutablePrintWriter(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>GrailsRoutablePrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</h4>
+                                <h4>public&nbsp;<strong>GrailsRoutablePrintWriter</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -670,10 +670,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                             </li>
                         </ul>
                     
-                        <a name="newInstance(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="newInstance(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;static&nbsp;<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a> <strong>newInstance</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> factory)</h4>
+                                <h4>public&nbsp;static&nbsp;<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a> <strong>newInstance</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> factory)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -870,10 +870,10 @@ extends <a href='../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>Grail
                             </li>
                         </ul>
                     
-                        <a name="updateDestination(org.grails.buffer.GrailsLazyProxyPrintWriter.DestinationFactory)"><!-- --></a>
+                        <a name="updateDestination(org.grails.buffer.GrailsRoutablePrintWriter.DestinationFactory)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html'>GrailsLazyProxyPrintWriter.DestinationFactory</a> f)</h4>
+                                <h4>public&nbsp;void <strong>updateDestination</strong>(<a href='../../../org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html'>GrailsRoutablePrintWriter.DestinationFactory</a> f)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 44e05a802b5..174f8f4b3b3 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
index 7c5cbcc89f7..2961e861c87 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -659,7 +659,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index b19ca552a17..74e675f6eaa 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
index 14724132705..2a48f14e0e7 100644
--- a/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -687,7 +687,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 1d1380c1070..4a950c1d7de 100644
--- a/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 3a7deab1ff2..9a97f27b6ca 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.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>
+                            <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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <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>
                                 <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 161758a6964..18840a99b00 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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
+                                <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>
                                 <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 ca1630b1b68..3d44f575f72 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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org.hibernate.FlushMode.html'>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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <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>
+                                <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>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <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 [...]
+                                <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>
                         </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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <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>
                                 <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 54389fc55fb..2cba6e6c81a 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.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>
+                            <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>
                         </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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <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>
                                 <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 6544aab72fc..7711250f795 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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org.hibernate.FlushMode.html'>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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org.hibernate.FlushMode.html'>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 2738621ee3b..09fd51be00d 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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>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.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/ [...]
+                            <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>
                         </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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.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.hibernate.FlushMode.html'>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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.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.hibernate.FlushMode.html'>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 eca1814873a..0c88eef1f84 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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html b/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html
index 8ad9a77adfb..f9637c5d5ef 100644
--- a/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html
+++ b/docs/snapshot/api/org/grails/taglib/encoder/OutputEncodingStack.OutputProxyWriter.html
@@ -208,7 +208,7 @@ implements <a href='../../../../org/grails/encoder/EncodedAppenderFactory.html'>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html'>GrailsLazyProxyPrintWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#getOut()'>getOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isAllowUnwrappingOut()'>isAllowUnwrappingOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isDestinationActivated()'>isDestinationActivated</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#setDestinationActivated(bool [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#getOut()'>getOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isAllowUnwrappingOut()'>isAllowUnwrappingOut</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#isDestinationActivated()'>isDestinationActivated</a>, <a href='../../../../org/grails/buffer/GrailsLazyProxyPrintWriter.html#setDestinationActivated(bool [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsPrintWriter.html'>GrailsPrintWriter</a></code></td>
diff --git a/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html b/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
index cc17fd8dc39..9bf53a03fa2 100644
--- a/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
+++ b/docs/snapshot/api/org/grails/web/pages/GSPResponseWriter.html
@@ -280,7 +280,7 @@ implements <a href='../../../../org/grails/encoder/EncodedAppenderFactory.html'>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html'>GrailsRoutablePrintWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#activateDestination()'>activateDestination</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(char)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence, int, int) [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#activateDestination()'>activateDestination</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(char)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence)'>append</a>, <a href='../../../../org/grails/buffer/GrailsRoutablePrintWriter.html#append(java.lang.CharSequence, int, int) [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/buffer/GrailsPrintWriterAdapter.html'>GrailsPrintWriterAdapter</a></code></td>
diff --git a/docs/snapshot/grails-data/api/index-all.html b/docs/snapshot/grails-data/api/index-all.html
index 26b665259a6..a12c79b2b2b 100644
--- a/docs/snapshot/grails-data/api/index-all.html
+++ b/docs/snapshot/grails-data/api/index-all.html
@@ -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(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(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(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><dd> <div class="block"></div></dd>
-<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><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><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>
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 556f800d3f2..f23b99a7567 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 54fd6017e08..65659b2865e 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 c9f8d7c5423..da38138f25e 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(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.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 5619582a456..649bc10d2ea 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(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.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/reflect/EntityReflector.html b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 028883f941c..f81e6dde763 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/developer-manual/gettingStarted.html b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
index dd67ed65d6d..4a452e5c7df 100644
--- a/docs/snapshot/grails-data/developer-manual/gettingStarted.html
+++ b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
@@ -523,7 +523,7 @@ cd grails-core</pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 40d98e8abf4..06023baafa2 100644
--- a/docs/snapshot/grails-data/developer-manual/introduction.html
+++ b/docs/snapshot/grails-data/developer-manual/introduction.html
@@ -476,7 +476,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 827e6155279..aa5ee87e555 100644
--- a/docs/snapshot/grails-data/developer-manual/stepByStep.html
+++ b/docs/snapshot/grails-data/developer-manual/stepByStep.html
@@ -621,7 +621,7 @@ class XyzTestSuite {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 d3f7e95f043..2e57a420aa7 100644
--- a/docs/snapshot/grails-data/developer-manual/testing.html
+++ b/docs/snapshot/grails-data/developer-manual/testing.html
@@ -511,7 +511,7 @@ class PagedResultSpec extends GormDatastoreSpec{
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 2100de088b0..01163b432a4 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi.html
@@ -454,7 +454,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 66f4204695f..fa8f276302c 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/datastoreBasics.html
@@ -561,7 +561,7 @@ protected Session createSession(PropertyResolver connDetails) {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 e5637344e07..177024b659d 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/gormApis.html
@@ -496,7 +496,7 @@ class Neo4jEntityTraitProvider implements GormEntityTraitProvider {
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 99dc56a9e95..864f77b0647 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/gormEnhancer.html
@@ -488,7 +488,7 @@ enhancer.enhance()</code></pre>
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 8b175e8a870..e1a74af2044 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingCrud.html
@@ -673,7 +673,7 @@ protected void deleteEntry(String family, final Object key, final Object entry)
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 3fdd3c027d8..ccea100bc78 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/implementingQueries.html
@@ -588,7 +588,7 @@ If, for instance, the underlying datastore does not support the calculation of a
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 c21161c0563..117d7f053f5 100644
--- a/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
+++ b/docs/snapshot/grails-data/developer-manual/understandingApi/secondaryIndexes.html
@@ -526,7 +526,7 @@ If the underlying datastore supports secondary indexes then it is ok to just ret
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 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 fb1367c0ca4..2ba71f5223a 100644
--- a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
@@ -305,7 +305,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.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)
+                <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)
                     <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 53f2dee6f79..1208ab9661b 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(Listener)" title="Method in AbstractMappingContext">addMappingContextListener(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(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><dd> <div class="block"></div></dd>
-<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><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><dd> <div class="block">Adds a new mapping context listener instance</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsDomainBinder.html#addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollector, java.lang.String)" title="Method in GrailsDomainBinder">addMultiTenantFilterIfNecessary(org.grails.orm.hibernate.cfg.HibernatePersistentEntity, org.hibernate.mapping.PersistentClass, org.hibernate.boot.spi.InFlightMetadataCollec [...]
 </dt><dd> <div class="block">Add a Hibernate filter for multitenancy if the persistent class is multitenant</div></dd>
@@ -2419,7 +2419,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader.Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
@@ -7751,7 +7751,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.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><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><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -13689,7 +13689,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.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><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><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -15546,9 +15546,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.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><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><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.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><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><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/json/JsonReader.Context.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 42d19bb3688..85acbddd276 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
index 806d91496b5..a881b00351e 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -659,7 +659,7 @@ extends <a href='../../../../../org.bson.AbstractBsonReader.html'>AbstractBsonRe
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 8a77a187587..b612e1cdfb6 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, <a href='../../../../../org.bson.BsonContextType.html'>BsonContextType</a> contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
index c70f2f83847..df842ad8e14 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -687,7 +687,7 @@ extends <a href='../../../../../org.bson.AbstractBsonWriter.html'>AbstractBsonWr
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 0aecb1c8327..07ad31c5c52 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 2f38df38f47..67e00bc4866 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 e88bf92af25..87ce637098f 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(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br></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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -690,10 +690,10 @@ implements <a href='../../../../../org/grails/datastore/mapping/model/lifecycle/
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.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 f0f30713b2d..5fe62b1b581 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(Listener)">addMappingContextListener</a></strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</code><br>Adds a new mapping context listener instance</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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -404,10 +404,10 @@ public interface MappingContext</pre>
                             </li>
                         </ul>
                     
-                        <a name="addMappingContextListener(Listener)"><!-- --></a>
+                        <a name="addMappingContextListener(org.grails.datastore.mapping.model.MappingContext.Listener)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../Listener.html'>Listener</a> listener)</h4>
+                                <h4>public&nbsp;void <strong>addMappingContextListener</strong>(<a href='../../../../../org/grails/datastore/mapping/model/MappingContext.Listener.html'>MappingContext.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 726481e31af..3cd88b548df 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 81eac770b1c..556ac830201 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 02b78c76402..ed572167756 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.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>
+                            <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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode 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 59d4f0c5c67..4799cdb3891 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;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</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;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <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 9cd25d1dae1..590d8726fd0 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><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <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>
+                                <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>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <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>
+                                <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>
                         </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;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;org.hibernate.FlushMode <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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode 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 a1aa23c5273..ccff448d06e 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.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>
+                            <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>
                         </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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <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>
                                 <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 748997a36f4..df1dfbf6e2e 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 43ea556c50e..dd8499887da 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><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4>org.hibernate.FlushMode <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 06afca79377..c8a73697ee0 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;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</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.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>
+                            <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>
                         </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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.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, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode 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 4e3dc4ff15f..05db1ff0bb5 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;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</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;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <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 d94f2bf21ee..ee7d9b9e82f 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.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)
+                <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)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html b/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
index 75ae1434245..25a01342af7 100644
--- a/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
+++ b/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
@@ -534,7 +534,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html'>AbstractHibernateCriteriaBuilder</a></code></td>
-                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
+                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/index-all.html b/docs/snapshot/grails-data/mongodb/api/index-all.html
index 102b8a626fd..a9611653a6b 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
@@ -1258,7 +1258,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonReader.Context.html#Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)" title="Constructor in JsonReader.Context">Context(org.bson.AbstractBsonReader$Context, org.bson.BsonContextType)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonReader.Context.html">JsonReader.Context</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
+<dt><span class="strong"><a href="org/grails/datastore/bson/json/JsonWriter.Context.html#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)" title="Constructor in JsonWriter.Context">Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)</a></span> - Constructor in <a href="org/grails/datastore/bson/json/JsonWriter.Context.html">JsonWriter.Context</a>
 </dt><dd> <div class="block">Creates a new context.</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#contexts" title="Property in DatabaseMigrationCommand">contexts</a></span> - Property in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
@@ -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.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><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><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>
@@ -5240,9 +5240,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#order(java.lang.String, java.lang.String)" title="Method in AbstractHibernateCriteriaBuilder">order(java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html">AbstractHibernateCriteriaBuilder</a>
 </dt><dd> <div class="block">Orders by the specified property name and direction</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#order(Order)" title="Method in AbstractHibernateQuery">order(Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#order(org.hibernate.criterion.Order)" title="Method in AbstractHibernateQuery">order(org.hibernate.criterion.Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html#order(Order)" title="Method in AbstractHibernateQuery.HibernateAssociationQuery">order(Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html">AbstractHibernateQuery.HibernateAssociationQuery</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html#order(org.hibernate.criterion.Order)" title="Method in AbstractHibernateQuery.HibernateAssociationQuery">order(org.hibernate.criterion.Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html">AbstractHibernateQuery.HibernateAssociationQuery</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html#ORDER_ASC" title="Field in GrailsHibernateUtil">ORDER_ASC</a></span> - Field in <a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html">GrailsHibernateUtil</a>
 </dt><dd> <div class="block"></div></dd>
@@ -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.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><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><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.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><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><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.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><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><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/json/JsonReader.Context.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
index 9592e18ced7..cf432e96164 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.Context.html
@@ -171,7 +171,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -236,7 +236,7 @@ extends <a href='../../../../../AbstractBsonReaderContext.html'>AbstractBsonRead
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
index d952cc41078..0aa7264c8aa 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonReader.html
@@ -364,7 +364,7 @@ extends org.bson.AbstractBsonReader</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -677,7 +677,7 @@ extends org.bson.AbstractBsonReader</pre>
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
index 0482422914d..8a92c2ed317 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.Context.html
@@ -139,7 +139,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
+                                <code><strong><a href="#Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)">Context</a></strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</code><br>Creates a new context.</td>
                         </tr>
                         
                     </table>
@@ -165,7 +165,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getParentContext()">getParentContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -198,10 +198,10 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="Context(org.grails.datastore.bson.json.JsonReader.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
+                        <a name="Context(org.grails.datastore.bson.json.JsonWriter.Context, org.bson.BsonContextType, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</h4>
+                                <h4>public&nbsp;<strong>Context</strong>(<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> parentContext, org.bson.BsonContextType contextType, java.lang.String indentChars)</h4>
                                 <p> Creates a new context.
           <DL><DT><B>Parameters:</B></DT><DD><code>parentContext</code> -  the parent context that can be used for going back up to the parent level</DD><DD><code>contextType</code> -    the type of this context</DD><DD><code>indentChars</code> -    the String to use for indentation at this level.</DD></DL></p>
                             </li>
@@ -223,7 +223,7 @@ extends <a href='../../../../../AbstractBsonWriterContext.html'>AbstractBsonWrit
                         <a name="getParentContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getParentContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getParentContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
index f4638b6a38e..0df3ef688a6 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/datastore/bson/json/JsonWriter.html
@@ -382,7 +382,7 @@ extends org.bson.AbstractBsonWriter</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a></code></td>
                             <td class="colLast"><code><strong><a href="#getContext()">getContext</a></strong>()</code><br></td>
                         </tr>
                         
@@ -705,7 +705,7 @@ extends org.bson.AbstractBsonWriter</pre>
                         <a name="getContext()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonReader.Context.html'>JsonReader.Context</a> <strong>getContext</strong>()</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../../org/grails/datastore/bson/json/JsonWriter.Context.html'>JsonWriter.Context</a> <strong>getContext</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 75b5203ed0e..36ae40ce9e1 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.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>
+                            <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>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1025,10 +1025,10 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode 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 58c6972a557..247eb9ab00c 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;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</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;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <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 e8fe601994c..48bc90f3a92 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><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <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>
+                                <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>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <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>
+                                <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>
                         </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;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;org.hibernate.FlushMode <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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode 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 d62cdc9553f..6d8ef5ea835 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.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>
+                            <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>
                         </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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <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>
+                                <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>
                                 <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 9e852ae8304..fa311ca67a7 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#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastore.mapping.config.Property#cascades(java.util.List), org.grails.datastore.mapping.config.Property#clone(), org.grails.da [...]
+                            <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 772ae81675d..897a112aaa7 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 40540dea69a..7e3e63bfc31 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#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastore.mapping.config.Property#cascades(java.util.List), org.grails.datastore.mapping.config.Property#clone(), org.grails.da [...]
+                            <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 156af079794..6e840b94084 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 0eec22622ef..832921d63eb 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#cascade(java.lang.String), org.grails.datastore.mapping.config.Property#cascadeValidate(java.lang.String), org.grails.datastore.mapping.config.Property#cascades(java.util.List), org.grails.datastore.mapping.config.Property#clone(), org.grails.da [...]
+                            <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 68c1c0e58f4..3073b128f2c 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><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
index 4a036f85a43..795faa4ff20 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
@@ -488,7 +488,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.criterion.ProjectionList</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#projectionList">projectionList</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -666,7 +666,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../Order.html'>Order</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.criterion.Order</code></td>
                             <td class="colLast"><code><strong><a href="#convertOrder(org.grails.datastore.mapping.query.Query$Order, java.lang.String)">convertOrder</a></strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</code><br></td>
                         </tr>
                         
@@ -1247,7 +1247,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.api.Criteria</code></td>
-                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> o)</code><br>Orders by the specified property name (defaults to ascending)</td>
+                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order o)</code><br>Orders by the specified property name (defaults to ascending)</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1906,7 +1906,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="projectionList"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projectionList</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.criterion.ProjectionList <strong>projectionList</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2122,7 +2122,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="convertOrder(org.grails.datastore.mapping.query.Query$Order, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../Order.html'>Order</a> <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
+                                <h4>protected&nbsp;org.hibernate.criterion.Order <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2949,10 +2949,10 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                             </li>
                         </ul>
                     
-                        <a name="order(Order)"><!-- --></a>
+                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> o)</h4>
+                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(org.hibernate.criterion.Order o)</h4>
                                 <p> Orders by the specified property name (defaults to ascending)
       <DL><DT><B>Parameters:</B></DT><DD><code>o</code> -  The property name to order by</DD></DL><DL><DT><B>Returns:</B></DT><DD>A Order instance</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
index 08719fc89be..5ec083d43fe 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
@@ -351,7 +351,7 @@ extends org.grails.datastore.mapping.query.AssociationQuery</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.Query</code></td>
-                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -662,10 +662,10 @@ extends org.grails.datastore.mapping.query.AssociationQuery</pre>
                             </li>
                         </ul>
                     
-                        <a name="order(Order)"><!-- --></a>
+                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order order)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
index cb81b397032..f59870971a6 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>protected class AbstractHibernateQuery.HibernateProjectionList
-extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
+extends org.hibernate.criterion.ProjectionList</pre>
 
           </li>
     </ul>
@@ -144,19 +144,19 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#add(Projection)">add</a></strong>(<a href='../../../../../Projection.html'>Projection</a> p)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#avg(java.lang.String)">avg</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#count()">count</a></strong>()</code><br></td>
                         </tr>
                         
@@ -174,7 +174,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#distinct()">distinct</a></strong>()</code><br></td>
                         </tr>
                         
@@ -186,7 +186,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#id()">id</a></strong>()</code><br></td>
                         </tr>
                         
@@ -204,19 +204,19 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#max(java.lang.String)">max</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#min(java.lang.String)">min</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#property(java.lang.String)">property</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
@@ -228,7 +228,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#sum(java.lang.String)">sum</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
@@ -236,6 +236,24 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                    </ul>
               </li>
             
+            <li class="blockList"><a name="method_summary"><!--   --></a>
+                    <h3>Inherited Methods Summary</h3>
+                    <ul class="blockList">
+                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
+                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
+                        <tr>
+                            <th class="colFirst" scope="col">Methods inherited from class</th>
+                            <th class="colLast" scope="col">Name</th>
+                        </tr>
+                        
+                        <tr class="altColor">
+                            <td class="colFirst"><code>class org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>org.hibernate.criterion.ProjectionList#add(org.hibernate.criterion.Projection), org.hibernate.criterion.ProjectionList#add(org.hibernate.criterion.Projection, java.lang.String), org.hibernate.criterion.ProjectionList#create(), org.hibernate.criterion.ProjectionList#equals(java.lang.Object), org.hibernate.criterion.ProjectionList#getAliases(), org.hibernate.criterion.ProjectionList#getClass(), org.hibernate.criterion.ProjectionList#get [...]
+                        </tr>
+                    </table>
+                   </ul>
+              </li>
+                
         </ul>
         
     </li>
@@ -267,7 +285,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="add(Projection)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -275,7 +293,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="avg(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>avg</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>avg</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -283,7 +301,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="count()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>count</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>count</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -307,7 +325,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="distinct()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>distinct</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>distinct</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -323,7 +341,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="id()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>id</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>id</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -347,7 +365,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="max(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>max</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>max</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -355,7 +373,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="min(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>min</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>min</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -363,7 +381,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="property(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>property</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>property</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -379,7 +397,7 @@ extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
                         <a name="sum(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>sum</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>sum</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
index b4d943f56ea..f7aaf1bdc3a 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
@@ -647,12 +647,12 @@ extends org.grails.datastore.mapping.query.Query</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.Query</code></td>
-                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
+                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
                             <td class="colLast"><code><strong><a href="#projections()">projections</a></strong>()</code><br></td>
                         </tr>
                         
@@ -1330,10 +1330,10 @@ extends org.grails.datastore.mapping.query.Query</pre>
                             </li>
                         </ul>
                     
-                        <a name="order(Order)"><!-- --></a>
+                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order order)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1341,7 +1341,7 @@ extends org.grails.datastore.mapping.query.Query</pre>
                         <a name="projections()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projections</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>projections</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
index 34bfe997041..584aef74799 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
@@ -293,7 +293,7 @@ extends <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernate
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html'>AbstractHibernateQuery</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#add(org.hibernate.criterion.Criterion)'>add</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/orm/hibernate [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#add(org.hibernate.criterion.Criterion)'>add</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/orm/hibernate [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 62550b0fda2..9f2ddb2442e 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;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</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.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>
+                            <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>
                         </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/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <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.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.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, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode 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 87b451901de..79f3fb1d47e 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;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</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;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <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 47a8041ca43..c7f81c0a477 100644
--- a/docs/snapshot/grails-data/whats-new-manual/index.html
+++ b/docs/snapshot/grails-data/whats-new-manual/index.html
@@ -527,7 +527,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div id="footer">
 <div id="footer-text">
 Version 7.0.1-SNAPSHOT<br>
-Last updated 2025-10-21 07:58:56 UTC
+Last updated 2025-10-21 09:33:42 UTC
 </div>
 </div>
 </body>