Refactor detection of deferred persist relationship (circular imported ids)

src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -283,10 +283,12 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
    * Check for batch escalation on cascade.
    */
   public void checkBatchEscalationOnCascade() {
-    if (transaction.checkBatchEscalationOnCascade(this)) {
-      // we escalated to use batch mode so flush when done
-      // but if createdTransaction then commit will flush it
-      batchOnCascadeSet = !createdTransaction;
+    if (type != Type.INSERT || beanDescriptor.isCascadeBatchEscalateSupported()) {
+      if (transaction.checkBatchEscalationOnCascade(this)) {
+        // we escalated to use batch mode so flush when done
+        // but if createdTransaction then commit will flush it
+        batchOnCascadeSet = !createdTransaction;
+      }
     }
     persistCascade = transaction.isPersistCascade();
   }

src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -140,6 +140,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   private final short profileBeanId;
 
   private final boolean multiValueSupported;
+  private boolean cascadeBatchEscalateSupported;
 
   public enum EntityType {
     ORM, EMBEDDED, VIEW, SQL, DOC
@@ -752,6 +753,24 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     }
   }
 
+  private boolean hasCircularImportedId() {
+    for (BeanPropertyAssocOne<?> assocOne : propertiesOneImportedSave) {
+      if (assocOne.hasCircularImportedId(this)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  boolean hasCircularImportedIdTo(BeanDescriptor sourceDesc) {
+    for (BeanPropertyAssocOne<?> assocOne : propertiesOneImportedSave) {
+      if (assocOne.getTargetDescriptor() == sourceDesc) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   void registerColumn(String dbColumn, String path) {
     String key = dbColumn.toLowerCase();
     // check for clash with imported OneToOne PK
@@ -812,6 +831,7 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    */
   @SuppressWarnings("unchecked")
   void initialiseDocMapping() {
+    cascadeBatchEscalateSupported = supportCascadeBatch();
     for (BeanPropertyAssocMany<?> many : propertiesMany) {
       many.initialisePostTarget();
     }
@@ -826,6 +846,18 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     cacheHelp.deriveNotifyFlags();
   }
 
+  private boolean supportCascadeBatch() {
+    return idType == IdType.IDENTITY || !hasCircularImportedId();
+  }
+
+  /**
+   * Return false if JDBC batch can't be implicitly escalated to.
+   * This happens when we have circular import id situation (need to defer setting identity value).
+   */
+  public boolean isCascadeBatchEscalateSupported() {
+    return cascadeBatchEscalateSupported;
+  }
+
   void initInheritInfo() {
     if (inheritInfo != null) {
       // need to check every BeanDescriptor in the inheritance hierarchy

src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -807,4 +807,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> implements STr
       }
     }
   }
+
+  public boolean hasCircularImportedId(BeanDescriptor<?> sourceDesc) {
+    return targetDescriptor.hasCircularImportedIdTo(sourceDesc);
+  }
 }

src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java

@@ -643,6 +643,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes {
       // implicit transaction, no gain by batching where depth <= 0
       return false;
     }
+    //
     return batchMode;
   }