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/24 22:43:02 UTC

(grails-website) branch asf-site-production updated: Deploying to documentation branch - 22:42:51

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 fdccca548c8 Deploying to documentation branch - 22:42:51
fdccca548c8 is described below

commit fdccca548c8620bbcb4a94076dc9e25a29d3a14c
Author: jdaugherty <jd...@users.noreply.github.com>
AuthorDate: Fri Oct 24 22:42:54 2025 +0000

    Deploying to documentation branch - 22:42:51
---
 docs/snapshot/api/deprecated-list.html             |  2 +-
 docs/snapshot/api/index-all.html                   | 18 +++++++++---------
 .../grails/buffer/GrailsLazyProxyPrintWriter.html  | 12 ++++++------
 .../grails/buffer/GrailsRoutablePrintWriter.html   | 18 +++++++++---------
 .../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      | 12 ++++++------
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 +++---
 .../datastore/mapping/model/MappingContext.html    |  6 +++---
 .../mapping/mongo/config/MongoMappingContext.html  |  2 +-
 .../datastore/mapping/reflect/EntityReflector.html |  8 ++++----
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +++---
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 ++--
 .../GrailsHibernateTransactionManager.html         | 22 +++++++++++-----------
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 ++++----
 .../orm/hibernate/cfg/HibernateMappingContext.html |  2 +-
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 ++--
 .../hibernate/support/HibernateVersionSupport.html | 10 +++++-----
 .../GrailsOpenSessionInViewInterceptor.html        |  4 ++--
 .../grails-data/mongodb/api/deprecated-list.html   |  2 +-
 .../grails-data/mongodb/api/index-all.html         |  8 ++++----
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +++---
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 ++--
 .../GrailsHibernateTransactionManager.html         | 22 +++++++++++-----------
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 ++++----
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 ++--
 .../hibernate/support/HibernateVersionSupport.html | 10 +++++-----
 .../GrailsOpenSessionInViewInterceptor.html        |  4 ++--
 .../grails-data/whats-new-manual/index.html        |  2 +-
 57 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index 43d39a1591f..05c30e13fa0 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, FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../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 394641e8e1c..a5c5cabf0bb 100644
--- a/docs/snapshot/api/index-all.html
+++ b/docs/snapshot/api/index-all.html
@@ -22029,7 +22029,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html" title="Class in org.grails.orm.hibernate">GrailsHibernateTransactionManager</a></span> - Class in <a href="./org/grails/orm/hibernate/package-summary.html">org.grails.orm.hibernate</a>
 </dt><dd><div class="block">Extends the standard class to always set the flush mode to manual when in a read-only transaction.</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.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, FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibernateTransactionManager</a>
 </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>
@@ -22089,7 +22089,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.DestinationFactory.html" title="Interface in org.grails.buffer.GrailsLazyProxyPrintWriter">GrailsLazyProxyPrintWriter.DestinationFactory</a></span> - Interface in <a href="./org/grails/buffer/package-summary.html">org.grails.buffer</a>
 </dt><dd><div class="block">Factory to lazily instantiate the destination.</div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#GrailsLazyProxyPrintWriter(org.grails.buffer.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>
@@ -22224,7 +22224,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.DestinationFactory.html" title="Interface in org.grails.buffer.GrailsRoutablePrintWriter">GrailsRoutablePrintWriter.DestinationFactory</a></span> - Interface in <a href="./org/grails/buffer/package-summary.html">org.grails.buffer</a>
 </dt><dd><div class="block">Factory to lazily instantiate the destination.</div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#GrailsRoutablePrintWriter(org.grails.buffer.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>
@@ -31168,7 +31168,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Creates a new instance of this class.</div></dd>
 <dt><span class="strong"><a href="org/grails/buffer/GrailsPrintWriterAdapter.html#newInstance(java.io.Writer)" title="Method in GrailsPrintWriterAdapter">newInstance(java.io.Writer)</a></span> - Method in <a href="org/grails/buffer/GrailsPrintWriterAdapter.html">GrailsPrintWriterAdapter</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsRoutablePrintWriter.html#newInstance(org.grails.buffer.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>
@@ -38161,7 +38161,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.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, FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, 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>
@@ -43145,9 +43145,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/rest/render/atom/AtomRenderer.html#UPDATED_TAG" title="Field in AtomRenderer">UPDATED_TAG</a></span> - Field in <a href="grails/rest/render/atom/AtomRenderer.html">AtomRenderer</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/buffer/GrailsLazyProxyPrintWriter.html#updateDestination(org.grails.buffer.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>
@@ -44648,9 +44648,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.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(FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(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(FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(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 ce754d9e22c..670b64e6b5e 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 32cd676457f..9d665696577 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/mapping/reflect/EntityReflector.html b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
index 7a4155a07ed..0220e03334a 100644
--- a/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index ba06f003bb8..dadc8bb685e 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(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../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(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='../../../../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 4b485132b45..bbd97c67de0 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='../../../../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='../../../../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 55ae974b603..05e4aefb635 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='../../../../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(FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../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, FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../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, FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../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='../../../../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(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='../../../../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, 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='../../../../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, 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='../../../../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 bd31aa2dd22..08868a89eb2 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(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../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(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='../../../../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 7ca2ecd85a9..d1f942d6eed 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='../../../../../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='../../../../../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 6cda73aaf84..801ecfce622 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='../../../../../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, FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../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='../../../../../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, 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='../../../../../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 ab3322348a1..fa9c72f8c60 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='../../../../../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='../../../../../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 87ac2f98ffc..21e8792c94f 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 ab738d73911..9bb2a71de41 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 80fd7b040ca..a820b0e4218 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 c4399888955..d260e7266b8 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 b51263bbdbf..ebb59e83d36 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 975ef3c7322..917ae8b2113 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 1e32db0e4ca..fbbd3a67bd9 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 8f2c5d52eca..43279795784 100644
--- a/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/developer-manual/gettingStarted.html b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
index 99918716d88..b09b05bb3f7 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 4cd15a0f8a5..241e215a2f4 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 0c6817187aa..9744ee74867 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 bde146ad6ce..f0656fdc8bb 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 4d8ecd37f23..958119ca929 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 2b2f0c77517..bd26cafed5a 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 459b9f0a749..869c37fb13e 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 41897e2707e..7c5abe3cab5 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 53fced92bc9..4eccf988472 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 66d8ccf5f72..fa5a8fa671b 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 92785fe5a34..1a7261b6307 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 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 c309065ba30..4ac1b510e38 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, FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../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/grails-data/hibernate5/api/index-all.html b/docs/snapshot/grails-data/hibernate5/api/index-all.html
index 3f53fa03e42..bf4c282ef88 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>
@@ -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, FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibernateTransactionManager</a>
 </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, FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, 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(FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(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(FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(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/mapping/document/config/DocumentMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/document/config/DocumentMappingContext.html
index 68c0ec953bb..abcb7fe26a0 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 8d4ce12f4aa..a60cc3e374a 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 22f55c38d25..67608606cb9 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 053e347313d..6e685f4b356 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 111cfd19fff..cfb7dbddf3d 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 689023601a3..8f41f44b3dc 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/mapping/reflect/EntityReflector.html
@@ -222,13 +222,13 @@ if (location.href.indexOf('is-external=true') == -1) {
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyReader(java.lang.String)">getPropertyReader</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a></code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a></code></td>
                             <td class="colLast"><code><strong><a href="#getPropertyWriter(java.lang.String)">getPropertyWriter</a></strong>(java.lang.String name)</code><br> <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL></td>
                         </tr>
                         
@@ -363,7 +363,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyReader(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyReader.html'>EntityReflector.PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyReader.html'>PropertyReader</a> <strong>getPropertyReader</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property reader for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The name of the property</DD></DL></p>
                             </li>
@@ -372,7 +372,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                         <a name="getPropertyWriter(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;<a href='../../../../../org/grails/datastore/mapping/reflect/EntityReflector.PropertyWriter.html'>EntityReflector.PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
+                                <h4>public&nbsp;<a href='../../../../../PropertyWriter.html'>PropertyWriter</a> <strong>getPropertyWriter</strong>(java.lang.String name)</h4>
                                 <p>
       <DL><DT><B>Parameters:</B></DT><DD><code>name</code> -  Obtains the property writer for the given property</DD></DL><DL><DT><B>Returns:</B></DT><DD>The property writer</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index b107ac8f274..7e17cbd898f 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(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../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 org.springframework.context.ApplicationContextAware, <a href='../../.
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(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='../../../../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/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 51aa97034ca..a2b8e82ca42 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;<a href='../../../../FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<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;<a href='../../../../FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 48154fe191f..ccfa5d95f6b 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><a href='../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.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(FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../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>(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, FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../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>(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, FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(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='../../../../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, 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, <a href='../../../../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, 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, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
index 087aa0712fb..cb2f6e96b9f 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(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../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 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(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='../../../../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/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 f00ca9da25e..5b744718bf7 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 916363b0b6f..1e6a10ccafe 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><a href='../../../../../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='../../../../../FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index d1db5c90a0f..2b2630fd080 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;<a href='../../../../../FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.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, FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../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>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, 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, <a href='../../../../../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/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 51afcc9b7fb..7f21bc8eb2a 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;<a href='../../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
index 4378cae5bdf..d1064945473 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, FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../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/grails-data/mongodb/api/index-all.html b/docs/snapshot/grails-data/mongodb/api/index-all.html
index 7efec0eb204..7567c9632d6 100644
--- a/docs/snapshot/grails-data/mongodb/api/index-all.html
+++ b/docs/snapshot/grails-data/mongodb/api/index-all.html
@@ -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, FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibernateTransactionManager</a>
 </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>
@@ -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, FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, 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(FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(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(FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(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/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 41baa06003c..2f9119a00b6 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(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../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">
@@ -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(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='../../../../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/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 61fcbd8d3cc..3d65a032feb 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;<a href='../../../../FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<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;<a href='../../../../FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index e68e440b51b..a45a2766cc0 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><a href='../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.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(FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../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>(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, FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../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>(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, FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(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='../../../../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, 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, <a href='../../../../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, 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, <a href='../../../../FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
index 3c17b360312..0a2fe3033e6 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(FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -492,7 +492,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                     </table>
                    </ul>
@@ -938,10 +938,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(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='../../../../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/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 6b08248b2e3..0ed0dff511f 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><a href='../../../../../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='../../../../../FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 5be6b2f6305..fd7609cefab 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;<a href='../../../../../FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.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, FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../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>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, 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, <a href='../../../../../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/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 29b5debed3d..d55b8f52b79 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;<a href='../../../../../FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/whats-new-manual/index.html b/docs/snapshot/grails-data/whats-new-manual/index.html
index 3ddcb02f9aa..b5c2a45f1ca 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-24 17:08:21 UTC
+Last updated 2025-10-24 22:31:56 UTC
 </div>
 </div>
 </body>