HHH-7798 Moved determineDeclaredType to AttributeBuilder

brmeyer · brmeyer · commit 95512c749ba7 · 2012-11-19T12:34:54.000-05:00
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/metamodel/internal/builder/AttributeBuilder.java b/hibernate-core/src/main/java/org/hibernate/jpa/metamodel/internal/builder/AttributeBuilder.java
@@ -563,6 +563,21 @@ public static ParameterizedType getSignatureType(Member member) {
 		if ( type instanceof Class ) return null;
 		return (ParameterizedType) type;
 	}
+	
+	public static Class<?> determineDeclaredType( Member member ) {
+		final Class<?> declaredType;
+		// we can support method or field members here.  Is there really any other valid type?
+		if ( Field.class.isInstance( member ) ) {
+			declaredType = ( (Field) member ).getType();
+		}
+		else if ( Method.class.isInstance( member ) ) {
+			declaredType = ( (Method) member ).getReturnType();
+		}
+		else {
+			throw new IllegalArgumentException( "Cannot determine java-type from given member [" + member + "]" );
+		}
+		return declaredType;
+	}
 
 	public static PluralAttribute.CollectionType determineCollectionType(Class javaType) {
 		if ( java.util.List.class.isAssignableFrom( javaType ) ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/metamodel/internal/builder/BaseAttributeMetadata.java b/hibernate-core/src/main/java/org/hibernate/jpa/metamodel/internal/builder/BaseAttributeMetadata.java
@@ -53,18 +53,8 @@ public BaseAttributeMetadata(
 		this.ownerType = ownerType;
 		this.member = member;
 		this.persistentAttributeType = persistentAttributeType;
-		final Class declaredType;
-		// we can support method or field members here.  Is there really any other valid type?
-		if ( Field.class.isInstance( member ) ) {
-			declaredType = ( (Field) member ).getType();
-		}
-		else if ( Method.class.isInstance( member ) ) {
-			declaredType = ( (Method) member ).getReturnType();
-		}
-		else {
-			throw new IllegalArgumentException( "Cannot determine java-type from given member [" + member + "]" );
-		}
-		this.javaType = declaredType;
+		
+		this.javaType = (Class<Y>) AttributeBuilder.determineDeclaredType( member );
 	}
 
 	@Override
