HHH-18384 Inheritance hierarchy must be followed

Author: cigaly

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

@@ -629,15 +629,15 @@ private static List<PropertyData> collectClassElements(
 		//embeddable elements can have type defs
 		final PropertyContainer container =
 				new PropertyContainer( returnedClassOrElement, annotatedClass, propertyAccessor );
-		addElementsOfClass( classElements, container, context);
+		addElementsOfClass( classElements, container, context, 0 );
 		//add elements of the embeddable's mapped superclasses
 		XClass subclass = returnedClassOrElement;
 		XClass superClass;
 		while ( isValidSuperclass( superClass = subclass.getSuperclass(), isIdClass ) ) {
 			//FIXME: proper support of type variables incl var resolved at upper levels
 			final PropertyContainer superContainer =
 					new PropertyContainer( superClass, annotatedClass, propertyAccessor );
-			addElementsOfClass( classElements, superContainer, context );
+			addElementsOfClass( classElements, superContainer, context, 0 );
 			if ( subclassToSuperclass != null ) {
 				subclassToSuperclass.put( subclass.getName(), superClass.getName() );
 			}
@@ -668,7 +668,7 @@ private static void collectSubclassElements(
 			assert put == null;
 			// collect property of subclass
 			final PropertyContainer superContainer = new PropertyContainer( subclass, superclass, propertyAccessor );
-			addElementsOfClass( classElements, superContainer, context );
+			addElementsOfClass( classElements, superContainer, context, 0 );
 			// recursively do that same for all subclasses
 			collectSubclassElements(
 					propertyAccessor,
@@ -739,7 +739,7 @@ private static List<PropertyData> collectBaseClassElements(
 			while ( !Object.class.getName().equals( baseReturnedClassOrElement.getName() ) ) {
 				final PropertyContainer container =
 						new PropertyContainer( baseReturnedClassOrElement, annotatedClass, propertyAccessor );
-				addElementsOfClass( baseClassElements, container, context );
+				addElementsOfClass( baseClassElements, container, context, 0 );
 				baseReturnedClassOrElement = baseReturnedClassOrElement.getSuperclass();
 			}
 			return baseClassElements;

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

@@ -617,7 +617,7 @@ private static PropertyData getUniqueIdPropertyFromBaseClass(
 				inferredData.getPropertyClass(),
 				propertyAccessor
 		);
-		addElementsOfClass( baseClassElements, propContainer, context );
+		addElementsOfClass( baseClassElements, propContainer, context, 0 );
 		//Id properties are on top and there is only one
 		return baseClassElements.get( 0 );
 	}

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

@@ -234,12 +234,11 @@ private ElementsToProcess getElementsToProcess() {
 						clazz,
 						accessType
 				);
-				int currentIdPropertyCount = addElementsOfClass(
+				idPropertyCount = addElementsOfClass(
 						elements,
 						propertyContainer,
-						buildingContext
-				);
-				idPropertyCount += currentIdPropertyCount;
+						buildingContext,
+						idPropertyCount );
 			}
 
 			if ( idPropertyCount == 0 && !inheritanceState.hasParents() ) {

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

@@ -555,15 +555,15 @@ private void validateOptimisticLock(OptimisticLock optimisticLock) {
 	/**
 	 * @param elements List of {@link PropertyData} instances
 	 * @param propertyContainer Metadata about a class and its properties
+	 * @param idPropertyCounter number of id properties already present in list of {@link PropertyData} instances
 	 *
-	 * @return the number of id properties found while iterating the elements of
-	 *         {@code annotatedClass} using the determined access strategy
+	 * @return total number of id properties found after iterating the elements of
+	 * {@code annotatedClass} using the determined access strategy
 	 */
 	static int addElementsOfClass(
 			List<PropertyData> elements,
 			PropertyContainer propertyContainer,
-			MetadataBuildingContext context) {
-		int idPropertyCounter = 0;
+			MetadataBuildingContext context, int idPropertyCounter) {
 		for ( XProperty property : propertyContainer.propertyIterator() ) {
 			idPropertyCounter += addProperty( propertyContainer, property, elements, context, idPropertyCounter );
 		}