HHH-18933 Hierarchically ordering classes before returning from method in equivalent way as in main (7.0) branch

Author: cigaly

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/AnnotationMetadataSourceProcessorImpl.java

@@ -304,7 +304,28 @@ private List<XClass> orderAndFillHierarchy(List<XClass> classes) {
 				}
 			}
 		}
-		return new ArrayList<>( orderedClasses );
+
+		// order the hierarchy
+		ArrayList<XClass> workingCopy = new ArrayList<>( orderedClasses );
+		List<XClass> newList = new ArrayList<>( orderedClasses.size() );
+		while ( !workingCopy.isEmpty() ) {
+			XClass clazz = workingCopy.get( 0 );
+			orderHierarchy( workingCopy, newList, orderedClasses, clazz );
+		}
+		return newList;
+	}
+
+	private void orderHierarchy(List<XClass> copy, List<XClass> newList, LinkedHashSet<XClass> original, XClass clazz) {
+		if ( clazz != null && !Object.class.getName().equals( clazz.getName() ) ) {
+			//process superclass first
+			orderHierarchy( copy, newList, original, clazz.getSuperclass() );
+			if ( original.contains( clazz ) ) {
+				if ( !newList.contains( clazz ) ) {
+					newList.add( clazz );
+				}
+				copy.remove( clazz );
+			}
+		}
 	}
 
 	@Override