EventSource - StatelessSession and Envers

Author: sebersole

hibernate-core/src/main/java/org/hibernate/cache/internal/CollectionCacheInvalidator.java

@@ -4,8 +4,6 @@
  */
 package org.hibernate.cache.internal;
 
-import java.util.Set;
-
 import org.hibernate.HibernateException;
 import org.hibernate.action.internal.CollectionAction;
 import org.hibernate.boot.Metadata;
@@ -29,9 +27,10 @@
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-
 import org.jboss.logging.Logger;
 
+import java.util.Set;
+
 import static org.hibernate.cache.spi.SecondLevelCacheLogger.L2CACHE_LOGGER;
 import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
@@ -65,7 +64,9 @@ public void integrate(
 
 	@Override
 	public void onPostInsert(PostInsertEvent event) {
-		evictCache( event.getEntity(), event.getPersister(), event.getSession(), null );
+		if ( event.getSession() instanceof EventSource eventSource ) {
+			evictCache( event.getEntity(), event.getPersister(), eventSource, null );
+		}
 	}
 
 	@Override
@@ -75,12 +76,16 @@ public boolean requiresPostCommitHandling(EntityPersister persister) {
 
 	@Override
 	public void onPostDelete(PostDeleteEvent event) {
-		evictCache( event.getEntity(), event.getPersister(), event.getSession(), null );
+		if ( event.getSession() instanceof EventSource eventSource ) {
+			evictCache( event.getEntity(), event.getPersister(), eventSource, null );
+		}
 	}
 
 	@Override
 	public void onPostUpdate(PostUpdateEvent event) {
-		evictCache( event.getEntity(), event.getPersister(), event.getSession(), event.getOldState() );
+		if ( event.getSession() instanceof EventSource eventSource ) {
+			evictCache( event.getEntity(), event.getPersister(), eventSource, event.getOldState() );
+		}
 	}
 
 	private void integrate(SessionFactoryImplementor sessionFactory) {

hibernate-core/src/main/java/org/hibernate/event/internal/DefaultLockEventListener.java

@@ -16,7 +16,7 @@
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.engine.spi.Status;
-import org.hibernate.event.spi.AbstractEvent;
+import org.hibernate.event.spi.AbstractSessionEvent;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.LockEvent;
 import org.hibernate.event.spi.LockEventListener;
@@ -117,7 +117,7 @@ private void cascadeOnLock(LockEvent event, EntityPersister persister, Object en
 	 *
 	 * @return An EntityEntry representing the entity within this session.
 	 */
-	protected final EntityEntry reassociate(AbstractEvent event, Object object, Object id, EntityPersister persister) {
+	protected final EntityEntry reassociate(AbstractSessionEvent event, Object object, Object id, EntityPersister persister) {
 
 		if ( LOG.isTraceEnabled() ) {
 			LOG.trace( "Reassociating transient instance: " + infoString( persister, id, event.getFactory() ) );

hibernate-core/src/main/java/org/hibernate/event/internal/PostUpdateEventListenerStandardImpl.java

@@ -4,8 +4,8 @@
  */
 package org.hibernate.event.internal;
 
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.engine.spi.Status;
-import org.hibernate.event.spi.EventSource;
 import org.hibernate.event.spi.PostUpdateEvent;
 import org.hibernate.event.spi.PostUpdateEventListener;
 import org.hibernate.jpa.event.spi.CallbackRegistry;
@@ -29,7 +29,7 @@ public void onPostUpdate(PostUpdateEvent event) {
 		handlePostUpdate( event.getEntity(), event.getSession() );
 	}
 
-	private void handlePostUpdate(Object entity, EventSource source) {
+	private void handlePostUpdate(Object entity, SharedSessionContractImplementor source) {
 		// mimic the preUpdate filter
 		if ( source == null // it must be a StatelessSession
 				|| source.getPersistenceContextInternal().getEntry(entity).getStatus() != Status.DELETED ) {

hibernate-core/src/main/java/org/hibernate/event/internal/PostUpsertEventListenerStandardImpl.java

@@ -4,7 +4,7 @@
  */
 package org.hibernate.event.internal;
 
-import org.hibernate.event.spi.EventSource;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.spi.PostUpsertEvent;
 import org.hibernate.event.spi.PostUpsertEventListener;
 import org.hibernate.jpa.event.spi.CallbackRegistry;
@@ -29,7 +29,7 @@ public void onPostUpsert(PostUpsertEvent event) {
 		handlePostUpsert( event.getEntity(), event.getSession() );
 	}
 
-	private void handlePostUpsert(Object entity, EventSource source) {
+	private void handlePostUpsert(Object entity, SharedSessionContractImplementor source) {
 //		// mimic the preUpdate filter
 //		if ( source == null // it must be a StatelessSession
 //				|| source.getPersistenceContextInternal().getEntry(entity).getStatus() != Status.DELETED ) {

hibernate-core/src/main/java/org/hibernate/event/package-info.java

@@ -6,7 +6,7 @@
 /**
  * This package defines a framework which models events occurring
  * within a stateful Hibernate {@link org.hibernate.Session}. An
- * {@linkplain org.hibernate.event.spi.AbstractEvent event}
+ * {@linkplain org.hibernate.event.spi.AbstractSessionEvent event}
  * represents a request by the session API for some work to be
  * performed, and an event listener must respond to the event and
  * do that work, usually by scheduling some sort of

hibernate-core/src/main/java/org/hibernate/event/spi/AbstractCollectionEvent.java

@@ -14,7 +14,7 @@
  *
  * @author Gail Badner
  */
-public abstract class AbstractCollectionEvent extends AbstractEvent {
+public abstract class AbstractCollectionEvent extends AbstractSessionEvent {
 
 	private final PersistentCollection<?> collection;
 	private final Object affectedOwner;

hibernate-core/src/main/java/org/hibernate/event/spi/AbstractDatabaseOperationEvent.java

@@ -4,19 +4,20 @@
  */
 package org.hibernate.event.spi;
 
-import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 
 /**
- * Abstract supertype of {@link AbstractPostDatabaseOperationEvent}
- * and {@link AbstractPostDatabaseOperationEvent}.
+ * Base for events which denote database operations.
+ *
+ * @see AbstractPreDatabaseOperationEvent
+ * @see AbstractPostDatabaseOperationEvent
  *
  * @author Gavin King
  *
  * @since 7
  */
 public abstract class AbstractDatabaseOperationEvent extends AbstractEvent {
-
 	private final Object entity;
 	private final Object id;
 	private final EntityPersister persister;
@@ -30,7 +31,7 @@ public abstract class AbstractDatabaseOperationEvent extends AbstractEvent {
 	 * @param persister The entity's persister.
 	 */
 	public AbstractDatabaseOperationEvent(
-			EventSource source,
+			SharedSessionContractImplementor source,
 			Object entity,
 			Object id,
 			EntityPersister persister) {
@@ -42,38 +43,22 @@ public AbstractDatabaseOperationEvent(
 
 	/**
 	 * Retrieves the entity involved in the database operation.
-	 *
-	 * @return The entity.
 	 */
 	public Object getEntity() {
 		return entity;
 	}
 
 	/**
 	 * The id to be used in the database operation.
-	 *
-	 * @return The id.
 	 */
 	public Object getId() {
 		return id;
 	}
 
 	/**
 	 * The persister for the entity.
-	 *
-	 * @return The entity persister.
 	 */
 	public EntityPersister getPersister() {
 		return persister;
 	}
-
-	/**
-	 * The factory which owns the persister for the entity.
-	 *
-	 * @return The factory
-	 */
-	@Override
-	public SessionFactoryImplementor getFactory() {
-		return persister.getFactory();
-	}
 }

hibernate-core/src/main/java/org/hibernate/event/spi/AbstractEvent.java

@@ -5,38 +5,28 @@
 package org.hibernate.event.spi;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
 import java.io.Serializable;
 
 /**
- * Defines a base class for {@link org.hibernate.Session}-generated events.
+ * Base class for events which are generated from a {@link org.hibernate.Session}
+ * or {@linkplain org.hibernate.StatelessSession}.
  *
  * @author Steve Ebersole
  */
 public abstract class AbstractEvent implements Serializable {
+	protected final SharedSessionContractImplementor source;
 
-	private final EventSource session;
-
-	/**
-	 * Constructs an event from the given event session.
-	 *
-	 * @param source The session event source.
-	 */
-	public AbstractEvent(EventSource source) {
-		this.session = source;
+	public AbstractEvent(SharedSessionContractImplementor source) {
+		this.source = source;
 	}
 
-	/**
-	 * Returns the session event source for this event. This is the underlying
-	 * session from which this event was generated.
-	 *
-	 * @return The session event source.
-	 */
-	public final EventSource getSession() {
-		return session;
+	public SharedSessionContractImplementor getSession() {
+		return source;
 	}
 
 	public SessionFactoryImplementor getFactory() {
-		return session.getFactory();
+		return source.getFactory();
 	}
 }

hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPostDatabaseOperationEvent.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 
 /**
@@ -24,7 +25,7 @@ public abstract class AbstractPostDatabaseOperationEvent extends AbstractDatabas
 	 * @param persister The entity's persister.
 	 */
 	public AbstractPostDatabaseOperationEvent(
-			EventSource source,
+			SharedSessionContractImplementor source,
 			Object entity,
 			Object id,
 			EntityPersister persister) {

hibernate-core/src/main/java/org/hibernate/event/spi/AbstractPreDatabaseOperationEvent.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.event.spi;
 
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.entity.EntityPersister;
 
 /**
@@ -22,7 +23,7 @@ public abstract class AbstractPreDatabaseOperationEvent extends AbstractDatabase
 	 * @param persister The entity's persister.
 	 */
 	public AbstractPreDatabaseOperationEvent(
-			EventSource source,
+			SharedSessionContractImplementor source,
 			Object entity,
 			Object id,
 			EntityPersister persister) {