Switch from java.lang.Class to java.lang.reflect.Type in the metamode…

…l to support parameterized types
hibernate · Mar 9, 2021 · 350fd81 · 350fd81
1 parent 4a1a084
commit 350fd81
Show file tree

Hide file tree

Showing 27 changed files with 174 additions and 83 deletions.
diff --git a/...e/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java b/...e/src/main/java/org/hibernate/boot/model/process/internal/InferredBasicValueResolver.java
@@ -138,7 +138,7 @@ else if ( reflectedJtd != null ) {
 		if ( jdbcMapping == null ) {
 			throw new MappingException(
 					"Could not determine JavaTypeDescriptor nor SqlTypeDescriptor to use" + "" +
-							" for " + ( (BasicValue) stdIndicators ).getResolvedJavaClass() +
+							" for " + ( (BasicValue) stdIndicators ).getResolvedJavaType() +
 							"; table = " + table.getName() +
 							"; column = " + selectable.getText()
 			);

diff --git a/...rnate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java b/...rnate-core/src/main/java/org/hibernate/boot/model/process/internal/VersionResolution.java
@@ -35,15 +35,15 @@ public class VersionResolution<E> implements BasicValue.Resolution<E> {
 
 	@SuppressWarnings({"rawtypes", "unchecked"})
 	public static <E> VersionResolution<E> from(
-			Function<TypeConfiguration, Class> implicitJavaTypeAccess,
+			Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess,
 			Function<TypeConfiguration, BasicJavaDescriptor> explicitJtdAccess,
 			Function<TypeConfiguration, SqlTypeDescriptor> explicitStdAccess,
 			TypeConfiguration typeConfiguration,
 			@SuppressWarnings("unused") MetadataBuildingContext context) {
 
 		// todo (6.0) : add support for Dialect-specific interpretation?
 
-		final Class implicitJavaType = implicitJavaTypeAccess.apply( typeConfiguration );
+		final java.lang.reflect.Type implicitJavaType = implicitJavaTypeAccess.apply( typeConfiguration );
 		final JavaTypeDescriptor registered = typeConfiguration.getJavaTypeDescriptorRegistry().resolveDescriptor( implicitJavaType );
 
 		if ( registered instanceof PrimitiveByteArrayTypeDescriptor ) {

diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/annotations/BasicValueBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/annotations/BasicValueBinder.java
@@ -50,6 +50,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.internal.CoreMessageLogger;
+import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.type.descriptor.java.BasicJavaDescriptor;
@@ -98,7 +99,7 @@ public enum Kind {
 	private Function<TypeConfiguration,SqlTypeDescriptor> explicitSqlTypeAccess;
 	private Function<TypeConfiguration, BasicJavaDescriptor> explicitJtdAccess;
 	private Function<TypeConfiguration, MutabilityPlan> explicitMutabilityAccess;
-	private Function<TypeConfiguration, Class> implicitJavaTypeAccess;
+	private Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess;
 
 	private AccessType accessType;
 
@@ -595,7 +596,7 @@ private void normalSupplementalDetails(
 			}
 
 			// see if the value's type Class is annotated `@Immutable`
-			final Class attributeType = implicitJavaTypeAccess.apply( typeConfiguration );
+			final Class attributeType = ReflectHelper.getClass( implicitJavaTypeAccess.apply( typeConfiguration ) );
 			if ( attributeType.isAnnotationPresent( Immutable.class ) ) {
 				return ImmutableMutabilityPlan.instance();
 			}

diff --git a/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java b/hibernate-core/src/main/java/org/hibernate/internal/util/ReflectHelper.java
@@ -13,6 +13,7 @@
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
 import java.util.Locale;
 import java.util.regex.Pattern;
 import javax.persistence.Transient;
@@ -214,6 +215,19 @@ public static Class reflectedPropertyClass(
 			String className,
 			String name,
 			ClassLoaderService classLoaderService) throws MappingException {
+		try {
+			Class clazz = classLoaderService.classForName( className );
+			return getter( clazz, name ).getReturnTypeClass();
+		}
+		catch ( ClassLoadingException e ) {
+			throw new MappingException( "class " + className + " not found while looking for property: " + name, e );
+		}
+	}
+
+	public static java.lang.reflect.Type reflectedPropertyType(
+			String className,
+			String name,
+			ClassLoaderService classLoaderService) throws MappingException {
 		try {
 			Class clazz = classLoaderService.classForName( className );
 			return getter( clazz, name ).getReturnType();
@@ -232,7 +246,7 @@ public static Class reflectedPropertyClass(
 	 * @throws MappingException Indicates we were unable to locate the property.
 	 */
 	public static Class reflectedPropertyClass(Class clazz, String name) throws MappingException {
-		return getter( clazz, name ).getReturnType();
+		return getter( clazz, name ).getReturnTypeClass();
 	}
 
 	private static Getter getter(Class clazz, String name) throws MappingException {
@@ -723,4 +737,17 @@ public static Method findGetterMethodForFieldAccess(Field field, String property
 
 		return null;
 	}
+
+	public static <T> Class<T> getClass(java.lang.reflect.Type type) {
+		if ( type == null ) {
+			return null;
+		}
+		else if ( type instanceof Class<?> ) {
+			return (Class<T>) type;
+		}
+		else if ( type instanceof ParameterizedType ) {
+			return (Class<T>) ( (ParameterizedType) type ).getRawType();
+		}
+		throw new UnsupportedOperationException( "Can't get java type class from type: " + type );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -62,15 +62,15 @@ public class BasicValue extends SimpleValue implements SqlTypeDescriptorIndicato
 	private String explicitTypeName;
 	private Map explicitLocalTypeParams;
 
-	private Function<TypeConfiguration,BasicJavaDescriptor> explicitJavaTypeAccess;
-	private Function<TypeConfiguration,SqlTypeDescriptor> explicitSqlTypeAccess;
-	private Function<TypeConfiguration,MutabilityPlan> explicitMutabilityPlanAccess;
-	private Function<TypeConfiguration,Class> implicitJavaTypeAccess;
+	private Function<TypeConfiguration, BasicJavaDescriptor> explicitJavaTypeAccess;
+	private Function<TypeConfiguration, SqlTypeDescriptor> explicitSqlTypeAccess;
+	private Function<TypeConfiguration, MutabilityPlan> explicitMutabilityPlanAccess;
+	private Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess;
 
 	private EnumType enumerationStyle;
 	private TemporalType temporalPrecision;
 
-	private Class resolvedJavaClass;
+	private java.lang.reflect.Type resolvedJavaType;
 
 	private String ownerName;
 	private String propertyName;
@@ -138,7 +138,7 @@ public void setExplicitMutabilityPlanAccess(Function<TypeConfiguration, Mutabili
 		this.explicitMutabilityPlanAccess = explicitMutabilityPlanAccess;
 	}
 
-	public void setImplicitJavaTypeAccess(Function<TypeConfiguration, Class> implicitJavaTypeAccess) {
+	public void setImplicitJavaTypeAccess(Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess) {
 		this.implicitJavaTypeAccess = implicitJavaTypeAccess;
 	}
 
@@ -149,8 +149,8 @@ public Selectable getColumn() {
 		return getColumn( 0 );
 	}
 
-	public Class getResolvedJavaClass() {
-		return resolvedJavaClass;
+	public java.lang.reflect.Type getResolvedJavaType() {
+		return resolvedJavaType;
 	}
 
 	@Override
@@ -344,7 +344,7 @@ public TypeConfiguration getTypeConfiguration() {
 
 		if ( jtd == null ) {
 			if ( implicitJavaTypeAccess != null ) {
-				final Class implicitJtd = implicitJavaTypeAccess.apply( typeConfiguration );
+				final java.lang.reflect.Type implicitJtd = implicitJavaTypeAccess.apply( typeConfiguration );
 				if ( implicitJtd != null ) {
 					jtd = typeConfiguration.getJavaTypeDescriptorRegistry().getDescriptor( implicitJtd );
 				}
@@ -403,10 +403,10 @@ public TypeConfiguration getTypeConfiguration() {
 	}
 
 	private JavaTypeDescriptor determineReflectedJavaTypeDescriptor() {
-		final Class impliedJavaType;
+		final java.lang.reflect.Type impliedJavaType;
 
-		if ( resolvedJavaClass != null ) {
-			impliedJavaType = resolvedJavaClass;
+		if ( resolvedJavaType != null ) {
+			impliedJavaType = resolvedJavaType;
 		}
 		else if ( implicitJavaTypeAccess != null ) {
 			impliedJavaType = implicitJavaTypeAccess.apply( typeConfiguration );
@@ -415,7 +415,7 @@ else if ( ownerName != null && propertyName != null ) {
 			final ServiceRegistry serviceRegistry = typeConfiguration.getServiceRegistry();
 			final ClassLoaderService classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
 
-			impliedJavaType = ReflectHelper.reflectedPropertyClass(
+			impliedJavaType = ReflectHelper.reflectedPropertyType(
 					ownerName,
 					propertyName,
 					classLoaderService
@@ -425,7 +425,7 @@ else if ( ownerName != null && propertyName != null ) {
 			return null;
 		}
 
-		resolvedJavaClass = impliedJavaType;
+		resolvedJavaType = impliedJavaType;
 		return typeConfiguration.getJavaTypeDescriptorRegistry().resolveDescriptor( impliedJavaType );
 	}
 
@@ -434,7 +434,7 @@ else if ( ownerName != null && propertyName != null ) {
 	private static Resolution interpretExplicitlyNamedType(
 			String name,
 			EnumType enumerationStyle,
-			Function<TypeConfiguration, Class> implicitJavaTypeAccess,
+			Function<TypeConfiguration, java.lang.reflect.Type> implicitJavaTypeAccess,
 			Function<TypeConfiguration, BasicJavaDescriptor> explicitJtdAccess,
 			Function<TypeConfiguration, SqlTypeDescriptor> explicitStdAccess,
 			Function<TypeConfiguration, MutabilityPlan> explicitMutabilityPlanAccess,

diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Property.java b/hibernate-core/src/main/java/org/hibernate/mapping/Property.java
@@ -90,7 +90,7 @@ public Value getValue() {
 	}
 
 	public boolean isPrimitive(Class clazz) {
-		return getGetter(clazz).getReturnType().isPrimitive();
+		return getGetter(clazz).getReturnTypeClass().isPrimitive();
 	}
 
 	public CascadeStyle getCascadeStyle() throws MappingException {

diff --git a/...n/java/org/hibernate/metamodel/internal/StandardPojoEmbeddableRepresentationStrategy.java b/...n/java/org/hibernate/metamodel/internal/StandardPojoEmbeddableRepresentationStrategy.java
@@ -159,7 +159,7 @@ private ReflectionOptimizer buildReflectionOptimizer(
 
 			getterNames[i] = propertyAccess.getGetter().getMethodName();
 			setterNames[i] = propertyAccess.getSetter().getMethodName();
-			propTypes[i] = propertyAccess.getGetter().getReturnType();
+			propTypes[i] = propertyAccess.getGetter().getReturnTypeClass();
 		}
 
 		return Environment.getBytecodeProvider().getReflectionOptimizer(

diff --git a/.../main/java/org/hibernate/metamodel/internal/StandardPojoEntityRepresentationStrategy.java b/.../main/java/org/hibernate/metamodel/internal/StandardPojoEntityRepresentationStrategy.java
@@ -288,7 +288,7 @@ private ReflectionOptimizer resolveReflectionOptimizer(
 			}
 
 			getterNames.add( propertyAccess.getGetter().getMethodName() );
-			getterTypes.add( propertyAccess.getGetter().getReturnType() );
+			getterTypes.add( propertyAccess.getGetter().getReturnTypeClass() );
 
 			setterNames.add( propertyAccess.getSetter().getMethodName() );
 

diff --git a/...core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEmbeddedImpl.java b/...core/src/main/java/org/hibernate/property/access/internal/PropertyAccessEmbeddedImpl.java
@@ -8,6 +8,7 @@
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -21,7 +22,7 @@
  * PropertyAccess for handling non-aggregated composites.
  * <p/>
  * IMPL NOTE : We actually use a singleton for the Setter; we cannot for the getter mainly
- * because we need to differentiate {@link Getter#getReturnType()}.  Ultimately I'd prefer to
+ * because we need to differentiate {@link Getter#getReturnTypeClass()}.  Ultimately I'd prefer to
  * model that "common information" on PropertyAccess itself.
  *
  * @author Gavin King
@@ -73,7 +74,12 @@ public Object getForInsert(Object owner, Map mergeMap, SharedSessionContractImpl
 		}
 
 		@Override
-		public Class getReturnType() {
+		public Class<?> getReturnTypeClass() {
+			return containerType;
+		}
+
+		@Override
+		public Type getReturnType() {
 			return containerType;
 		}
 

diff --git a/...nate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMapImpl.java b/...nate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessMapImpl.java
@@ -8,6 +8,7 @@
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -68,11 +69,16 @@ public Object getForInsert(Object owner, Map mergeMap, SharedSessionContractImpl
 		}
 
 		@Override
-		public Class getReturnType() {
+		public Class<?> getReturnTypeClass() {
 			// we just don't know...
 			return Object.class;
 		}
 
+		@Override
+		public Type getReturnType() {
+			return Object.class;
+		}
+
 		@Override
 		public Member getMember() {
 			return null;

diff --git a/...c/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBackRefImpl.java b/...c/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyBackRefImpl.java
@@ -9,6 +9,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -102,7 +103,12 @@ public Object getForInsert(Object owner, Map mergeMap, SharedSessionContractImpl
 		}
 
 		@Override
-		public Class getReturnType() {
+		public Class<?> getReturnTypeClass() {
+			return Object.class;
+		}
+
+		@Override
+		public Type getReturnType() {
 			return Object.class;
 		}
 

diff --git a/...n/java/org/hibernate/property/access/internal/PropertyAccessStrategyIndexBackRefImpl.java b/...n/java/org/hibernate/property/access/internal/PropertyAccessStrategyIndexBackRefImpl.java
@@ -8,6 +8,7 @@
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -85,7 +86,12 @@ public Object getForInsert(Object owner, Map mergeMap, SharedSessionContractImpl
 		}
 
 		@Override
-		public Class getReturnType() {
+		public Class<?> getReturnTypeClass() {
+			return Object.class;
+		}
+
+		@Override
+		public Type getReturnType() {
 			return Object.class;
 		}
 

diff --git a/.../src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyNoopImpl.java b/.../src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyNoopImpl.java
@@ -8,6 +8,7 @@
 
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
@@ -74,7 +75,12 @@ public Object getForInsert(Object owner, Map mergeMap, SharedSessionContractImpl
 		}
 
 		@Override
-		public Class getReturnType() {
+		public Class<?> getReturnTypeClass() {
+			return Object.class;
+		}
+
+		@Override
+		public Type getReturnType() {
 			return Object.class;
 		}
 

diff --git a/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedGetterMethodImpl.java b/hibernate-core/src/main/java/org/hibernate/property/access/spi/EnhancedGetterMethodImpl.java
@@ -11,6 +11,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
+import java.lang.reflect.Type;
 import java.util.Map;
 
 import org.hibernate.PropertyAccessException;
@@ -102,10 +103,15 @@ public Object getForInsert(Object owner, Map mergeMap, SharedSessionContractImpl
 	}
 
 	@Override
-	public Class getReturnType() {
+	public Class<?> getReturnTypeClass() {
 		return getterMethod.getReturnType();
 	}
 
+	@Override
+	public Type getReturnType() {
+		return getterMethod.getGenericReturnType();
+	}
+
 	@Override
 	public Member getMember() {
 		return getterMethod;