HHH-9568 : EntityManager.flush() does not behave properly with transient one-to-one association and no cascade

hibernate-core/src/main/java/org/hibernate/engine/spi/CascadeStyle.java

@@ -253,9 +253,7 @@ public abstract class CascadeStyle implements Serializable {
 	 */
 	public static final CascadeStyle DELETE_ORPHAN = new CascadeStyle() {
 		public boolean doCascade(CascadingAction action) {
-			return action == CascadingAction.DELETE ||
+			return action == CascadingAction.DELETE || action == CascadingAction.SAVE_UPDATE;
-					action == CascadingAction.SAVE_UPDATE ||
-					action == CascadingAction.PERSIST_ON_FLUSH;
 		}
 
 		public boolean reallyDoCascade(CascadingAction action) {

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/orphan/onetomany/DeleteOneToManyOrphansTest.java

@@ -30,6 +30,7 @@ import javax.persistence.EntityManager;
 import org.junit.Test;
 
 import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 
 import static org.junit.Assert.assertEquals;
@@ -67,7 +68,8 @@ public class DeleteOneToManyOrphansTest extends BaseEntityManagerFunctionalTestC
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9330")
+	@TestForIssue( jiraKey = "HHH-9568")
+	@FailureExpected( jiraKey = "HHH-9568" )
 	public void testOrphanedWhileManaged() {
 		createData();
 
@@ -100,7 +102,8 @@ public class DeleteOneToManyOrphansTest extends BaseEntityManagerFunctionalTestC
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9330")
+	@TestForIssue( jiraKey = "HHH-9568")
+	@FailureExpected( jiraKey = "HHH-9568" )
 	public void testOrphanedWhileManagedMergeOwner() {
 		createData();
 
@@ -134,7 +137,8 @@ public class DeleteOneToManyOrphansTest extends BaseEntityManagerFunctionalTestC
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9330")
+	@TestForIssue( jiraKey = "HHH-9568")
+	@FailureExpected( jiraKey = "HHH-9568" )
 	public void testReplacedWhileManaged() {
 		createData();
 

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/orphan/onetoone/A.java

@@ -0,0 +1,58 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2015, 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.ejb.test.orphan.onetoone;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+import java.io.Serializable;
+
+/**
+ * @author Martin Simka
+ */
+@Entity
+public class A implements Serializable {
+	private Integer id;
+	private B b;
+
+	@Id
+	@GeneratedValue
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	@OneToOne(targetEntity=B.class, mappedBy="a", orphanRemoval = true)
+	public B getB() {
+		return b;
+	}
+
+	public void setB(B b) {
+		this.b = b;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/orphan/onetoone/B.java

@@ -0,0 +1,61 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2015, 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.ejb.test.orphan.onetoone;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import java.io.Serializable;
+
+/**
+ * @author Martin Simka
+ */
+@Entity
+public class B implements Serializable {
+	private Integer id;
+	private A a;
+
+	@Id
+	@GeneratedValue
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	@OneToOne(targetEntity=A.class, cascade=CascadeType.ALL,optional = true, orphanRemoval = true)
+	@JoinColumn(name="FK_FOR_B")
+	public A getA() {
+		return a;
+	}
+
+	public void setA(A a) {
+		this.a = a;
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/orphan/onetoone/OneToOneOrphanTest.java

@@ -0,0 +1,70 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2015, 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.ejb.test.orphan.onetoone;
+
+import javax.persistence.EntityManager;
+
+import org.junit.Test;
+
+import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.testing.TestForIssue;
+
+import static org.junit.Assert.fail;
+
+/**
+ * @author Martin Simka
+ * @author Gail Badner
+ */
+public class OneToOneOrphanTest extends BaseEntityManagerFunctionalTestCase {
+
+	@Override
+	public Class[] getAnnotatedClasses() {
+		return new Class[]{
+				A.class,
+				B.class
+		};
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-9568")
+	public void testFlushTransientOneToOneNoCascade() throws Exception {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
+
+		B b = new B();
+		A a = new A();
+
+		a.setB(b);
+		try {
+			em.persist(a);
+			em.flush();
+			em.getTransaction().commit();
+			fail("should have raised an IllegalStateException");
+		}
+		catch (IllegalStateException ex) {
+			// IllegalStateException caught as expected
+		}
+		em.close();
+	}
+}