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/29 17:28:03 UTC

(grails-website) branch asf-site-production updated: Deploying to documentation branch - 17:27: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 904f0fcdcd2 Deploying to documentation branch - 17:27:51
904f0fcdcd2 is described below

commit 904f0fcdcd2cc37a942a1dba4b88e973e557febc
Author: matrei <ma...@users.noreply.github.com>
AuthorDate: Wed Oct 29 17:27:54 2025 +0000

    Deploying to documentation branch - 17:27:51
---
 docs/snapshot/api/deprecated-list.html             |  2 +-
 docs/snapshot/api/index-all.html                   | 22 ++++-----
 .../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 +-
 .../api/org/grails/web/json/JSONWriter.html        | 22 ++++-----
 .../web/json/PathCapturingJSONWriterWrapper.html   | 20 ++++----
 .../org/grails/web/json/PrettyPrintJSONWriter.html |  8 ++--
 .../api/org/grails/web/xml/XMLStreamWriter.html    |  4 +-
 docs/snapshot/grails-data/api/index-all.html       |  4 +-
 .../document/config/DocumentMappingContext.html    |  2 +-
 .../mapping/config/KeyValueMappingContext.html     |  2 +-
 .../mapping/model/AbstractMappingContext.html      |  6 +--
 .../datastore/mapping/model/MappingContext.html    |  6 +--
 .../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 +-
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +--
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 ++++-----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 ++--
 .../orm/hibernate/cfg/HibernateMappingContext.html |  2 +-
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 ++--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../grails-data/mongodb/api/deprecated-list.html   |  2 +-
 .../api/grails/orm/HibernateCriteriaBuilder.html   |  2 +-
 .../grails-data/mongodb/api/index-all.html         | 12 ++---
 .../orm/hibernate/AbstractHibernateDatastore.html  |  6 +--
 .../orm/hibernate/GrailsHibernateTemplate.html     |  4 +-
 .../GrailsHibernateTransactionManager.html         | 22 ++++-----
 .../grails/orm/hibernate/HibernateDatastore.html   |  8 ++--
 ...ceSettings.HibernateSettings.FlushSettings.html |  4 +-
 .../query/AbstractHibernateCriteriaBuilder.html    | 14 +++---
 ...ctHibernateQuery.HibernateAssociationQuery.html |  6 +--
 ...ractHibernateQuery.HibernateProjectionList.html | 56 ++++++++--------------
 .../hibernate/query/AbstractHibernateQuery.html    | 10 ++--
 .../grails/orm/hibernate/query/HibernateQuery.html |  2 +-
 .../hibernate/support/HibernateVersionSupport.html | 10 ++--
 .../GrailsOpenSessionInViewInterceptor.html        |  4 +-
 .../grails-data/whats-new-manual/index.html        |  2 +-
 60 files changed, 208 insertions(+), 226 deletions(-)

diff --git a/docs/snapshot/api/deprecated-list.html b/docs/snapshot/api/deprecated-list.html
index 43d39a1591f..c715e1633eb 100644
--- a/docs/snapshot/api/deprecated-list.html
+++ b/docs/snapshot/api/deprecated-list.html
@@ -517,7 +517,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/api/index-all.html b/docs/snapshot/api/index-all.html
index b16e2f7d32e..b599a28ac97 100644
--- a/docs/snapshot/api/index-all.html
+++ b/docs/snapshot/api/index-all.html
@@ -11534,11 +11534,11 @@ if (location.href.indexOf('is-external=true') == -1) {
  <a href='../../../org/grails/encoder/EncodingStateRegistry.html' title='EncodingStateRegistry'>EncodingStateRegistry</a></div></dd>
 <dt><span class="strong"><a href="org/grails/encoder/EncodingStateRegistryLookupHolder.html" title="Class in org.grails.encoder">EncodingStateRegistryLookupHolder</a></span> - Class in <a href="./org/grails/encoder/package-summary.html">org.grails.encoder</a>
 </dt><dd><div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#end(Mode, char)" title="Method in JSONWriter">end(Mode, char)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#end(org.grails.web.json.JSONWriter.Mode, char)" title="Method in JSONWriter">end(org.grails.web.json.JSONWriter.Mode, char)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
 </dt><dd> <div class="block">End something.</div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#end(Mode, char)" title="Method in PathCapturingJSONWriterWrapper">end(Mode, char)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
+<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#end(org.grails.web.json.JSONWriter.Mode, char)" title="Method in PathCapturingJSONWriterWrapper">end(org.grails.web.json.JSONWriter.Mode, char)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PrettyPrintJSONWriter.html#end(Mode, char)" title="Method in PrettyPrintJSONWriter">end(Mode, char)</a></span> - Method in <a href="org/grails/web/json/PrettyPrintJSONWriter.html">PrettyPrintJSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/PrettyPrintJSONWriter.html#end(org.grails.web.json.JSONWriter.Mode, char)" title="Method in PrettyPrintJSONWriter">end(org.grails.web.json.JSONWriter.Mode, char)</a></span> - Method in <a href="org/grails/web/json/PrettyPrintJSONWriter.html">PrettyPrintJSONWriter</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/web/xml/PrettyPrintXMLStreamWriter.html#end()" title="Method in PrettyPrintXMLStreamWriter">end()</a></span> - Method in <a href="org/grails/web/xml/PrettyPrintXMLStreamWriter.html">PrettyPrintXMLStreamWriter</a>
 </dt><dd> <div class="block"></div></dd>
@@ -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, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -33179,11 +33179,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html#pooled" title="Property in DataSourceSettings">pooled</a></span> - Property in <a href="org/grails/datastore/gorm/jdbc/connections/DataSourceSettings.html">DataSourceSettings</a>
 </dt><dd> <div class="block">Whether the data source is pooled</div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#pop(Mode)" title="Method in JSONWriter">pop(Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#pop(org.grails.web.json.JSONWriter.Mode)" title="Method in JSONWriter">pop(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
 </dt><dd> <div class="block">Pop an array or object scope.</div></dd>
 <dt><span class="strong"><a href="org/grails/taglib/encoder/OutputEncodingStack.html#pop(boolean)" title="Method in OutputEncodingStack">pop(boolean)</a></span> - Method in <a href="org/grails/taglib/encoder/OutputEncodingStack.html">OutputEncodingStack</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#pop(Mode)" title="Method in PathCapturingJSONWriterWrapper">pop(Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
+<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#pop(org.grails.web.json.JSONWriter.Mode)" title="Method in PathCapturingJSONWriterWrapper">pop(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesPageContext.html#popBody()" title="Method in GroovyPagesPageContext">popBody()</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesPageContext.html">GroovyPagesPageContext</a>
 </dt><dd> <div class="block"></div></dd>
@@ -34427,11 +34427,11 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd><div class="block">Handles generating the checksum file, published artifact list, and grails-publish configuration</div></dd>
 <dt><span class="strong"><a href="org/apache/grails/buildsrc/PublishPlugin.html#PublishPlugin()" title="Constructor in PublishPlugin">PublishPlugin()</a></span> - Constructor in <a href="org/apache/grails/buildsrc/PublishPlugin.html">PublishPlugin</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#push(Mode)" title="Method in JSONWriter">push(Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
+<dt><span class="strong"><a href="org/grails/web/json/JSONWriter.html#push(org.grails.web.json.JSONWriter.Mode)" title="Method in JSONWriter">push(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/JSONWriter.html">JSONWriter</a>
 </dt><dd> <div class="block">Push an array or object scope.</div></dd>
 <dt><span class="strong"><a href="org/grails/taglib/encoder/OutputEncodingStack.html#push(org.grails.taglib.encoder.OutputEncodingStackAttributes, boolean)" title="Method in OutputEncodingStack">push(org.grails.taglib.encoder.OutputEncodingStackAttributes, boolean)</a></span> - Method in <a href="org/grails/taglib/encoder/OutputEncodingStack.html">OutputEncodingStack</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#push(Mode)" title="Method in PathCapturingJSONWriterWrapper">push(Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
+<dt><span class="strong"><a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html#push(org.grails.web.json.JSONWriter.Mode)" title="Method in PathCapturingJSONWriterWrapper">push(org.grails.web.json.JSONWriter.Mode)</a></span> - Method in <a href="org/grails/web/json/PathCapturingJSONWriterWrapper.html">PathCapturingJSONWriterWrapper</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/gsp/jsp/GroovyPagesPageContext.html#pushBody()" title="Method in GroovyPagesPageContext">pushBody()</a></span> - Method in <a href="org/grails/gsp/jsp/GroovyPagesPageContext.html">GroovyPagesPageContext</a>
 </dt><dd> <div class="block"></div></dd>
@@ -38163,7 +38163,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -44652,9 +44652,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="grails/artefact/Controller.html#withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)" title="Method in Controller">withForm(org.grails.web.servlet.mvc.GrailsWebRequest, groovy.lang.Closure)</a></span> - Method in <a href="grails/artefact/Controller.html">Controller</a>
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index ba06f003bb8..14322eba2e6 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -531,7 +531,7 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements <a href='../../../../org.springframework.context.ApplicationContextAw
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 4b485132b45..e3e21ea9c65 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>applyFlushMode</strong>(<a href='../../../../org.hibernate.Session.html'>Session</a> session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 55ae974b603..57c6a0e8c8a 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -137,7 +137,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -170,17 +170,17 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore [...]
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -250,7 +250,7 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -277,26 +277,26 @@ extends <a href='../../../../org.springframework.orm.hibernate5.HibernateTransac
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org.hibernate.SessionFactory.html'>SessionFactory</a> sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
index bd31aa2dd22..35b4cc93e76 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -477,7 +477,7 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements <a href='../../../../org.springframework.context.MessageSourceAware.h
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index 7ca2ecd85a9..8887d660d1b 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4><a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 6cda73aaf84..308a2decd2d 100644
--- a/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/ [...]
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>getFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(<a href='../../../../../org.hibernate.Session.html'>Session</a> session, <a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index ab3322348a1..569eeb118c4 100644
--- a/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -220,7 +220,7 @@ extends <a href='../../../../../org.springframework.orm.hibernate5.support.OpenS
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../org.hibernate.FlushMode.html'>FlushMode</a> <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/web/json/JSONWriter.html b/docs/snapshot/api/org/grails/web/json/JSONWriter.html
index d4c05d35566..f83ffd812df 100644
--- a/docs/snapshot/api/org/grails/web/json/JSONWriter.html
+++ b/docs/snapshot/api/org/grails/web/json/JSONWriter.html
@@ -188,7 +188,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="rowColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../Mode.html'>Mode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code></td>
                             <td class="colLast">The current mode. </td>
                         </tr>
@@ -277,7 +277,7 @@ extends java.lang.Object</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#end(Mode, char)">end</a></strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</code><br>End something.</td>
+                            <td class="colLast"><code><strong><a href="#end(org.grails.web.json.JSONWriter.Mode, char)">end</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</code><br>End something.</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -307,13 +307,13 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#pop(Mode)">pop</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br>Pop an array or object scope.</td>
+                            <td class="colLast"><code><strong><a href="#pop(org.grails.web.json.JSONWriter.Mode)">pop</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br>Pop an array or object scope.</td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#push(Mode)">push</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br>Push an array or object scope.</td>
+                            <td class="colLast"><code><strong><a href="#push(org.grails.web.json.JSONWriter.Mode)">push</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br>Push an array or object scope.</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -407,7 +407,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../Mode.html'>Mode</a> <strong>mode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> <strong>mode</strong></h4>
                                 <p> The current mode. Values:
      </p>
                             </li>
@@ -496,10 +496,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="end(Mode, char)"><!-- --></a>
+                        <a name="end(org.grails.web.json.JSONWriter.Mode, char)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</h4>
                                 <p> End something.
       <DL><DT><B>Parameters:</B></DT><DD><code>m</code> -  Mode</DD><DD><code>c</code> -  Closing character</DD></DL><DL><DT><B>Returns:</B></DT><DD>this</DD></DL></p>
                             </li>
@@ -546,19 +546,19 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="pop(Mode)"><!-- --></a>
+                        <a name="pop(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>pop</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>protected&nbsp;void <strong>pop</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p> Pop an array or object scope.
       <DL><DT><B>Parameters:</B></DT><DD><code>c</code> -  The scope to close.</DD></DL></p>
                             </li>
                         </ul>
                     
-                        <a name="push(Mode)"><!-- --></a>
+                        <a name="push(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;void <strong>push</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>protected&nbsp;void <strong>push</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p> Push an array or object scope.
       <DL><DT><B>Parameters:</B></DT><DD><code>c</code> -  The scope to open.</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html b/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html
index cc720ad54d6..1360d1148b3 100644
--- a/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html
+++ b/docs/snapshot/api/org/grails/web/json/PathCapturingJSONWriterWrapper.html
@@ -208,7 +208,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#end(Mode, char)">end</a></strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#end(org.grails.web.json.JSONWriter.Mode, char)">end</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -250,13 +250,13 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#pop(Mode)">pop</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#pop(org.grails.web.json.JSONWriter.Mode)">pop</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#push(Mode)">push</a></strong>(<a href='../../../../Mode.html'>Mode</a> c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#push(org.grails.web.json.JSONWriter.Mode)">push</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -299,7 +299,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(Mode, char)'>end</a>, <a href [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(org.grails.web.json.JSONWrite [...]
                         </tr>
                     </table>
                    </ul>
@@ -375,10 +375,10 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                             </li>
                         </ul>
                     
-                        <a name="end(Mode, char)"><!-- --></a>
+                        <a name="end(org.grails.web.json.JSONWriter.Mode, char)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -431,18 +431,18 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                             </li>
                         </ul>
                     
-                        <a name="pop(Mode)"><!-- --></a>
+                        <a name="pop(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>pop</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>pop</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="push(Mode)"><!-- --></a>
+                        <a name="push(org.grails.web.json.JSONWriter.Mode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>push</strong>(<a href='../../../../Mode.html'>Mode</a> c)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>push</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html b/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html
index 515a234ede2..c2cbd2d5614 100644
--- a/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html
+++ b/docs/snapshot/api/org/grails/web/json/PrettyPrintJSONWriter.html
@@ -233,7 +233,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><strong><a href="#end(Mode, char)">end</a></strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#end(org.grails.web.json.JSONWriter.Mode, char)">end</a></strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -276,7 +276,7 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(Mode, char)'>end</a>, <a href [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/web/json/JSONWriter.html#append(groovy.lang.Writable)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#append(java.lang.String)'>append</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#array()'>array</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#comma()'>comma</a>, <a href='../../../../org/grails/web/json/JSONWriter.html#end(org.grails.web.json.JSONWrite [...]
                         </tr>
                     </table>
                    </ul>
@@ -378,10 +378,10 @@ extends <a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a>
                             </li>
                         </ul>
                     
-                        <a name="end(Mode, char)"><!-- --></a>
+                        <a name="end(org.grails.web.json.JSONWriter.Mode, char)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../Mode.html'>Mode</a> m, char c)</h4>
+                                <h4>@java.lang.Override<br>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.html'>JSONWriter</a> <strong>end</strong>(<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> m, char c)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html b/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html
index 3bacca72c21..ea9a49bfe2e 100644
--- a/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html
+++ b/docs/snapshot/api/org/grails/web/xml/XMLStreamWriter.html
@@ -157,7 +157,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../Mode.html'>Mode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -311,7 +311,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../Mode.html'>Mode</a> <strong>mode</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../org/grails/web/json/JSONWriter.Mode.html'>JSONWriter.Mode</a> <strong>mode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/api/index-all.html b/docs/snapshot/grails-data/api/index-all.html
index f72d58d4847..acdd0c98e4a 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/developer-manual/gettingStarted.html b/docs/snapshot/grails-data/developer-manual/gettingStarted.html
index 590ca653ee1..e84e143719a 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 5d22dcd4cb8..d473d342970 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 74ba82d3585..eea04f9f147 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 358e571f2c3..cfc9f433e8c 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 28635a3424a..2b36ccd6f1f 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 7f6c915b3cb..396932e5d4f 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 43a9c23016c..49afd6eee8c 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 3b7ae211400..90e403e44f9 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 6ecb0a02755..517515e1445 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 7e6adca61da..5b753450ffa 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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 cf17e59cb07..e9776abd12d 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 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..7a4afcb4870 100644
--- a/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/hibernate5/api/deprecated-list.html
@@ -305,7 +305,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/grails-data/hibernate5/api/index-all.html b/docs/snapshot/grails-data/hibernate5/api/index-all.html
index a339d63853c..d4877c00873 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, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -13691,7 +13691,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -15550,9 +15550,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.html#withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)" title="Method in ApplicationContextDatabaseMigrationCommand">withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/co [...]
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/datastore/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/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index b107ac8f274..b3e4a0dd95c 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -531,7 +531,7 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1042,10 +1042,10 @@ implements org.springframework.context.ApplicationContextAware, <a href='../../.
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 51aa97034ca..55a9e0e13aa 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index 48154fe191f..bb68725d766 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -157,7 +157,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;org.hibernate.FlushMode <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
index 087aa0712fb..aca93a66060 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -477,7 +477,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -496,7 +496,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/datastore/mapping/core/AbstractDatastore.html'>AbstractDatastore</a></code></td>
@@ -946,10 +946,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/cfg/HibernateMappingContext.html
index 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..9d7e737d914 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index d1db5c90a0f..da6fee2c7ea 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index 51afcc9b7fb..0bdd09fd03f 100644
--- a/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/grails-data/hibernate5/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
index 4378cae5bdf..9f50889d75a 100644
--- a/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
+++ b/docs/snapshot/grails-data/mongodb/api/deprecated-list.html
@@ -167,7 +167,7 @@ if (location.href.indexOf('is-external=true') == -1) {
                 </td>
             </tr>
             <tr class="altColor">
-                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)
+                <td class="colOne"><strong><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">HibernateVersionSupport#setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)
                     <div class="block"><i>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</i></div>
                 </td>
             </tr>
diff --git a/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html b/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
index 29a4aa05dc5..1a2d21da73e 100644
--- a/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
+++ b/docs/snapshot/grails-data/mongodb/api/grails/orm/HibernateCriteriaBuilder.html
@@ -534,7 +534,7 @@ extends <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaB
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html'>AbstractHibernateCriteriaBuilder</a></code></td>
-                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
+                            <td class="colLast"><code><a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addProjectionToList(Projection, java.lang.String)'>addProjectionToList</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#allEq(Map)'>allEq</a>, <a href='../../org [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/index-all.html b/docs/snapshot/grails-data/mongodb/api/index-all.html
index e8dc900b4c6..9a469cfea56 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, org.hibernate.FlushMode)" title="Constructor in GrailsHibernateTransactionManager">GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)</a></span> - Constructor in <a href="org/grails/orm/hibernate/GrailsHibernateTransactionManager.html">GrailsHibern [...]
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html" title="Class in org.grails.orm.hibernate.cfg">GrailsHibernateUtil</a></span> - Class in <a href="./org/grails/orm/hibernate/cfg/package-summary.html">org.grails.orm.hibernate.cfg</a>
 </dt><dd><div class="block">Utility methods for configuring Hibernate inside Grails.</div></dd>
@@ -5240,9 +5240,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html#order(java.lang.String, java.lang.String)" title="Method in AbstractHibernateCriteriaBuilder">order(java.lang.String, java.lang.String)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html">AbstractHibernateCriteriaBuilder</a>
 </dt><dd> <div class="block">Orders by the specified property name and direction</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#order(org.hibernate.criterion.Order)" title="Method in AbstractHibernateQuery">order(org.hibernate.criterion.Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html#order(Order)" title="Method in AbstractHibernateQuery">order(Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.html">AbstractHibernateQuery</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html#order(org.hibernate.criterion.Order)" title="Method in AbstractHibernateQuery.HibernateAssociationQuery">order(org.hibernate.criterion.Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html">AbstractHibernateQuery.HibernateAssociationQuery</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html#order(Order)" title="Method in AbstractHibernateQuery.HibernateAssociationQuery">order(Order)</a></span> - Method in <a href="org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html">AbstractHibernateQuery.HibernateAssociationQuery</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html#ORDER_ASC" title="Field in GrailsHibernateUtil">ORDER_ASC</a></span> - Field in <a href="org/grails/orm/hibernate/cfg/GrailsHibernateUtil.html">GrailsHibernateUtil</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6034,7 +6034,7 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Set the flush behavior to one of the constants in this class. </div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateSession.html#setFlushMode(jakarta.persistence.FlushModeType)" title="Method in HibernateSession">setFlushMode(jakarta.persistence.FlushModeType)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateSession.html">HibernateSession</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)" title="Method in HibernateVersionSupport">setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)</a></span> - Method in <a href="org/grails/orm/hibernate/support/HibernateVersionSupport.html">HibernateVersionSupport</a>
 </dt><dd> <div class="block">Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</div></dd>
 <dt><span class="strong"><a href="org/grails/orm/hibernate/IHibernateTemplate.html#setFlushMode(int)" title="Method in IHibernateTemplate">setFlushMode(int)</a></span> - Method in <a href="org/grails/orm/hibernate/IHibernateTemplate.html">IHibernateTemplate</a>
 </dt><dd> <div class="block"></div></dd>
@@ -6894,9 +6894,9 @@ if (location.href.indexOf('is-external=true') == -1) {
 </dt><dd> <div class="block">Use the given database for this entity for the scope of the closure call</div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html#withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)" title="Method in DatabaseMigrationCommand">withFileOrSystemOutWriter(java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.html">DatabaseMigrationCommand</a>
 </dt><dd> <div class="block"></div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in AbstractHibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/AbstractHibernateDatastore.html">AbstractHibernateDatastore</a>
 </dt><dd> <div class="block">Execute the given operation with the given flush mode</div></dd>
-<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
+<dt><span class="strong"><a href="org/grails/orm/hibernate/HibernateDatastore.html#withFlushMode(org.hibernate.FlushMode, Callable<Boolean>)" title="Method in HibernateDatastore">withFlushMode(org.hibernate.FlushMode, Callable&lt;Boolean&gt;)</a></span> - Method in <a href="org/grails/orm/hibernate/HibernateDatastore.html">HibernateDatastore</a>
 </dt><dd> <div class="block"></div></dd>
 <dt><span class="strong"><a href="org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.html#withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)" title="Method in ApplicationContextDatabaseMigrationCommand">withGormDatabase(org.springframework.context.ConfigurableApplicationContext, java.lang.String, groovy.lang.Closure)</a></span> - Method in <a href="org/grails/plugins/databasemigration/co [...]
 </dt><dd> <div class="block"></div></dd>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
index 41baa06003c..dde5997dbde 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/AbstractHibernateDatastore.html
@@ -514,7 +514,7 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;abstract&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br>Execute the given operation with the given flush mode</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1025,10 +1025,10 @@ implements org.springframework.context.ApplicationContextAware, org.grails.datas
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>public&nbsp;abstract&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p> Execute the given operation with the given flush mode
       <DL><DT><B>Parameters:</B></DT><DD>flushMode</DD><DD><code>callable</code> -  The callable</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
index 61fcbd8d3cc..0294476ae87 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTemplate.html
@@ -306,7 +306,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>protected&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#applyFlushMode(org.hibernate.Session, boolean)">applyFlushMode</a></strong>(org.hibernate.Session session, boolean existingTransaction)</code><br>Apply the flush mode that's been specified for this accessor to the given Session.</td>
                         </tr>
                         
@@ -822,7 +822,7 @@ implements <a href='../../../../org/grails/orm/hibernate/IHibernateTemplate.html
                         <a name="applyFlushMode(org.hibernate.Session, boolean)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>applyFlushMode</strong>(org.hibernate.Session session, boolean existingTransaction)</h4>
                                 <p> Apply the flush mode that's been specified for this accessor to the given Session.
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -              the current Hibernate Session</DD><DD><code>existingTransaction</code> -  if executing within an existing transaction</DD></DL><DL><DT><B>Returns:</B></DT><DD>the previous flush mode to restore after the operation, or <code>null</code> if none</DD></DL><DL><DT><B>See Also:</B></DT><DD><a href='#setFlushMode'>setFlushMode</a></DD><DD>org.hibernate.Session#setFlushMode</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
index e68e440b51b..9d117b9bb30 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/GrailsHibernateTransactionManager.html
@@ -157,7 +157,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#defaultFlushMode">defaultFlushMode</a></code><br></td>
                         </tr>
                         
@@ -190,17 +190,17 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst">
-                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</code><br></td>
+                                <code><strong><a href="#GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)">GrailsHibernateTransactionManager</a></strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</code><br></td>
                         </tr>
                         
                     </table>
@@ -288,7 +288,7 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                         <a name="defaultFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>final&nbsp;<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>defaultFlushMode</strong></h4>
+                                <h4>final&nbsp;org.hibernate.FlushMode <strong>defaultFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -315,26 +315,26 @@ extends org.springframework.orm.hibernate5.HibernateTransactionManager</pre>
                 </a>
                     <h3>Constructor Detail</h3>
                     
-                        <a name="GrailsHibernateTransactionManager(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
                     
-                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="GrailsHibernateTransactionManager(org.hibernate.SessionFactory, javax.sql.DataSource, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> defaultFlushMode)</h4>
+                                <h4><strong>GrailsHibernateTransactionManager</strong>(org.hibernate.SessionFactory sessionFactory, javax.sql.DataSource dataSource, org.hibernate.FlushMode defaultFlushMode)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
index 3c17b360312..b59db52218b 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/HibernateDatastore.html
@@ -473,7 +473,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)">withFlushMode</a></strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#withFlushMode(org.hibernate.FlushMode, Callable)">withFlushMode</a></strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</code><br></td>
                         </tr>
                         
                     </table>
@@ -492,7 +492,7 @@ implements org.springframework.context.MessageSourceAware</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html'>AbstractHibernateDatastore</a></code></td>
-                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
+                            <td class="colLast"><code><a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#call(java.lang.Object)'>call</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#close()'>close</a>, <a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.html#createValidatorRegistry(org.springframework.context.MessageSource)'>createValidatorRegistry</a>, <a href='../../../../org/grails/orm/hibernate/Abstrac [...]
                         </tr>
                     </table>
                    </ul>
@@ -938,10 +938,10 @@ implements org.springframework.context.MessageSourceAware</pre>
                             </li>
                         </ul>
                     
-                        <a name="withFlushMode(org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode, Callable)"><!-- --></a>
+                        <a name="withFlushMode(org.hibernate.FlushMode, Callable)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(<a href='../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;void <strong>withFlushMode</strong>(org.hibernate.FlushMode flushMode, java.util.concurrent.Callable&lt;java.lang.Boolean&gt; callable)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
index 6b08248b2e3..0e74a1879e8 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/connections/HibernateConnectionSourceSettings.HibernateSettings.FlushSettings.html
@@ -158,7 +158,7 @@ extends java.lang.Object</pre>
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#mode">mode</a></code><br>The default flush mode</td>
                         </tr>
                         
@@ -241,7 +241,7 @@ extends java.lang.Object</pre>
                         <a name="mode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4><a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>mode</strong></h4>
+                                <h4>org.hibernate.FlushMode <strong>mode</strong></h4>
                                 <p> The default flush mode</p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
index a1d4b7c6910..a0372fa2b73 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateCriteriaBuilder.html
@@ -488,7 +488,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.criterion.ProjectionList</strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#projectionList">projectionList</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -666,7 +666,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>protected&nbsp;org.hibernate.criterion.Order</code></td>
+                            <td class="colLast"><code>protected&nbsp;<a href='../../../../../Order.html'>Order</a></code></td>
                             <td class="colLast"><code><strong><a href="#convertOrder(org.grails.datastore.mapping.query.Query$Order, java.lang.String)">convertOrder</a></strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</code><br></td>
                         </tr>
                         
@@ -1247,7 +1247,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.api.Criteria</code></td>
-                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order o)</code><br>Orders by the specified property name (defaults to ascending)</td>
+                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> o)</code><br>Orders by the specified property name (defaults to ascending)</td>
                         </tr>
                         
                         <tr class="rowColor">
@@ -1906,7 +1906,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="projectionList"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.criterion.ProjectionList <strong>projectionList</strong></h4>
+                                <h4>protected&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projectionList</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2122,7 +2122,7 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                         <a name="convertOrder(org.grails.datastore.mapping.query.Query$Order, java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;org.hibernate.criterion.Order <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
+                                <h4>protected&nbsp;<a href='../../../../../Order.html'>Order</a> <strong>convertOrder</strong>(org.grails.datastore.mapping.query.Query$Order o, java.lang.String property)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -2949,10 +2949,10 @@ implements <a href='../../../../../org.grails.datastore.mapping.query.apiBuildab
                             </li>
                         </ul>
                     
-                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
+                        <a name="order(Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(org.hibernate.criterion.Order o)</h4>
+                                <h4>public&nbsp;org.grails.datastore.mapping.query.api.Criteria <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> o)</h4>
                                 <p> Orders by the specified property name (defaults to ascending)
       <DL><DT><B>Parameters:</B></DT><DD><code>o</code> -  The property name to order by</DD></DL><DL><DT><B>Returns:</B></DT><DD>A Order instance</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
index 71fa8422100..7b770c4f52e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateAssociationQuery.html
@@ -351,7 +351,7 @@ extends org.grails.datastore.mapping.query.AssociationQuery</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.Query</code></td>
-                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
@@ -662,10 +662,10 @@ extends org.grails.datastore.mapping.query.AssociationQuery</pre>
                             </li>
                         </ul>
                     
-                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
+                        <a name="order(Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
index 2fb9e6fc7e8..a932bb26139 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.HibernateProjectionList.html
@@ -102,7 +102,7 @@ if (location.href.indexOf('is-external=true') == -1) {
             <hr>
 
 <pre>protected class AbstractHibernateQuery.HibernateProjectionList
-extends org.hibernate.criterion.ProjectionList</pre>
+extends <a href='../../../../../ProjectionList.html'>ProjectionList</a></pre>
 
           </li>
     </ul>
@@ -144,19 +144,19 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#add(Projection)">add</a></strong>(<a href='../../../../../Projection.html'>Projection</a> p)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#avg(java.lang.String)">avg</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#count()">count</a></strong>()</code><br></td>
                         </tr>
                         
@@ -174,7 +174,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#distinct()">distinct</a></strong>()</code><br></td>
                         </tr>
                         
@@ -186,7 +186,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#id()">id</a></strong>()</code><br></td>
                         </tr>
                         
@@ -204,19 +204,19 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#max(java.lang.String)">max</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#min(java.lang.String)">min</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#property(java.lang.String)">property</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
@@ -228,7 +228,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#sum(java.lang.String)">sum</a></strong>(java.lang.String name)</code><br></td>
                         </tr>
                         
@@ -236,24 +236,6 @@ extends org.hibernate.criterion.ProjectionList</pre>
                    </ul>
               </li>
             
-            <li class="blockList"><a name="method_summary"><!--   --></a>
-                    <h3>Inherited Methods Summary</h3>
-                    <ul class="blockList">
-                    <table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Inherited Methods Summary table">
-                        <caption><span>Inherited Methods</span><span class="tabEnd">&nbsp;</span></caption>
-                        <tr>
-                            <th class="colFirst" scope="col">Methods inherited from class</th>
-                            <th class="colLast" scope="col">Name</th>
-                        </tr>
-                        
-                        <tr class="altColor">
-                            <td class="colFirst"><code>class org.hibernate.criterion.ProjectionList</code></td>
-                            <td class="colLast"><code>org.hibernate.criterion.ProjectionList#add(org.hibernate.criterion.Projection), org.hibernate.criterion.ProjectionList#add(org.hibernate.criterion.Projection, java.lang.String), org.hibernate.criterion.ProjectionList#create(), org.hibernate.criterion.ProjectionList#equals(java.lang.Object), org.hibernate.criterion.ProjectionList#getAliases(), org.hibernate.criterion.ProjectionList#getClass(), org.hibernate.criterion.ProjectionList#get [...]
-                        </tr>
-                    </table>
-                   </ul>
-              </li>
-                
         </ul>
         
     </li>
@@ -285,7 +267,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="add(Projection)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>add</strong>(<a href='../../../../../Projection.html'>Projection</a> p)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -293,7 +275,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="avg(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>avg</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>avg</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -301,7 +283,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="count()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>count</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>count</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -325,7 +307,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="distinct()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>distinct</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>distinct</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -341,7 +323,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="id()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>id</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>id</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -365,7 +347,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="max(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>max</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>max</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -373,7 +355,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="min(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>min</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>min</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -381,7 +363,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="property(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>property</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>property</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -397,7 +379,7 @@ extends org.hibernate.criterion.ProjectionList</pre>
                         <a name="sum(java.lang.String)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>sum</strong>(java.lang.String name)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>sum</strong>(java.lang.String name)</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
index cf8a5e44832..e308661b54a 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/AbstractHibernateQuery.html
@@ -647,12 +647,12 @@ extends org.grails.datastore.mapping.query.Query</pre>
                         <tr class="altColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;org.grails.datastore.mapping.query.Query</code></td>
-                            <td class="colLast"><code><strong><a href="#order(org.hibernate.criterion.Order)">order</a></strong>(org.hibernate.criterion.Order order)</code><br></td>
+                            <td class="colLast"><code><strong><a href="#order(Order)">order</a></strong>(<a href='../../../../../Order.html'>Order</a> order)</code><br></td>
                         </tr>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;org.hibernate.criterion.ProjectionList</code></td>
+                            <td class="colLast"><code>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a></code></td>
                             <td class="colLast"><code><strong><a href="#projections()">projections</a></strong>()</code><br></td>
                         </tr>
                         
@@ -1330,10 +1330,10 @@ extends org.grails.datastore.mapping.query.Query</pre>
                             </li>
                         </ul>
                     
-                        <a name="order(org.hibernate.criterion.Order)"><!-- --></a>
+                        <a name="order(Order)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(org.hibernate.criterion.Order order)</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;org.grails.datastore.mapping.query.Query <strong>order</strong>(<a href='../../../../../Order.html'>Order</a> order)</h4>
                                 <p></p>
                             </li>
                         </ul>
@@ -1341,7 +1341,7 @@ extends org.grails.datastore.mapping.query.Query</pre>
                         <a name="projections()"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Override<br>public&nbsp;org.hibernate.criterion.ProjectionList <strong>projections</strong>()</h4>
+                                <h4>@java.lang.Override<br>public&nbsp;<a href='../../../../../ProjectionList.html'>ProjectionList</a> <strong>projections</strong>()</h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
index b389da1df50..233a657adc1 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/query/HibernateQuery.html
@@ -293,7 +293,7 @@ extends <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernate
                         
                         <tr class="altColor">
                             <td class="colFirst"><code>class <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html'>AbstractHibernateQuery</a></code></td>
-                            <td class="colLast"><code><a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#add(org.hibernate.criterion.Criterion)'>add</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/orm/hibernate [...]
+                            <td class="colLast"><code><a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#add(org.hibernate.criterion.Criterion)'>add</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#addToCriteria(org.hibernate.criterion.Criterion)'>addToCriteria</a>, <a href='../../../../../org/grails/orm/hibernate/query/AbstractHibernateQuery.html#allEq(Map)'>allEq</a>, <a href='../../../../../org/grails/orm/hibernate [...]
                         </tr>
                     </table>
                    </ul>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
index 5be6b2f6305..132cbb5961e 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/orm/hibernate/support/HibernateVersionSupport.html
@@ -155,7 +155,7 @@ extends java.lang.Object</pre>
                         
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
-                            <td class="colLast"><code>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></code></td>
+                            <td class="colLast"><code>public&nbsp;static&nbsp;org.hibernate.FlushMode</code></td>
                             <td class="colLast"><code><strong><a href="#getFlushMode(org.hibernate.Session)">getFlushMode</a></strong>(org.hibernate.Session session)</code><br>Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
@@ -168,7 +168,7 @@ extends java.lang.Object</pre>
                         <tr class="rowColor">
                             <td class="colFirst"><code></code></td>
                             <td class="colLast"><code>public&nbsp;static&nbsp;void</code></td>
-                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
+                            <td class="colLast"><code><strong><a href="#setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)">setFlushMode</a></strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</code><br>Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.</td>
                         </tr>
                         
                     </table>
@@ -233,7 +233,7 @@ extends java.lang.Object</pre>
                         <a name="getFlushMode(org.hibernate.Session)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;org.hibernate.FlushMode <strong>getFlushMode</strong>(org.hibernate.Session session)</h4>
                                 <p> Get the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Returns:</B></DT><DD>the FlushMode (never <CODE>null</CODE>)</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
@@ -248,10 +248,10 @@ extends java.lang.Object</pre>
                             </li>
                         </ul>
                     
-                        <a name="setFlushMode(org.hibernate.Session, org.grails.orm.hibernate.AbstractHibernateDatastore.FlushMode)"><!-- --></a>
+                        <a name="setFlushMode(org.hibernate.Session, org.hibernate.FlushMode)"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, <a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> flushMode)</h4>
+                                <h4>@java.lang.Deprecated<br>public&nbsp;static&nbsp;void <strong>setFlushMode</strong>(org.hibernate.Session session, org.hibernate.FlushMode flushMode)</h4>
                                 <p> Set the native Hibernate FlushMode, adapting between Hibernate 5.0/5.1 and 5.2+.<DL><DT><B>deprecated:</B></DT><DD>Previously used for Hibernate backwards, will be removed in a future release.</DD></DL>
       <DL><DT><B>Parameters:</B></DT><DD><code>session</code> -  the Hibernate Session to get the flush mode from</DD></DL><DL><DT><B>Since:</B></DT><DD>4.3</DD></DL></p>
                             </li>
diff --git a/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html b/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
index 29b5debed3d..1f284c61ac8 100644
--- a/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
+++ b/docs/snapshot/grails-data/mongodb/api/org/grails/plugin/hibernate/support/GrailsOpenSessionInViewInterceptor.html
@@ -135,7 +135,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         </tr>
                         
                         <tr class="altColor">
-                            <td class="colFirst"><code><strong>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a></strong></code>&nbsp;</td>
+                            <td class="colFirst"><code><strong>protected&nbsp;org.hibernate.FlushMode</strong></code>&nbsp;</td>
                             <td class="colLast"><code><a href="#hibernateFlushMode">hibernateFlushMode</a></code></td>
                             <td class="colLast"></td>
                         </tr>
@@ -255,7 +255,7 @@ extends org.springframework.orm.hibernate5.support.OpenSessionInViewInterceptor<
                         <a name="hibernateFlushMode"><!-- --></a>
                         <ul class="blockListLast">
                             <li class="blockList">
-                                <h4>protected&nbsp;<a href='../../../../../org/grails/orm/hibernate/AbstractHibernateDatastore.FlushMode.html'>AbstractHibernateDatastore.FlushMode</a> <strong>hibernateFlushMode</strong></h4>
+                                <h4>protected&nbsp;org.hibernate.FlushMode <strong>hibernateFlushMode</strong></h4>
                                 <p></p>
                             </li>
                         </ul>
diff --git a/docs/snapshot/grails-data/whats-new-manual/index.html b/docs/snapshot/grails-data/whats-new-manual/index.html
index 411d4c0ea6a..a8035344e52 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-29 15:42:19 UTC
+Last updated 2025-10-29 17:16:46 UTC
 </div>
 </div>
 </body>