Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14241 Support ImplicitNamingStrategyComponentPathImpl with IdClass 

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
This commit is contained in:
Jan Schatteman 2020-10-05 21:33:46 +02:00 committed by Jan Schatteman
parent 03416a8cdd
commit 8d4de09255
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -9,6 +9,7 @@ package org.hibernate.id.idclass;
import org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl; import org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase; import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test; import org.junit.Test;
@ -37,6 +38,7 @@ public class IdClassNamingStrategyTest extends BaseCoreFunctionalTestCase {
} }
@Test @Test
@TestForIssue(jiraKey = "HHH-14241")
public void test() { public void test() {
inTransaction( ( session ) -> { inTransaction( ( session ) -> {
MyEntity entity = new MyEntity(); MyEntity entity = new MyEntity();

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

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