HHH-19542: Fixed an issue with the negative test showing it was not kicking in

Author: itsmoonrack

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java

@@ -6,6 +6,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -29,6 +31,7 @@
 import static org.hibernate.boot.model.internal.ClassPropertyHolder.handleGenericComponentProperty;
 import static org.hibernate.boot.model.internal.PropertyBinder.hasIdAnnotation;
 import static org.hibernate.internal.util.StringHelper.isEmpty;
+import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
 import static org.hibernate.internal.util.StringHelper.qualifyConditionally;
 import static org.hibernate.spi.NavigablePath.IDENTIFIER_MAPPER_PROPERTY;
 
@@ -68,6 +71,7 @@ public class ComponentPropertyHolder extends AbstractPropertyHolder {
 
 	private final String embeddedAttributeName;
 	private final Map<String,AttributeConversionInfo> attributeConversionInfoMap;
+	private final AtomicReference<AnnotatedColumn> annotatedColumn;
 
 	public ComponentPropertyHolder(
 			Component component,
@@ -94,6 +98,12 @@ public ComponentPropertyHolder(
 			this.embeddedAttributeName = "";
 			this.attributeConversionInfoMap = processAttributeConversions( inferredData.getClassOrElementType() );
 		}
+
+		if ( parent instanceof ComponentPropertyHolder parentHolder ) {
+			this.annotatedColumn = parentHolder.annotatedColumn;
+		} else {
+			this.annotatedColumn = new AtomicReference<>();
+		}
 	}
 
 	/**
@@ -226,7 +236,7 @@ public void addProperty(Property property, MemberDetails attributeMemberDetails,
 		// if not, change the component table if no properties are set
 		// if a property is set already the core cannot support that
 		final Table table = property.getValue().getTable();
-		if ( !table.equals( getTable() ) || !columnTableIsExplicit( table, columns ) ) {
+		if ( !table.equals( getTable() ) || !columnTableIsConsistent( columns ) ) {
 			if ( component.getPropertySpan() == 0 ) {
 				component.setTable( table );
 			}
@@ -241,11 +251,13 @@ public void addProperty(Property property, MemberDetails attributeMemberDetails,
 		addProperty( property, attributeMemberDetails, declaringClass );
 	}
 
-	private boolean columnTableIsExplicit(Table table, AnnotatedColumns columns) {
+	private boolean columnTableIsConsistent(AnnotatedColumns columns) {
 		if ( columns != null ) {
 			for ( AnnotatedColumn current : columns.getColumns() ) {
-				final String explicitTableName = current.getExplicitTableName();
-				if ( columns.isSecondary() && !table.getName().equals( explicitTableName ) ) {
+				final AnnotatedColumn previous = annotatedColumn.getAndSet( current );
+				if ( previous != null && !Objects.equals(
+							nullIfEmpty( current.getExplicitTableName() ),
+							nullIfEmpty( previous.getExplicitTableName() ) ) ) {
 					return false;
 				}
 			}

hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordNestedEmbeddedWithASecondaryTableTest.java

@@ -11,26 +11,31 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.SecondaryTable;
 import jakarta.persistence.Table;
+import org.hibernate.AnnotationException;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 @JiraKey("HHH-19542")
 @DomainModel(annotatedClasses = {
 		RecordNestedEmbeddedWithASecondaryTableTest.UserEntity.class
 })
 @SessionFactory
-public class RecordNestedEmbeddedWithASecondaryTableTest {
+class RecordNestedEmbeddedWithASecondaryTableTest {
 
 	private UserEntity user;
 
 	@BeforeAll
-	public void prepare(SessionFactoryScope scope) {
+	void prepare(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Person person = new Person( new FullName( "Sylvain", "Lecoy" ), 38 );
 			user = new UserEntity( person );
@@ -39,7 +44,7 @@ public void prepare(SessionFactoryScope scope) {
 	}
 
 	@Test
-	public void test(SessionFactoryScope scope) {
+	void test(SessionFactoryScope scope) {
 		scope.inTransaction(session -> {
 			UserEntity entity = session.find( UserEntity.class, user.id );
 			assertThat( entity ).isNotNull();
@@ -51,10 +56,23 @@ public void test(SessionFactoryScope scope) {
 		});
 	}
 
+	@Test
+	void test(ServiceRegistryScope scope) {
+		final StandardServiceRegistry registry = scope.getRegistry();
+		final MetadataSources sources = new MetadataSources( registry ).addAnnotatedClass( UserEntity1.class );
+
+		try {
+			sources.buildMetadata();
+			fail( "Expecting to fail" );
+		} catch (AnnotationException expected) {
+			assertThat( expected ).hasMessageContaining( "all properties of the embeddable class must map to the same table" );
+		}
+	}
+
 	@Entity
 	@Table(name = "UserEntity")
 	@SecondaryTable(name = "Person")
-	public static class UserEntity {
+	static class UserEntity {
 		@Id
 		@GeneratedValue
 		private Integer id;
@@ -71,19 +89,54 @@ protected UserEntity() {
 	}
 
 	@Embeddable
-	public record Person(
+	record Person(
 			FullName fullName,
 			@Column(table = "Person")
 			Integer age) {
 
 	}
 
 	@Embeddable
-	public record FullName(
+	record FullName(
 			@Column(table = "Person")
 			String firstName,
 			@Column(table = "Person")
 			String lastName) {
 
 	}
+
+	@Entity
+	@Table(name = "UserEntity")
+	@SecondaryTable(name = "Person")
+	public static class UserEntity1 {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		private Person1 person;
+
+		public UserEntity1(
+				final Person1 person) {
+			this.person = person;
+		}
+
+		protected UserEntity1() {
+
+		}
+	}
+
+	@Embeddable
+	public record Person1(
+			FullName1 fullName,
+			@Column(table = "Person")
+			Integer age) {
+
+	}
+
+	@Embeddable
+	public record FullName1(
+			@Column(table = "Person")
+			String firstName,
+			String lastName) {
+
+	}
 }