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

HHH-9343 - Case/when in criteria with string literal result fails type checking

This commit is contained in:
Andrea Boriero 2015-11-27 13:09:56 +00:00
parent 462585c532
commit 4b99c1b79d
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/ValueHandlerFactory.java
View File

@ -68,6 +68,10 @@ public class ValueHandlerFactory {
|| Double.TYPE.isInstance( value );
}
public static boolean isBoolean(Object value) {
return Boolean.class.isInstance( value );
}
public static class ByteValueHandler extends BaseValueHandler<Byte> implements Serializable {
public static final ByteValueHandler INSTANCE = new ByteValueHandler();
@SuppressWarnings({ "UnnecessaryBoxing" })
@ -230,6 +234,23 @@ public class ValueHandlerFactory {
}
}
public static class BooleanValueHandler extends BaseValueHandler<Boolean> implements Serializable {
public static final BooleanValueHandler INSTANCE = new BooleanValueHandler();
public Boolean convert(Object value) {
if ( value == null ) {
return null;
}
if ( Boolean.class.isInstance( value ) ) {
return (Boolean) value;
}
if ( String.class.isInstance( value ) ) {
return Boolean.getBoolean( (String) value );
}
throw unknownConversion( value, Boolean.class );
}
}
public static class StringValueHandler extends BaseValueHandler<String> implements Serializable {
public static final StringValueHandler INSTANCE = new StringValueHandler();
public String convert(Object value) {
@ -308,6 +329,9 @@ public class ValueHandlerFactory {
if ( BigDecimal.class.equals( targetType ) ) {
return (ValueHandler<T>) BigDecimalValueHandler.INSTANCE;
}
if ( Boolean.class.equals( targetType ) ) {
return (ValueHandler<T>) BooleanValueHandler.INSTANCE;
}
return null;
}
}

3
hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/expression/LiteralExpression.java
View File

@ -49,6 +49,9 @@ public class LiteralExpression<T> extends ExpressionImpl<T> implements Serializa
if ( ValueHandlerFactory.isNumeric( literal ) ) {
return ValueHandlerFactory.determineAppropriateHandler( (Class) literal.getClass() ).render( literal );
}
else if ( ValueHandlerFactory.isBoolean( literal ) ) {
return ValueHandlerFactory.determineAppropriateHandler( (Class) literal.getClass() ).render( literal );
}
// else...
final String parameterName = renderingContext.registerLiteralParameterBinding( getLiteral(), getJavaType() );