patch play master on hibernate 5.3.6

synapplix · Sep 12, 2018 · 8ecee3c · 8ecee3c
1 parent 97af7c4
commit 8ecee3c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 18 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java b/hibernate-core/src/main/java/org/hibernate/EmptyInterceptor.java
@@ -121,14 +121,17 @@ public String onPrepareStatement(String sql) {
 	}
 
 	@Override
-	public void onCollectionRemove(Object collection, Serializable key) throws CallbackException {
+	public boolean onCollectionRemove(Object collection, Serializable key) throws CallbackException {
+	    return true;
 	}
 
 	@Override
-	public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException {
+	public boolean onCollectionRecreate(Object collection, Serializable key) throws CallbackException {
+	    return true;
 	}
 
 	@Override
-	public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException {
+	public boolean onCollectionUpdate(Object collection, Serializable key) throws CallbackException {
+	    return true;
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/Interceptor.java b/hibernate-core/src/main/java/org/hibernate/Interceptor.java
@@ -121,7 +121,7 @@ boolean onFlushDirty(
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	void onCollectionRecreate(Object collection, Serializable key) throws CallbackException;
+    boolean onCollectionRecreate(Object collection, Serializable key) throws CallbackException;
 
 	/**
 	 * Called before a collection is deleted.
@@ -131,7 +131,7 @@ boolean onFlushDirty(
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	void onCollectionRemove(Object collection, Serializable key) throws CallbackException;
+    boolean onCollectionRemove(Object collection, Serializable key) throws CallbackException;
 
 	/**
 	 * Called before a collection is updated.
@@ -141,7 +141,7 @@ boolean onFlushDirty(
 	 *
 	 * @throws CallbackException Thrown if the interceptor encounters any problems handling the callback.
 	 */
-	void onCollectionUpdate(Object collection, Serializable key) throws CallbackException;
+    boolean onCollectionUpdate(Object collection, Serializable key) throws CallbackException;
 
 	/**
 	 * Called before a flush.

diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/AbstractFlushingEventListener.java
@@ -146,6 +146,27 @@ private void prepareEntityFlushes(EventSource session, PersistenceContext persis
 //		for ( Map.Entry me : IdentityMap.concurrentEntries( persistenceContext.getEntityEntries() ) ) {
 			EntityEntry entry = (EntityEntry) me.getValue();
 			Status status = entry.getStatus();
+
+			// This entity will be saved?
+			boolean willBeSaved = true;
+			try {
+			    Object o = me.getKey();
+			    Class c = o.getClass();
+			    Class jpaBase = Class.forName("play.db.jpa.JPABase");
+			    while(!c.equals(Object.class)) {
+			        if(c.equals(jpaBase)) {
+						willBeSaved = (Boolean)(jpaBase.getDeclaredField("willBeSaved").get(o));
+						break;
+			         }
+			          c = c.getSuperclass();
+			    }
+			    if(!willBeSaved) {
+			        continue;
+			    }
+			} catch(Exception e) {
+			   e.printStackTrace();
+			}
+
 			if ( status == Status.MANAGED || status == Status.SAVING || status == Status.READ_ONLY ) {
 				cascadeOnFlush( session, entry.getPersister(), me.getKey(), anything );
 			}
@@ -274,19 +295,20 @@ private int flushCollections(final EventSource session, final PersistenceContext
 			CollectionEntry ce = me.getValue();
 
 			if ( ce.isDorecreate() ) {
-				session.getInterceptor().onCollectionRecreate( coll, ce.getCurrentKey() );
-				actionQueue.addAction(
+				if(session.getInterceptor().onCollectionRecreate( coll, ce.getCurrentKey() )){
+                    actionQueue.addAction(
 						new CollectionRecreateAction(
 								coll,
 								ce.getCurrentPersister(),
 								ce.getCurrentKey(),
 								session
 							)
 					);
+                 }
 			}
 			if ( ce.isDoremove() ) {
-				session.getInterceptor().onCollectionRemove( coll, ce.getLoadedKey() );
-				actionQueue.addAction(
+				if(session.getInterceptor().onCollectionRemove( coll, ce.getLoadedKey() )){
+                    actionQueue.addAction(
 						new CollectionRemoveAction(
 								coll,
 								ce.getLoadedPersister(),
@@ -295,10 +317,11 @@ private int flushCollections(final EventSource session, final PersistenceContext
 								session
 							)
 					);
+                }
 			}
 			if ( ce.isDoupdate() ) {
-				session.getInterceptor().onCollectionUpdate( coll, ce.getLoadedKey() );
-				actionQueue.addAction(
+				if(session.getInterceptor().onCollectionUpdate( coll, ce.getLoadedKey() )){
+                    actionQueue.addAction(
 						new CollectionUpdateAction(
 								coll,
 								ce.getLoadedPersister(),
@@ -307,6 +330,7 @@ private int flushCollections(final EventSource session, final PersistenceContext
 								session
 							)
 					);
+                }
 			}
 
 			// todo : I'm not sure the !wasInitialized part should really be part of this check

diff --git a/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/interfaceproxy/DocumentInterceptor.java
@@ -94,8 +94,8 @@ public String onPrepareStatement(String sql) {
 		return sql;
 	}
 
-	public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException {}
-	public void onCollectionRemove(Object collection, Serializable key) throws CallbackException {}
-	public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException {}
+	public boolean onCollectionRecreate(Object collection, Serializable key) throws CallbackException { return true;}
+	public boolean onCollectionRemove(Object collection, Serializable key) throws CallbackException { return true;}
+	public boolean onCollectionUpdate(Object collection, Serializable key) throws CallbackException { return true;}
 
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java b/hibernate-core/src/test/java/org/hibernate/test/mixed/DocumentInterceptor.java
@@ -111,12 +111,15 @@ public String onPrepareStatement(String sql) {
 		return sql;
 	}
 
-	public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException {
+	public boolean onCollectionRecreate(Object collection, Serializable key) throws CallbackException {
+        return true;
 	}
 
-	public void onCollectionRemove(Object collection, Serializable key) throws CallbackException {
+	public boolean onCollectionRemove(Object collection, Serializable key) throws CallbackException {
+        return true;
 	}
 
-	public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException {
+	public boolean onCollectionUpdate(Object collection, Serializable key) throws CallbackException {
+        return true;
 	}
 }