HHH-19460 - mis-named <embedded-id/> leads to NPE

Author: sebersole

hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/attr/EmbeddedIdAttributeProcessing.java

@@ -34,7 +34,7 @@ public static MutableMemberDetails processEmbeddedIdAttribute(
 			AccessType classAccessType,
 			XmlDocumentContext xmlDocumentContext) {
 		final AccessType accessType = coalesce( jaxbEmbeddedId.getAccess(), classAccessType );
-		final MutableMemberDetails memberDetails = XmlProcessingHelper.findAttributeMember(
+		final MutableMemberDetails memberDetails = XmlProcessingHelper.getAttributeMember(
 				jaxbEmbeddedId.getName(),
 				accessType,
 				classDetails

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/bad/BadMappingTests.java

@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.bad;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.models.MemberResolutionException;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * @author Steve Ebersole
+ */
+public class BadMappingTests {
+	@Test
+	@ServiceRegistry
+	void testBadEmbeddedName(ServiceRegistryScope registryScope) {
+		final MetadataSources metadataSources = new MetadataSources( registryScope.getRegistry() )
+				.addResource( "mappings/models/bad/bad-embedded.xml" );
+		try {
+			metadataSources.buildMetadata();
+			fail( "Expecting failure" );
+		}
+		catch (MemberResolutionException expected){
+			// expected outcome
+		}
+
+	}
+
+	@Test
+	@ServiceRegistry
+	void testBadEmbeddedIdName(ServiceRegistryScope registryScope) {
+		final MetadataSources metadataSources = new MetadataSources( registryScope.getRegistry() )
+				.addResource( "mappings/models/bad/bad-embedded-id.xml" );
+		try {
+			metadataSources.buildMetadata();
+			fail( "Expecting failure" );
+		}
+		catch (MemberResolutionException expected){
+			// expected outcome
+		}
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/bad/Book.java

@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.bad;
+
+/**
+ * @author Steve Ebersole
+ */
+public class Book {
+	private Integer id;
+	private String name;
+	private Sku sku;
+}

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/bad/Product.java

@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.bad;
+
+/**
+ * @author Steve Ebersole
+ */
+public class Product {
+	private ProductKey id;
+	private String name;
+}

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/bad/ProductKey.java

@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.bad;
+
+/**
+ * @author Steve Ebersole
+ */
+public class ProductKey {
+	private Integer companyId;
+	private String sku;
+}

hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/bad/Sku.java

@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.boot.models.xml.bad;
+
+/**
+ * @author Steve Ebersole
+ */
+public class Sku {
+	private String group;
+	private String department;
+	private String code;
+}

hibernate-core/src/test/resources/mappings/models/bad/bad-embedded-id.xml

@@ -0,0 +1,21 @@
+
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 version="7.0">
+    <package>org.hibernate.orm.test.boot.models.xml.bad</package>
+    <access>FIELD</access>
+    
+    <entity class="Product" metadata-complete="true">
+        <attributes>
+            <embedded-id name="di"/>
+            <basic name="name"/>
+        </attributes>
+    </entity>
+    
+    <embeddable class="ProductKey" metadata-complete="true">
+        <attributes>
+            <basic name="companyId"/>
+            <basic name="sku"/>
+        </attributes>
+    </embeddable>
+</entity-mappings>

hibernate-core/src/test/resources/mappings/models/bad/bad-embedded.xml

@@ -0,0 +1,23 @@
+
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 version="7.0">
+    <package>org.hibernate.orm.test.boot.models.xml.bad</package>
+    <access>FIELD</access>
+    
+    <entity class="Book" metadata-complete="true">
+        <attributes>
+            <id name="id"/>
+            <basic name="name"/>
+            <embedded name="skew"/>
+        </attributes>
+    </entity>
+    
+    <embeddable class="Sku" metadata-complete="true">
+        <attributes>
+            <basic name="group"/>
+            <basic name="department"/>
+            <basic name="code"/>
+        </attributes>
+    </embeddable>
+</entity-mappings>