#994 - @OneToOne cacade does not honor orphanRemoval = true

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

@@ -11,8 +11,8 @@ import io.ebean.event.BeanPersistRequest;
 import io.ebean.event.changelog.BeanChange;
 import io.ebeaninternal.api.ConcurrencyMode;
 import io.ebeaninternal.api.SpiEbeanServer;
-import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiProfileTransactionEvent;
+import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.TransactionEvent;
 import io.ebeaninternal.server.cache.CacheChangeSet;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
@@ -713,6 +713,20 @@ public final class PersistRequestBean<T> extends PersistRequest implements BeanP
     return intercept.isLoadedProperty(prop.getPropertyIndex());
   }
 
+  /**
+   * Return true if the property is dirty.
+   */
+  public boolean isDirtyProperty(BeanProperty prop) {
+    return intercept.isDirtyProperty(prop.getPropertyIndex());
+  }
+
+  /**
+   * Return the original / old value for the given property.
+   */
+  public Object getOrigValue(BeanProperty prop) {
+    return intercept.getOrigValue(prop.getPropertyIndex());
+  }
+
   @Override
   public int executeNow() {
     if (getterCallback) {

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

@@ -37,6 +37,8 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
 
   private final boolean oneToOneExported;
 
+  private final boolean orphanRemoval;
+
   private final boolean importedPrimaryKey;
 
   private final boolean primaryKeyExport;
@@ -76,6 +78,7 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     importedPrimaryKey = deploy.isImportedPrimaryKey();
     oneToOne = deploy.isOneToOne();
     oneToOneExported = deploy.isOneToOneExported();
+    orphanRemoval = deploy.isOrphanRemoval();
 
     if (embedded) {
       // Overriding of the columns and use table alias of owning BeanDescriptor
@@ -338,6 +341,10 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     return oneToOneExported;
   }
 
+  public boolean isOrphanRemoval() {
+    return orphanRemoval;
+  }
+
   /**
    * If true this bean maps to the primary key.
    */

src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java

@@ -25,6 +25,8 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
 
   private PropertyForeignKey foreignKey;
 
+  private boolean orphanRemoval;
+
   /**
    * Create the property.
    */
@@ -160,4 +162,12 @@ public class DeployBeanPropertyAssocOne<T> extends DeployBeanPropertyAssoc<T> {
   public PropertyForeignKey getForeignKey() {
     return foreignKey;
   }
+
+  public void setOrphanRemoval(boolean orphanRemoval) {
+    this.orphanRemoval = orphanRemoval;
+  }
+
+  public boolean isOrphanRemoval() {
+    return orphanRemoval;
+  }
 }

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java

@@ -216,6 +216,7 @@ public class AnnotationAssocOnes extends AnnotationParser {
     prop.setMappedBy(propAnn.mappedBy());
     if (!"".equals(propAnn.mappedBy())) {
       prop.setOneToOneExported();
+      prop.setOrphanRemoval(propAnn.orphanRemoval());
     }
 
     setCascadeTypes(propAnn.cascade(), prop.getCascadeInfo());

src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java

@@ -1173,6 +1173,15 @@ public final class DefaultPersister implements Persister {
         }
       }
     }
+
+    for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
+      if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
+        Object origValue = request.getOrigValue(prop);
+        if (origValue instanceof EntityBean) {
+          delete((EntityBean) origValue, request.getTransaction(), true);
+        }
+      }
+    }
   }
 
   /**