HHH-11646 revert errant after -> afterQuery search and replace

Author: RichardBradley

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java

@@ -22,7 +22,7 @@
  * The jboss-logging {@link MessageLogger} for the hibernate-c3p0 module.  It reserves message ids ranging from
  * 10001 to 15000 inclusively.
  * <p/>
- * New messages must be added afterQuery the last message defined to ensure message codes are unique.
+ * New messages must be added after the last message defined to ensure message codes are unique.
  */
 @MessageLogger(projectCode = "HHH")
 public interface C3P0MessageLogger extends ConnectionPoolingLogger {

hibernate-core/src/main/java/org/hibernate/BasicQueryContract.java

@@ -189,7 +189,7 @@ default CommonQueryContract setFlushMode(FlushMode flushMode) {
 	 * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly()
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies returned by the
-	 * query that existed in the session beforeQuery the query was executed.
+	 * query that existed in the session before the query was executed.
 	 *
 	 * @return {@code true} if the entities and proxies loaded by the query will be put
 	 * in read-only mode; {@code false} otherwise (they will be modifiable)
@@ -216,7 +216,7 @@ default CommonQueryContract setFlushMode(FlushMode flushMode) {
 	 * proxy has, regardless of the session's current setting.
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies
-	 * returned by the query that existed in the session beforeQuery the query was executed.
+	 * returned by the query that existed in the session before the query was executed.
 	 *
 	 * @return {@code this}, for method chaining
 	 *

hibernate-core/src/main/java/org/hibernate/CallbackException.java

@@ -9,7 +9,7 @@
 /**
  * Intended to be thrown from {@link org.hibernate.classic.Lifecycle} and {@link Interceptor} callbacks.
  * <p/>
- * IMPL NOTE : This is a legacy exception type from back in the day beforeQuery Hibernate moved to a untyped (runtime)
+ * IMPL NOTE : This is a legacy exception type from back in the day before Hibernate moved to a untyped (runtime)
  * exception strategy.
  *
  * @author Gavin King

hibernate-core/src/main/java/org/hibernate/ConnectionReleaseMode.java

@@ -18,15 +18,15 @@
  */
 public enum ConnectionReleaseMode{
 	/**
-	 * Indicates that JDBC connection should be aggressively released afterQuery each
+	 * Indicates that JDBC connection should be aggressively released after each
 	 * SQL statement is executed. In this mode, the application <em>must</em>
 	 * explicitly close all iterators and scrollable results. This mode may
 	 * only be used with a JTA datasource.
 	 */
 	AFTER_STATEMENT,
 
 	/**
-	 * Indicates that JDBC connections should be released afterQuery each transaction
+	 * Indicates that JDBC connections should be released after each transaction
 	 * ends (works with both JTA-registered synch and HibernateTransaction API).
 	 * This mode may not be used with an application server JTA datasource.
 	 * <p/>

hibernate-core/src/main/java/org/hibernate/Criteria.java

@@ -403,7 +403,7 @@ public interface Criteria extends CriteriaSpecification {
 	 * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly()
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies returned by the
-	 * Criteria that existed in the session beforeQuery the Criteria was executed.
+	 * Criteria that existed in the session before the Criteria was executed.
 	 *
 	 * @return true, entities and proxies loaded by the criteria will be put in read-only mode
 	 *         false, entities and proxies loaded by the criteria will be put in modifiable mode
@@ -433,7 +433,7 @@ public interface Criteria extends CriteriaSpecification {
 	 * proxy has, regardless of the session's current setting.
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies
-	 * returned by the criteria that existed in the session beforeQuery the criteria was executed.
+	 * returned by the criteria that existed in the session before the criteria was executed.
 	 *
 	 * @param readOnly true, entities and proxies loaded by the criteria will be put in read-only mode
 	 *                 false, entities and proxies loaded by the criteria will be put in modifiable mode

hibernate-core/src/main/java/org/hibernate/CustomEntityDirtinessStrategy.java

@@ -47,7 +47,7 @@ public interface CustomEntityDirtinessStrategy {
 
 	/**
 	 * Callback used by Hibernate to signal that the entity dirty flag should be cleared.  Generally this
-	 * happens afterQuery previous dirty changes were written to the database.
+	 * happens after previous dirty changes were written to the database.
 	 *
 	 * @param entity The entity to reset
 	 * @param persister The persister corresponding to the given entity

hibernate-core/src/main/java/org/hibernate/Filter.java

@@ -64,7 +64,7 @@ public interface Filter {
 
 	/**
 	 * Perform validation of the filter state.  This is used to verify the
-	 * state of the filter afterQuery its enablement and beforeQuery its use.
+	 * state of the filter after its enablement and before its use.
 	 *
 	 * @throws HibernateException If the state is not currently valid.
 	 */

hibernate-core/src/main/java/org/hibernate/FlushMode.java

@@ -34,14 +34,14 @@ public enum FlushMode {
 	COMMIT(5 ),
 
 	/**
-	 * The {@link Session} is sometimes flushed beforeQuery query execution
+	 * The {@link Session} is sometimes flushed before query execution
 	 * in order to ensure that queries never return stale state. This
 	 * is the default flush mode.
 	 */
 	AUTO(10 ),
 
 	/**
-	 * The {@link Session} is flushed beforeQuery every query. This is
+	 * The {@link Session} is flushed before every query. This is
 	 * almost always unnecessary and inefficient.
 	 */
 	ALWAYS(20 );
@@ -70,7 +70,7 @@ public boolean lessThan(FlushMode other) {
 	 *
 	 * @return true/false
 	 *
-	 * @deprecated Just use equality check against {@link #MANUAL}.  Legacy from beforeQuery this was an enum
+	 * @deprecated Just use equality check against {@link #MANUAL}.  Legacy from before this was an enum
 	 */
 	@Deprecated
 	public static boolean isManualFlushMode(FlushMode mode) {

hibernate-core/src/main/java/org/hibernate/Interceptor.java

@@ -14,7 +14,7 @@
 /**
  * Allows user code to inspect and/or change property values.
  *
- * Inspection occurs beforeQuery property values are written and afterQuery they are read
+ * Inspection occurs before property values are written and after they are read
  * from the database.
  *
  * There might be a single instance of <tt>Interceptor</tt> for a <tt>SessionFactory</tt>, or a new instance
@@ -37,7 +37,7 @@
  */
 public interface Interceptor {
 	/**
-	 * Called just beforeQuery an object is initialized. The interceptor may change the <tt>state</tt>, which will
+	 * Called just before an object is initialized. The interceptor may change the <tt>state</tt>, which will
 	 * be propagated to the persistent object. Note that when this method is called, <tt>entity</tt> will be
 	 * an empty uninitialized instance of the class.
 	 * <p/>
@@ -85,7 +85,7 @@ boolean onFlushDirty(
 			Type[] types) throws CallbackException;
 
 	/**
-	 * Called beforeQuery an object is saved. The interceptor may modify the <tt>state</tt>, which will be used for
+	 * Called before an object is saved. The interceptor may modify the <tt>state</tt>, which will be used for
 	 * the SQL <tt>INSERT</tt> and propagated to the persistent object.
 	 *
 	 * @param entity The entity instance whose state is being inserted
@@ -101,7 +101,7 @@ boolean onFlushDirty(
 	boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
 
 	/**
-	 *  Called beforeQuery an object is deleted. It is not recommended that the interceptor modify the <tt>state</tt>.
+	 *  Called before an object is deleted. It is not recommended that the interceptor modify the <tt>state</tt>.
 	 *
 	 * @param entity The entity instance being deleted
 	 * @param id The identifier of the entity
@@ -114,7 +114,7 @@ boolean onFlushDirty(
 	void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException;
 
 	/**
-	 * Called beforeQuery a collection is (re)created.
+	 * Called before a collection is (re)created.
 	 *
 	 * @param collection The collection instance.
 	 * @param key The collection key value.
@@ -124,7 +124,7 @@ boolean onFlushDirty(
 	void onCollectionRecreate(Object collection, Serializable key) throws CallbackException;
 
 	/**
-	 * Called beforeQuery a collection is deleted.
+	 * Called before a collection is deleted.
 	 *
 	 * @param collection The collection instance.
 	 * @param key The collection key value.
@@ -134,7 +134,7 @@ boolean onFlushDirty(
 	void onCollectionRemove(Object collection, Serializable key) throws CallbackException;
 
 	/**
-	 * Called beforeQuery a collection is updated.
+	 * Called before a collection is updated.
 	 *
 	 * @param collection The collection instance.
 	 * @param key The collection key value.
@@ -144,7 +144,7 @@ boolean onFlushDirty(
 	void onCollectionUpdate(Object collection, Serializable key) throws CallbackException;
 
 	/**
-	 * Called beforeQuery a flush.
+	 * Called before a flush.
 	 *
 	 * @param entities The entities to be flushed.
 	 *
@@ -153,7 +153,7 @@ boolean onFlushDirty(
 	void preFlush(Iterator entities) throws CallbackException;
 
 	/**
-	 * Called afterQuery a flush that actually ends in execution of the SQL statements required to synchronize
+	 * Called after a flush that actually ends in execution of the SQL statements required to synchronize
 	 * in-memory state with the database.
 	 *
 	 * @param entities The entities that were flushed.
@@ -250,14 +250,14 @@ int[] findDirty(
 	void afterTransactionBegin(Transaction tx);
 
 	/**
-	 * Called beforeQuery a transaction is committed (but not beforeQuery rollback).
+	 * Called before a transaction is committed (but not before rollback).
 	 *
 	 * @param tx The Hibernate transaction facade object
 	 */
 	void beforeTransactionCompletion(Transaction tx);
 
 	/**
-	 * Called afterQuery a transaction is committed or rolled back.
+	 * Called after a transaction is committed or rolled back.
 	 *
 	 * @param tx The Hibernate transaction facade object
 	 */

hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java

@@ -13,7 +13,7 @@
 /**
  * Indicates an attempt to access not-yet-fetched data outside of a session context.
  *
- * For example, when an uninitialized proxy or collection is accessed afterQuery the session was closed.
+ * For example, when an uninitialized proxy or collection is accessed after the session was closed.
  *
  * @see Hibernate#initialize(java.lang.Object)
  * @see Hibernate#isInitialized(java.lang.Object)

hibernate-core/src/main/java/org/hibernate/Query.java

@@ -245,7 +245,7 @@ default Query<R> setHibernateFlushMode(FlushMode flushMode) {
 	 * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly()
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies returned by the
-	 * query that existed in the session beforeQuery the query was executed.
+	 * query that existed in the session before the query was executed.
 	 *
 	 * @return {@code true} if the entities and proxies loaded by the query will be put
 	 * in read-only mode; {@code false} otherwise (they will be modifiable)
@@ -272,7 +272,7 @@ default Query<R> setHibernateFlushMode(FlushMode flushMode) {
 	 * proxy has, regardless of the session's current setting.
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies
-	 * returned by the query that existed in the session beforeQuery the query was executed.
+	 * returned by the query that existed in the session before the query was executed.
 	 *
 	 * @return {@code this}, for method chaining
 	 *

hibernate-core/src/main/java/org/hibernate/ScrollableResults.java

@@ -75,13 +75,13 @@ public interface ScrollableResults extends AutoCloseable {
 	boolean first();
 
 	/**
-	 * Go to a location just beforeQuery first result,  This is the location of the cursor on a newly returned
+	 * Go to a location just before first result,  This is the location of the cursor on a newly returned
 	 * scrollable result.
 	 */
 	void beforeFirst();
 
 	/**
-	 * Go to a location just afterQuery the last result.
+	 * Go to a location just after the last result.
 	 */
 	void afterLast();
 

hibernate-core/src/main/java/org/hibernate/Session.java

@@ -73,7 +73,7 @@
  * <br>
  * If the <tt>Session</tt> throws an exception, the transaction must be rolled back
  * and the session discarded. The internal state of the <tt>Session</tt> might not
- * be consistent with the database afterQuery the exception occurs.
+ * be consistent with the database after the exception occurs.
  *
  * @see SessionFactory
  *
@@ -90,7 +90,7 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate
 
 	/**
 	 * Force this session to flush. Must be called at the end of a
-	 * unit of work, beforeQuery committing the transaction and closing the
+	 * unit of work, before committing the transaction and closing the
 	 * session (depending on {@link #setFlushMode(FlushMode)},
 	 * {@link Transaction#commit()} calls this method).
 	 * <p/>
@@ -601,8 +601,8 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate
 	 * For example
 	 * <ul>
 	 * <li>where a database trigger alters the object state upon insert or update
-	 * <li>afterQuery executing direct SQL (eg. a mass update) in the same session
-	 * <li>afterQuery inserting a <tt>Blob</tt> or <tt>Clob</tt>
+	 * <li>after executing direct SQL (eg. a mass update) in the same session
+	 * <li>after inserting a <tt>Blob</tt> or <tt>Clob</tt>
 	 * </ul>
 	 *
 	 * @param object a persistent or detached instance
@@ -616,8 +616,8 @@ public interface Session extends SharedSessionContract, EntityManager, Hibernate
 	 * For example
 	 * <ul>
 	 * <li>where a database trigger alters the object state upon insert or update
-	 * <li>afterQuery executing direct SQL (eg. a mass update) in the same session
-	 * <li>afterQuery inserting a <tt>Blob</tt> or <tt>Clob</tt>
+	 * <li>after executing direct SQL (eg. a mass update) in the same session
+	 * <li>after inserting a <tt>Blob</tt> or <tt>Clob</tt>
 	 * </ul>
 	 *
 	 * @param entityName a persistent class

hibernate-core/src/main/java/org/hibernate/SessionBuilder.java

@@ -129,7 +129,7 @@ public interface SessionBuilder<T extends SessionBuilder> {
 	T flushMode(FlushMode flushMode);
 
 	/**
-	 * Should the session be automatically flushed during the "beforeQuery completion" phase of transaction handling.
+	 * Should the session be automatically flushed during the "before completion" phase of transaction handling.
 	 *
 	 * @param flushBeforeCompletion Should the session be automatically flushed
 	 *

hibernate-core/src/main/java/org/hibernate/SessionFactory.java

@@ -115,7 +115,7 @@ public interface SessionFactory extends EntityManagerFactory, HibernateEntityMan
 	 * connection pools, etc).
 	 * <p/>
 	 * It is the responsibility of the application to ensure that there are no
-	 * open {@link Session sessions} beforeQuery calling this method as the impact
+	 * open {@link Session sessions} before calling this method as the impact
 	 * on those {@link Session sessions} is indeterminate.
 	 * <p/>
 	 * No-ops if already {@link #isClosed closed}.

hibernate-core/src/main/java/org/hibernate/Transaction.java

@@ -50,7 +50,7 @@ public interface Transaction extends EntityTransaction {
 	/**
 	 * Set the transaction timeout for any transaction started by a subsequent call to {@link #begin} on this instance.
 	 *
-	 * @param seconds The number of seconds beforeQuery a timeout.
+	 * @param seconds The number of seconds before a timeout.
 	 */
 	void setTimeout(int seconds);
 

hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java

@@ -161,10 +161,10 @@ public void afterDeserialize(SharedSessionContractImplementor session) {
 	}
 
 	/**
-	 * Handle sending notifications needed for natural-id beforeQuery saving
+	 * Handle sending notifications needed for natural-id before saving
 	 */
 	protected void handleNaturalIdPreSaveNotifications() {
-		// beforeQuery save, we need to add a local (transactional) natural id cross-reference
+		// before save, we need to add a local (transactional) natural id cross-reference
 		getSession().getPersistenceContext().getNaturalIdHelper().manageLocalNaturalIdCrossReference(
 				getPersister(),
 				getId(),
@@ -175,7 +175,7 @@ protected void handleNaturalIdPreSaveNotifications() {
 	}
 
 	/**
-	 * Handle sending notifications needed for natural-id afterQuery saving
+	 * Handle sending notifications needed for natural-id after saving
 	 *
 	 * @param generatedId The generated entity identifier
 	 */
@@ -190,7 +190,7 @@ public void handleNaturalIdPostSaveNotifications(Serializable generatedId) {
 					CachedNaturalIdValueSource.INSERT
 			);
 		}
-		// afterQuery save, we need to manage the shared cache entries
+		// after save, we need to manage the shared cache entries
 		getSession().getPersistenceContext().getNaturalIdHelper().manageSharedNaturalIdCrossReference(
 				getPersister(),
 				generatedId,

hibernate-core/src/main/java/org/hibernate/action/internal/CollectionAction.java

@@ -54,7 +54,7 @@ protected PersistentCollection getCollection() {
 	}
 
 	/**
-	 * Reconnect to session afterQuery deserialization...
+	 * Reconnect to session after deserialization...
 	 *
 	 * @param session The session being deserialized
 	 */
@@ -72,7 +72,7 @@ public void afterDeserialize(SharedSessionContractImplementor session) {
 
 	@Override
 	public final void beforeExecutions() throws CacheException {
-		// we need to obtain the lock beforeQuery any actions are executed, since this may be an inverse="true"
+		// we need to obtain the lock before any actions are executed, since this may be an inverse="true"
 		// bidirectional association and it is one of the earlier entity actions which actually updates
 		// the database (this action is responsible for second-level cache invalidation only)
 		if ( persister.hasCache() ) {

hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java

@@ -51,7 +51,7 @@ public CollectionRemoveAction(
 			throw new AssertionFailure("collection == null");
 		}
 		this.emptySnapshot = emptySnapshot;
-		// the loaded owner will be set to null afterQuery the collection is removed,
+		// the loaded owner will be set to null after the collection is removed,
 		// so capture its value as the affected owner so it is accessible to
 		// both pre- and post- events
 		this.affectedOwner = session.getPersistenceContext().getLoadedCollectionOwnerOrNull( collection );

hibernate-core/src/main/java/org/hibernate/action/internal/EntityAction.java

@@ -156,7 +156,7 @@ public int compareTo(Object other) {
 	}
 
 	/**
-	 * Reconnect to session afterQuery deserialization...
+	 * Reconnect to session after deserialization...
 	 *
 	 * @param session The session being deserialized
 	 */

hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java

@@ -60,7 +60,7 @@ public EntityDeleteAction(
 		this.isCascadeDeleteEnabled = isCascadeDeleteEnabled;
 		this.state = state;
 
-		// beforeQuery remove we need to remove the local (transactional) natural id cross-reference
+		// before remove we need to remove the local (transactional) natural id cross-reference
 		naturalIdValues = session.getPersistenceContext().getNaturalIdHelper().removeLocalNaturalIdCrossReference(
 				getPersister(),
 				getId(),