HHH-1582 : post-commit listeners and failed transactions

hibernate-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java

@@ -428,11 +428,20 @@ public class EventListenerRegistryImpl implements EventListenerRegistry {
 	}
 
 	private static <T> void prepareListeners(EventType<T> type, T defaultListener, Map<EventType,EventListenerGroupImpl> map) {
-		final EventListenerGroupImpl<T> listeners = new EventListenerGroupImpl<T>( type );
-		if ( defaultListener != null ) {
-			listeners.appendListener( defaultListener );
+		final EventListenerGroupImpl<T> listenerGroup;
+		if ( type == EventType.POST_COMMIT_DELETE
+				|| type == EventType.POST_COMMIT_INSERT
+				|| type == EventType.POST_COMMIT_UPDATE ) {
+			listenerGroup = new PostCommitEventListenerGroupImpl<T>( type );
 		}
-		map.put( type, listeners  );
+		else {
+			listenerGroup = new EventListenerGroupImpl<T>( type );
+		}
+
+		if ( defaultListener != null ) {
+			listenerGroup.appendListener( defaultListener );
+		}
+		map.put( type, listenerGroup  );
 	}
 
 }

hibernate-core/src/main/java/org/hibernate/event/service/internal/PostCommitEventListenerGroupImpl.java

@@ -0,0 +1,88 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2014, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors.  All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.event.service.internal;
+
+import org.hibernate.event.spi.EventType;
+import org.hibernate.event.spi.PostCommitDeleteEventListener;
+import org.hibernate.event.spi.PostCommitInsertEventListener;
+import org.hibernate.event.spi.PostCommitUpdateEventListener;
+import org.hibernate.internal.CoreLogging;
+import org.hibernate.internal.CoreMessageLogger;
+
+/**
+ * Historically, the listeners for the post-commit events simply reused the
+ * contracts from the non-post-commit variants.  That has changed as part of
+ * the work for HHH-1582.  The purpose of this specialized EventListenerGroup
+ * implementation is to recognize cases where post-commit event listeners
+ * are still using the legacy contracts and to issue "deprecation warnings".
+ *
+ * @author Steve Ebersole
+ */
+public class PostCommitEventListenerGroupImpl<T> extends EventListenerGroupImpl<T> {
+	private static final CoreMessageLogger log = CoreLogging.messageLogger( PostCommitEventListenerGroupImpl.class );
+
+	private final Class extendedListenerContract;
+
+	public PostCommitEventListenerGroupImpl(EventType<T> eventType) {
+		super( eventType );
+
+		if ( eventType == EventType.POST_COMMIT_DELETE ) {
+			this.extendedListenerContract = PostCommitDeleteEventListener.class;
+		}
+		else if ( eventType == EventType.POST_COMMIT_INSERT ) {
+			this.extendedListenerContract = PostCommitInsertEventListener.class;
+		}
+		else if ( eventType == EventType.POST_COMMIT_UPDATE ) {
+			this.extendedListenerContract = PostCommitUpdateEventListener.class;
+		}
+		else {
+			throw new IllegalStateException( "Unexpected usage of PostCommitEventListenerGroupImpl" );
+		}
+	}
+
+	@Override
+	public void appendListener(T listener) {
+		checkAgainstExtendedContract( listener );
+		super.appendListener( listener );
+	}
+
+	private void checkAgainstExtendedContract(T listener) {
+		if ( !extendedListenerContract.isInstance( listener ) ) {
+			log.warnf(
+					"Encountered event listener [%s] for post-commit event [%s] "
+							+ "which did not implement the corresponding extended "
+							+ "listener contract [%s]",
+					listener.getClass().getName(),
+					getEventType().eventName(),
+					extendedListenerContract.getName()
+			);
+		}
+	}
+
+	@Override
+	public void prependListener(T listener) {
+		checkAgainstExtendedContract( listener );
+		super.prependListener( listener );
+	}
+}