HHH-10309 - HHH-10242 is too aggressive in cases of FIELD access

(cherry picked from commit 1183a47)

Author: sebersole

hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java

@@ -1468,32 +1468,23 @@ private static void bindDiscriminatorColumnToRootPersistentClass(
 
 	/**
 	 * @param elements List of {@code ProperyData} instances
-	 * @param defaultAccessType The default value access strategy which has to be used in case no explicit local access
-	 * strategy is used
 	 * @param propertyContainer Metadata about a class and its properties
 	 *
 	 * @return the number of id properties found while iterating the elements of {@code annotatedClass} using
 	 *         the determined access strategy, {@code false} otherwise.
 	 */
 	static int addElementsOfClass(
 			List<PropertyData> elements,
-			AccessType defaultAccessType,
 			PropertyContainer propertyContainer,
 			MetadataBuildingContext context) {
 		int idPropertyCounter = 0;
-		AccessType accessType = defaultAccessType;
 
-		if ( propertyContainer.hasExplicitAccessStrategy() ) {
-			accessType = propertyContainer.getExplicitAccessStrategy();
-		}
-
-		Collection<XProperty> properties = propertyContainer.getProperties( accessType );
+		Collection<XProperty> properties = propertyContainer.getProperties();
 		for ( XProperty p : properties ) {
 			final int currentIdPropertyCounter = addProperty(
 					propertyContainer,
 					p,
 					elements,
-					accessType.getType(),
 					context
 			);
 			idPropertyCounter += currentIdPropertyCounter;
@@ -1505,15 +1496,14 @@ private static int addProperty(
 			PropertyContainer propertyContainer,
 			XProperty property,
 			List<PropertyData> annElts,
-			String propertyAccessor,
 			MetadataBuildingContext context) {
 		final XClass declaringClass = propertyContainer.getDeclaringClass();
 		final XClass entity = propertyContainer.getEntityAtStake();
 		int idPropertyCounter = 0;
 		PropertyData propertyAnnotatedElement = new PropertyInferredData(
 				declaringClass,
 				property,
-				propertyAccessor,
+				propertyContainer.getClassLevelAccessType().getType(),
 				context.getBuildingOptions().getReflectionManager()
 		);
 
@@ -1560,7 +1550,7 @@ else if ( prop.isAnnotationPresent( JoinColumns.class ) ) {
 										//same dec
 										prop,
 										// the actual @XToOne property
-										propertyAccessor,
+										propertyContainer.getClassLevelAccessType().getType(),
 										//TODO we should get the right accessor but the same as id would do
 										context.getBuildingOptions().getReflectionManager()
 								);
@@ -2560,24 +2550,24 @@ public static Component fillComponent(
 			baseClassElements = new ArrayList<PropertyData>();
 			baseReturnedClassOrElement = baseInferredData.getClassOrElement();
 			bindTypeDefs( baseReturnedClassOrElement, buildingContext );
-			PropertyContainer propContainer = new PropertyContainer( baseReturnedClassOrElement, xClassProcessed );
-			addElementsOfClass( baseClassElements, propertyAccessor, propContainer, buildingContext );
+			PropertyContainer propContainer = new PropertyContainer( baseReturnedClassOrElement, xClassProcessed, propertyAccessor );
+			addElementsOfClass( baseClassElements,  propContainer, buildingContext );
 			for ( PropertyData element : baseClassElements ) {
 				orderedBaseClassElements.put( element.getPropertyName(), element );
 			}
 		}
 
 		//embeddable elements can have type defs
 		bindTypeDefs( returnedClassOrElement, buildingContext );
-		PropertyContainer propContainer = new PropertyContainer( returnedClassOrElement, xClassProcessed );
-		addElementsOfClass( classElements, propertyAccessor, propContainer, buildingContext );
+		PropertyContainer propContainer = new PropertyContainer( returnedClassOrElement, xClassProcessed, propertyAccessor );
+		addElementsOfClass( classElements, propContainer, buildingContext );
 
 		//add elements of the embeddable superclass
 		XClass superClass = xClassProcessed.getSuperclass();
 		while ( superClass != null && superClass.isAnnotationPresent( MappedSuperclass.class ) ) {
 			//FIXME: proper support of typevariables incl var resolved at upper levels
-			propContainer = new PropertyContainer( superClass, xClassProcessed );
-			addElementsOfClass( classElements, propertyAccessor, propContainer, buildingContext );
+			propContainer = new PropertyContainer( superClass, xClassProcessed, propertyAccessor );
+			addElementsOfClass( classElements, propContainer, buildingContext );
 			superClass = superClass.getSuperclass();
 		}
 		if ( baseClassElements != null ) {
@@ -2790,9 +2780,11 @@ private static PropertyData getUniqueIdPropertyFromBaseClass(
 		List<PropertyData> baseClassElements = new ArrayList<PropertyData>();
 		XClass baseReturnedClassOrElement = baseInferredData.getClassOrElement();
 		PropertyContainer propContainer = new PropertyContainer(
-				baseReturnedClassOrElement, inferredData.getPropertyClass()
+				baseReturnedClassOrElement,
+				inferredData.getPropertyClass(),
+				propertyAccessor
 		);
-		addElementsOfClass( baseClassElements, propertyAccessor, propContainer, context );
+		addElementsOfClass( baseClassElements, propContainer, context );
 		//Id properties are on top and there is only one
 		return baseClassElements.get( 0 );
 	}

hibernate-core/src/main/java/org/hibernate/cfg/InheritanceState.java

@@ -216,11 +216,11 @@ public ElementsToProcess getElementsToProcess() {
 			for ( XClass classToProcessForMappedSuperclass : classesToProcessForMappedSuperclass ) {
 				PropertyContainer propertyContainer = new PropertyContainer(
 						classToProcessForMappedSuperclass,
-						clazz
+						clazz,
+						accessType
 				);
 				int currentIdPropertyCount = AnnotationBinder.addElementsOfClass(
 						elements,
-						accessType,
 						propertyContainer,
 						buildingContext
 				);