HHH-18458 - Remove deprecated org.hibernate.EmptyInterceptor

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

documentation/src/main/asciidoc/userguide/chapters/events/Events.adoc

@@ -26,11 +26,6 @@ include::{example-dir-event}/InterceptorTest.java[tags=events-interceptors-examp
 ----
 ====
 
-[NOTE]
-====
-You can either implement `Interceptor` directly or extend the `org.hibernate.EmptyInterceptor` base class.
-====
-
 An Interceptor can be either `Session`-scoped or `SessionFactory`-scoped.
 
 A Session-scoped interceptor is specified when a session is opened.

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

@@ -14,9 +14,7 @@
 /**
  * An interceptor that does nothing.
  * This is an internal class and should not be used as a base to implement a custom Interceptor;
- * it is similar to the public, deprecated {@link org.hibernate.EmptyInterceptor} but overrides
- * the default methods for sake of efficiency: this wasn't possible on the original deprecated
- * copy as that wouldn't have been backwards compatible. For this reason this copy is internal.
+ * it overrides the default methods for sake of efficiency.
  *
  * Implementors of Interceptor don't need a base class anymore since we now have default
  * implementations of the contract defined in the interface.

hibernate-core/src/main/java/org/hibernate/internal/EmptyInterceptor.java

@@ -18,7 +18,7 @@ public boolean onFlushDirty(Object entity, Object id, Object[] currentState, Obj
 		return false;
 	}
 
-	public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types) {
+	public boolean onPersist(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types) {
 		( (User) entity ).getActions().add("created");
 		return false;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/CollectionInterceptor.java

@@ -180,7 +180,7 @@ public void testComponentInterceptor() {
 		Session s = openSession(
 				new Interceptor() {
 					@Override
-					public boolean onSave(
+					public boolean onPersist(
 							Object entity,
 							Object id,
 							Object[] state,

hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/InterceptorTest.java

@@ -22,7 +22,7 @@ public boolean onFlushDirty(Object entity, Object id, Object[] currentState, Obj
 	}
 
 	@Override
-	public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types) {
+	public boolean onPersist(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types) {
 		state[2] = Calendar.getInstance();
 		return true;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/PropertyInterceptor.java

@@ -23,7 +23,7 @@ public class StatefulInterceptor implements Interceptor {
 	private List list = new ArrayList();
 
 	@Override
-	public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types) {
+	public boolean onPersist(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types) {
 		if ( !(entity instanceof Log) ) {
 			list.add( new Log( "insert", (String) id, entity.getClass().getName() ) );
 		}

hibernate-core/src/test/java/org/hibernate/orm/test/interceptor/StatefulInterceptor.java

@@ -35,7 +35,7 @@ public boolean onFlushDirty(
 		}
 	}
 
-	public boolean onSave(
+	public boolean onPersist(
 			Object entity,
 			Object id,
 			Object[] state,

hibernate-core/src/test/java/org/hibernate/orm/test/interfaceproxy/DocumentInterceptor.java

@@ -34,7 +34,7 @@ public boolean onLoad(Object entity, Object id, Object[] state, String[] propert
 	}
 
 	@Override
-	public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types)
+	public boolean onPersist(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types)
 			throws CallbackException {
 		if (allowSave) return false;
 		throw new IllegalStateException( EXCEPTION_MESSAGE );

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/ExceptionInterceptor.java

@@ -20,7 +20,7 @@ public class LocalExceptionInterceptor extends ExceptionInterceptor {
 	public static final String LOCAL_EXCEPTION_MESSAGE = "Session-scoped interceptor enabled";
 
 	@Override
-	public boolean onSave(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types)
+	public boolean onPersist(Object entity, Object id, Object[] state, String[] propertyNames, Type[] types)
 			throws CallbackException {
 		if (allowSave) return false;
 		throw new IllegalStateException( LOCAL_EXCEPTION_MESSAGE );