HHH-14241 Support ImplicitNamingStrategyComponentPathImpl with IdClass

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/main/java/org/hibernate/boot/model/naming/ImplicitNamingStrategyComponentPathImpl.java

@@ -8,6 +8,7 @@
 
 import org.hibernate.boot.model.source.spi.AttributePath;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.loader.PropertyPath;
 
 /**
  * An ImplicitNamingStrategy implementation which uses full composite paths
@@ -30,14 +31,17 @@ protected String transformAttributePath(AttributePath attributePath) {
 	}
 
 	public static void process(AttributePath attributePath, StringBuilder sb) {
-		if ( attributePath.getParent() != null ) {
-			process( attributePath.getParent(), sb );
-			if ( StringHelper.isNotEmpty( attributePath.getParent().getProperty() ) ) {
-				sb.append( '_' );
-			}
-		}
-
 		String property = attributePath.getProperty();
+		final AttributePath parent = attributePath.getParent();
+		if ( parent != null && StringHelper.isNotEmpty( parent.getProperty() ) ) {
+			process( parent, sb );
+			sb.append( '_' );
+		}
+		else if ( PropertyPath.IDENTIFIER_MAPPER_PROPERTY.equals( property ) ) {
+			// skip it, do not pass go
+			sb.append( "id" );
+			return;
+		}
 		property = property.replace( "<", "" );
 		property = property.replace( ">", "" );
 

hibernate-core/src/test/java/org/hibernate/id/idclass/IdClassNamingStrategyTest.java

@@ -9,6 +9,7 @@
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl;
 import org.hibernate.cfg.Configuration;
 
+import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -21,22 +22,23 @@ protected Class<?>[] getAnnotatedClasses() {
 
 	@Override
 	protected void configure(Configuration configuration) {
-		/*
-		 * With this implicit naming strategy, we got the following mapping:
-		 *
-		 * create table MyEntity (
+        /*
+         * With this implicit naming strategy, we got the following mapping:
+         *
+         * create table MyEntity (
          *   id_idA bigint not null,
          *   id_idB bigint not null,
          *   _identifierMapper_idA bigint not null, <-- ??
          *   _identifierMapper_idB bigint not null, <-- ??
          *   notes varchar(255),
          *   primary key (id_idA, id_idB)
          * )
-		 */
+         */
 		configuration.setImplicitNamingStrategy( new ImplicitNamingStrategyComponentPathImpl() );
 	}
 
 	@Test
+	@TestForIssue(jiraKey = "HHH-14241")
 	public void test() {
 		inTransaction( ( session ) -> {
 			MyEntity entity = new MyEntity();

hibernate-core/src/test/java/org/hibernate/id/idclass/MyEntity.java

@@ -23,12 +23,12 @@ public class MyEntity {
 	private String notes;
 
 	public MyEntityId getId() {
-		return new MyEntityId( idB, idA );
+		return new MyEntityId( idA, idB );
 	}
 
 	public void setId(MyEntityId id) {
-		this.idB = id.getIdA();
-		this.idA = id.getIdB();
+		this.idA = id.getIdA();
+		this.idB = id.getIdB();
 	}
 
 	public String getNotes() {