changelog.txt

@@ -3,6 +3,25 @@ Hibernate 6 Changelog
 
 Note: Please refer to JIRA to learn more about each issue.
 
+Changes in 6.6.11.Final (March 16, 2025)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/32879
+
+** Bug
+    * [HHH-19246] - Fetch join makes partially covered EntityGraph ineffective
+    * [HHH-19220] - ClassCastException: class org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer$1 cannot be cast to class java.lang.String
+    * [HHH-19140] - Enhanced entities with AccessType.PROPERTY does not work well with inheritance
+    * [HHH-19107] - Entities with @EmbeddedId not supported with CrudRepository
+    * [HHH-19106] - @Transaction(TxType) not working with Hibernate Data Repositories
+    * [HHH-19052] - Hibernate 6.6.X regression with join formula
+    * [HHH-18894] - Hibernate 6.6 enum literal is considered field literal instead
+    * [HHH-18881] - In MySQL, array of dates are not converted correctly
+    * [HHH-18858] - array fields and static metamodel
+    * [HHH-18787] - Custom UserType not recognised for array properties
+    * [HHH-18570] - Invalid SQL when filter contains identifier named date
+
+
 Changes in 6.6.10.Final (March 09, 2025)
 ------------------------------------------------------------------------------------------------------------------------
 
@@ -24,8 +43,6 @@ https://hibernate.atlassian.net/projects/HHH/versions/32614
 
 ** Bug
     * [HHH-19173] - PostgreSQLLegacySqlAstTranslator does not implement visitInArrayPredicates
-    * [HHH-19169] - Entity hierarchy (and included embeddables) with inconsistent bytecode enhancement is unsupported, but isn't detected
-    * [HHH-19168] - Re-enhancement of entities with different configuration may skip some enhancements
     * [HHH-19116] - Error when using fk() function on left joined many-to-one association and is null predicate
     * [HHH-19110] - Flush operation fails with "UnsupportedOperationException: compare() not implemented for EntityType"
     * [HHH-17151] - NPE when binding null parameter in native query with explicit TemporalType

gradle/version.properties

@@ -1 +1 @@
-hibernateVersion=6.6.10.Final
+hibernateVersion=6.6.11.Final

hibernate-core/src/main/java/org/hibernate/boot/model/TypeContributions.java

@@ -58,7 +58,7 @@ default void contributeJdbcTypeConstructor(JdbcTypeConstructor typeConstructor)
 	 * type for values of type {@link UserType#returnedClass()}.
 	 */
 	default void contributeType(UserType<?> type) {
-		contributeType( type, type.returnedClass().getName() );
+		contributeType( type, type.returnedClass().getTypeName() );
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java

@@ -289,7 +289,21 @@ public Set<EmbeddableType<?>> getEmbeddables() {
 
 	@Override
 	public EnumJavaType<?> getEnumType(String className) {
-		return enumJavaTypes.get( className );
+		final EnumJavaType<?> enumJavaType = enumJavaTypes.get( className );
+		if ( enumJavaType != null ) {
+			return enumJavaType;
+		}
+		final ClassLoaderService classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
+		try {
+			final Class<Object> clazz = classLoaderService.classForName( className );
+			if ( clazz == null || !clazz.isEnum() ) {
+				return null;
+			}
+			return new EnumJavaType( clazz );
+		}
+		catch (ClassLoadingException e) {
+			throw new RuntimeException( e );
+		}
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/property/access/internal/AccessStrategyHelper.java

@@ -6,14 +6,11 @@
  */
 package org.hibernate.property.access.internal;
 
-import java.beans.Introspector;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Locale;
 
-import org.hibernate.MappingException;
 import org.hibernate.PropertyNotFoundException;
 import org.hibernate.bytecode.enhance.spi.interceptor.BytecodeLazyAttributeInterceptor;
 import org.hibernate.engine.spi.CompositeOwner;
@@ -33,6 +30,7 @@
 import static org.hibernate.engine.internal.ManagedTypeHelper.isPersistentAttributeInterceptableType;
 import static org.hibernate.internal.util.ReflectHelper.NO_PARAM_SIGNATURE;
 import static org.hibernate.internal.util.ReflectHelper.findField;
+import static org.hibernate.internal.util.ReflectHelper.getterMethodOrNull;
 import static org.hibernate.internal.util.ReflectHelper.isRecord;
 
 /**
@@ -87,89 +85,9 @@ public static AccessType getAccessType(Class<?> containerJavaType, String proper
 			return AccessType.FIELD;
 		}
 
-		for ( Method method : containerClass.getDeclaredMethods() ) {
-			// if the method has parameters, skip it
-			if ( method.getParameterCount() != 0 ) {
-				continue;
-			}
-
-			// if the method is a "bridge", skip it
-			if ( method.isBridge() ) {
-				continue;
-			}
-
-			if ( method.isAnnotationPresent( Transient.class ) ) {
-				continue;
-			}
-
-			if ( Modifier.isStatic( method.getModifiers() ) ) {
-				continue;
-			}
-
-			final String methodName = method.getName();
-
-			// try "get"
-			if ( methodName.startsWith( "get" ) ) {
-				final String stemName = methodName.substring( 3 );
-				final String decapitalizedStemName = Introspector.decapitalize( stemName );
-				if ( stemName.equals( propertyName ) || decapitalizedStemName.equals( propertyName ) ) {
-					if ( method.isAnnotationPresent( Access.class ) ) {
-						return AccessType.PROPERTY;
-					}
-					else {
-						checkIsMethodVariant( containerClass, propertyName, method, stemName );
-					}
-				}
-			}
-
-			// if not "get", then try "is"
-			if ( methodName.startsWith( "is" ) ) {
-				final String stemName = methodName.substring( 2 );
-				String decapitalizedStemName = Introspector.decapitalize( stemName );
-				if ( stemName.equals( propertyName ) || decapitalizedStemName.equals( propertyName ) ) {
-					if ( method.isAnnotationPresent( Access.class ) ) {
-						return AccessType.PROPERTY;
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	private static void checkIsMethodVariant(
-			Class<?> containerClass,
-			String propertyName,
-			Method method,
-			String stemName) {
-		final Method isMethodVariant = findIsMethodVariant( containerClass, stemName );
-		if ( isMethodVariant == null ) {
-			return;
-		}
-
-		if ( !isMethodVariant.isAnnotationPresent( Access.class ) ) {
-			throw new MappingException(
-					String.format(
-							Locale.ROOT,
-							"Class '%s' declares both 'get' [%s] and 'is' [%s] variants of getter for property '%s'",
-							containerClass.getName(),
-							method.toString(),
-							isMethodVariant,
-							propertyName
-					)
-			);
-		}
-	}
-
-	public static @Nullable Method findIsMethodVariant(Class<?> containerClass, String stemName) {
-		// verify that the Class does not also define a method with the same stem name with 'is'
-		try {
-			final Method isMethod = containerClass.getDeclaredMethod( "is" + stemName );
-			if ( !Modifier.isStatic( isMethod.getModifiers() ) && isMethod.getAnnotation( Transient.class ) == null ) {
-				return isMethod;
-			}
-		}
-		catch (NoSuchMethodException ignore) {
+		final Method getter = getterMethodOrNull( containerClass, propertyName );
+		if ( getter != null && getter.isAnnotationPresent( Access.class ) ) {
+			return AccessType.PROPERTY;
 		}
 
 		return null;

hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java

@@ -8352,6 +8352,15 @@ private Fetch createFetch(FetchParent fetchParent, Fetchable fetchable, Boolean
 			joined = true;
 			alias = fetchedJoin.getExplicitAlias();
 			explicitFetch = true;
+
+			if ( entityGraphTraversalState != null ) {
+				// Still do traverse the entity graph even if we encounter a fetch join
+				traversalResult = entityGraphTraversalState.traverse(
+						fetchParent,
+						fetchable,
+						isKeyFetchable
+				);
+			}
 		}
 		else {
 			fetchablePath = resolvedNavigablePath;