HHH-14597 Test and fix for NPE while trying to delete cascade to-one …

…association within element collection

hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java

@@ -232,10 +232,12 @@ private static void cascadeProperty(
 				}
 			}
 			else if ( type.isComponentType() ) {
-				if ( componentPath == null ) {
+				if ( componentPath == null && propertyName != null ) {
 					componentPath = new ArrayList<>();
 				}
-				componentPath.add( propertyName );
+				if ( componentPath != null ) {
+					componentPath.add( propertyName );
+				}
 				cascadeComponent(
 						action,
 						cascadePoint,
@@ -246,7 +248,9 @@ else if ( type.isComponentType() ) {
 						(CompositeType) type,
 						anything
 				);
-				componentPath.remove( componentPath.size() - 1 );
+				if ( componentPath != null ) {
+					componentPath.remove( componentPath.size() - 1 );
+				}
 			}
 		}
 
@@ -293,17 +297,24 @@ private static void cascadeLogicalOneToOneOrphanRemoval(
 						// Since the loadedState in the EntityEntry is a flat domain type array
 						// We first have to extract the component object and then ask the component type
 						// recursively to give us the value of the sub-property of that object
-						loadedValue = entry.getLoadedValue( componentPath.get( 0 ) );
-						ComponentType componentType = (ComponentType) entry.getPersister().getPropertyType( componentPath.get( 0 ) );
-						if ( componentPath.size() != 1 ) {
-							for ( int i = 1; i < componentPath.size(); i++ ) {
-								final int subPropertyIndex = componentType.getPropertyIndex( componentPath.get( i ) );
-								loadedValue = componentType.getPropertyValue( loadedValue, subPropertyIndex );
-								componentType = (ComponentType) componentType.getSubtypes()[subPropertyIndex];
+						final Type propertyType = entry.getPersister().getPropertyType( componentPath.get(0) );
+						if ( propertyType instanceof ComponentType ) {
+							loadedValue = entry.getLoadedValue( componentPath.get( 0 ) );
+							ComponentType componentType = (ComponentType) propertyType;
+							if ( componentPath.size() != 1 ) {
+								for ( int i = 1; i < componentPath.size(); i++ ) {
+									final int subPropertyIndex = componentType.getPropertyIndex( componentPath.get( i ) );
+									loadedValue = componentType.getPropertyValue( loadedValue, subPropertyIndex );
+									componentType = (ComponentType) componentType.getSubtypes()[subPropertyIndex];
+								}
 							}
-						}
 
-						loadedValue = componentType.getPropertyValue( loadedValue, componentType.getPropertyIndex( propertyName ) );
+							loadedValue = componentType.getPropertyValue( loadedValue, componentType.getPropertyIndex( propertyName ) );
+						}
+						else {
+							// Association is probably defined in an element collection, so we can't do orphan removals
+							loadedValue = null;
+						}
 					}
 
 					// orphaned if the association was nulled (child == null) or receives a new value while the
@@ -538,7 +549,7 @@ private static void cascadeCollectionElements(
 						itr.next(),
 						elemType,
 						style,
-						null,
+						collectionType.getRole().substring( collectionType.getRole().lastIndexOf('.') + 1 ),
 						anything,
 						isCascadeDeleteEnabled
 				);

hibernate-core/src/test/java/org/hibernate/test/orphan/elementcollection/ElementCollectionOrphanTest.java

@@ -0,0 +1,53 @@
+package org.hibernate.test.orphan.elementcollection;
+
+import java.util.Collections;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.testing.transaction.TransactionUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+@TestForIssue(jiraKey = "HHH-14597")
+public class ElementCollectionOrphanTest extends BaseCoreFunctionalTestCase {
+
+	@Override
+	protected String[] getMappings() {
+		return new String[] { "orphan/elementcollection/student.hbm.xml" };
+	}
+
+	@Test
+	public void setCompositeElementTest() {
+		TransactionUtil.doInHibernate(
+			this::sessionFactory,
+			session -> {
+				EnrollableClass aClass = new EnrollableClass();
+				aClass.setId("123");
+				aClass.setName("Math");
+				session.save(aClass);
+
+				Student aStudent = new Student();
+				aStudent.setId("s1");
+				aStudent.setFirstName("John");
+				aStudent.setLastName("Smith");
+
+				EnrolledClassSeat seat = new EnrolledClassSeat();
+				seat.setId("seat1");
+				seat.setRow(10);
+				seat.setColumn(5);
+
+				StudentEnrolledClass enrClass = new StudentEnrolledClass();
+				enrClass.setEnrolledClass(aClass);
+				enrClass.setClassStartTime(130);
+				enrClass.setSeat(seat);
+				aStudent.setEnrolledClasses(Collections.singleton(enrClass));
+				session.save(aStudent);
+			}
+		);
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/orphan/elementcollection/EnrollableClass.java

@@ -0,0 +1,34 @@
+package org.hibernate.test.orphan.elementcollection;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "ENROLLABLECLASS")
+public class EnrollableClass {
+
+	@Id
+	@Column(name = "id")
+	private String id;
+
+	@Column(name = "name")
+	private String name;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/orphan/elementcollection/EnrolledClassSeat.java

@@ -0,0 +1,31 @@
+package org.hibernate.test.orphan.elementcollection;
+
+public class EnrolledClassSeat {
+	private String id;
+	private int row;
+	private int column;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public int getRow() {
+		return row;
+	}
+
+	public void setRow(int row) {
+		this.row = row;
+	}
+
+	public int getColumn() {
+		return column;
+	}
+
+	public void setColumn(int column) {
+		this.column = column;
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/orphan/elementcollection/Student.java

@@ -0,0 +1,43 @@
+package org.hibernate.test.orphan.elementcollection;
+
+import java.util.Set;
+
+public class Student {
+
+	private String id;
+	private String firstName;
+	private String lastName;
+	private Set< StudentEnrolledClass > enrolledClasses;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public Set<StudentEnrolledClass> getEnrolledClasses() {
+		return enrolledClasses;
+	}
+
+	public void setEnrolledClasses(Set<StudentEnrolledClass> enrolledClasses) {
+		this.enrolledClasses = enrolledClasses;
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/orphan/elementcollection/StudentEnrolledClass.java

@@ -0,0 +1,31 @@
+package org.hibernate.test.orphan.elementcollection;
+
+public class StudentEnrolledClass {
+	private EnrollableClass enrolledClass;
+	private int classStartTime;
+	private EnrolledClassSeat seat;
+
+	public EnrollableClass getEnrolledClass() {
+		return enrolledClass;
+	}
+
+	public void setEnrolledClass(EnrollableClass enrolledClass) {
+		this.enrolledClass = enrolledClass;
+	}
+
+	public int getClassStartTime() {
+		return classStartTime;
+	}
+
+	public void setClassStartTime(int classStartTime) {
+		this.classStartTime = classStartTime;
+	}
+
+	public EnrolledClassSeat getSeat() {
+		return seat;
+	}
+
+	public void setSeat(EnrolledClassSeat seat) {
+		this.seat = seat;
+	}
+}

hibernate-core/src/test/java/org/hibernate/test/orphan/elementcollection/student.hbm.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+	<class name="org.hibernate.test.orphan.elementcollection.Student" table="STUDENT" lazy="true" >
+
+		<id name="id" column="id">
+			<generator class="assigned"/>
+		</id>
+
+		<property name="firstName" column="FIRSTNAME" />
+		<property name="lastName" column="LASTNAME" />
+
+		<set name="enrolledClasses" table="STUDENT_CLASS" lazy="true" fetch="subselect" cascade="all">
+			<key column="STUDENT_ID" />
+
+			<composite-element class="org.hibernate.test.orphan.elementcollection.StudentEnrolledClass" >
+				<many-to-one class="org.hibernate.test.orphan.elementcollection.EnrollableClass" name="enrolledClass" 
+				    column="ENROLLED_CLASS_ID" not-null="true" lazy="false" unique="false" cascade="none" />
+				<property name="classStartTime" column="STARTTIME" />
+				<many-to-one class="org.hibernate.test.orphan.elementcollection.EnrolledClassSeat" name="seat" 
+				    column="ENROLLED_CLASS_SEAT_ID" not-null="true" lazy="false" unique="true" cascade="all-delete-orphan" />
+			</composite-element>
+		</set>
+	</class>
+
+	<class name="org.hibernate.test.orphan.elementcollection.EnrollableClass" lazy="true" >
+
+		<id name="id" column="id">
+			<generator class="assigned"/>
+		</id>
+		<property name="name" column="NAME" />
+	</class>
+
+	<class name="org.hibernate.test.orphan.elementcollection.EnrolledClassSeat" lazy="true" >
+		<id name="id" column="id">
+			<generator class="assigned"/>
+		</id>
+		<property name="row" column="SEAT_ROW" />
+		<property name="column" column="SEAT_COLUMN" />
+	</class>
+</hibernate-mapping>