HHH-19209 Sorting record components by name when generating ID class

cigaly · cigaly · commit 3700128a862b · 2025-02-27T16:51:09.000+01:00
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/annotation/AnnotationMetaEntity.java
@@ -66,6 +66,7 @@
 import static java.beans.Introspector.decapitalize;
 import static java.lang.Boolean.FALSE;
 import static java.util.Collections.emptyList;
+import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;
 import static javax.lang.model.util.ElementFilter.fieldsIn;
 import static javax.lang.model.util.ElementFilter.methodsIn;
@@ -487,6 +488,7 @@ private void addIdClassIfNeeded(List<? extends Element> fields, List<? extends E
 		if ( components.size() < 2 ) {
 			return;
 		}
+		components.sort( comparing( MetaAttribute::getPropertyName ) );
 		putMember( ID_CLASS_MEMBER_NAME, new IdClassMetaAttribute( this, components ) );
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@`
`66`	`66`	`import static java.beans.Introspector.decapitalize;`
`67`	`67`	`import static java.lang.Boolean.FALSE;`
`68`	`68`	`import static java.util.Collections.emptyList;`
	`69`	`+import static java.util.Comparator.comparing;`
`69`	`70`	`import static java.util.stream.Collectors.toList;`
`70`	`71`	`import static javax.lang.model.util.ElementFilter.fieldsIn;`
`71`	`72`	`import static javax.lang.model.util.ElementFilter.methodsIn;`
`@@ -487,6 +488,7 @@ private void addIdClassIfNeeded(List<? extends Element> fields, List<? extends E`
`487`	`488`	`if ( components.size() < 2 ) {`
`488`	`489`	`return;`
`489`	`490`	`}`
	`491`	`+ components.sort( comparing( MetaAttribute::getPropertyName ) );`
`490`	`492`	`putMember( ID_CLASS_MEMBER_NAME, new IdClassMetaAttribute( this, components ) );`
`491`	`493`	`}`
`492`	`494`