Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8854 Create AttributeConverterDefinition even if AttributeConverter 

is only implemented via superclass or interface
This commit is contained in:
Svein 2015-05-15 09:36:46 +02:00 committed by Steve Ebersole
parent 1812bb2ef3
commit b5845138e6
2 changed files with 91 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hibernate-core/src/main/java/org/hibernate/cfg/AttributeConverterDefinition.java
View File

@ -9,12 +9,15 @@ package org.hibernate.cfg;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
import org.hibernate.AnnotationException;
import org.hibernate.AssertionFailure;
import org.jboss.logging.Logger;
/**
@ -109,6 +112,12 @@ public class AttributeConverterDefinition {
final Class attributeConverterClass = attributeConverter.getClass();
final ParameterizedType attributeConverterSignature = extractAttributeConverterParameterizedType( attributeConverterClass );
if ( attributeConverterSignature == null ) {
throw new AssertionFailure(
"Could not extract ParameterizedType representation of AttributeConverter definition " +
"from AttributeConverter implementation class [" + attributeConverterClass.getName() + "]"
);
}
if ( attributeConverterSignature.getActualTypeArguments().length < 2 ) {
throw new AnnotationException(
@ -140,20 +149,26 @@ public class AttributeConverterDefinition {
}
}
private ParameterizedType extractAttributeConverterParameterizedType(Class attributeConverterClass) {
for ( Type type : attributeConverterClass.getGenericInterfaces() ) {
if ( ParameterizedType.class.isInstance( type ) ) {
final ParameterizedType parameterizedType = (ParameterizedType) type;
if ( AttributeConverter.class.equals( parameterizedType.getRawType() ) ) {
private ParameterizedType extractAttributeConverterParameterizedType(Type base) {
if ( base != null ) {
Class clazz = extractClass( base );
List<Type> types = new ArrayList<Type>();
types.add( clazz.getGenericSuperclass() );
types.addAll( Arrays.asList( clazz.getGenericInterfaces() ) );
for ( Type type : types ) {
if ( ParameterizedType.class.isInstance( type ) ) {
final ParameterizedType parameterizedType = (ParameterizedType) type;
if ( AttributeConverter.class.equals( parameterizedType.getRawType() ) ) {
return parameterizedType;
}
}
ParameterizedType parameterizedType = extractAttributeConverterParameterizedType( type );
if ( parameterizedType != null ) {
return parameterizedType;
}
}
}
throw new AssertionFailure(
"Could not extract ParameterizedType representation of AttributeConverter definition " +
"from AttributeConverter implementation class [" + attributeConverterClass.getName() + "]"
);
return null;
}
public AttributeConverter getAttributeConverter() {

65
hibernate-core/src/test/java/org/hibernate/test/type/AttributeConverterOnSuperclassTest.java Normal file
View File

@ -0,0 +1,65 @@
package org.hibernate.test.type;
import static org.junit.Assert.assertEquals;
import javax.persistence.AttributeConverter;
import org.hibernate.cfg.AttributeConverterDefinition;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.junit.Test;
/**
* Test the ability to interpret and understand AttributeConverter impls when the base class does not
* explicitly implement AttributeConverter but implements it via an interface or superclass.
*
* @author Svein Baardsen
*/
@TestForIssue(jiraKey = "HHH-8854")
public class AttributeConverterOnSuperclassTest extends BaseUnitTestCase {
public static class StringIntegerAttributeConverter implements AttributeConverter<String, Integer> {
@Override
public Integer convertToDatabaseColumn(String attribute) {
return Integer.valueOf( attribute );
}
@Override
public String convertToEntityAttribute(Integer dbData) {
return String.valueOf( dbData );
}
}
public static class StringIntegerConverterSubclass extends StringIntegerAttributeConverter {
}
@Test
public void testAttributeConverterOnSuperclass() {
AttributeConverterDefinition def = AttributeConverterDefinition.from( StringIntegerConverterSubclass.class );
assertEquals( String.class, def.getEntityAttributeType() );
}
public interface StringLongAttributeConverter extends AttributeConverter<String, Long> {
}
public static class StringLongAttributeConverterImpl implements StringLongAttributeConverter {
@Override
public Long convertToDatabaseColumn(String attribute) {
return Long.valueOf( attribute );
}
@Override
public String convertToEntityAttribute(Long dbData) {
return String.valueOf( dbData );
}
}
@Test
public void testAttributeConverterOnInterface() {
AttributeConverterDefinition def = AttributeConverterDefinition.from( StringLongAttributeConverterImpl.class );
assertEquals( String.class, def.getEntityAttributeType() );
}
}