From a6d6435446e6cb61cbc899a4aed8117f4a98bb57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 18 Sep 2015 20:20:35 +0300 Subject: [PATCH] Bump Hibernate version --- querydsl-jpa/pom.xml | 6 +++--- .../main/java/com/querydsl/jpa/JPQLSerializer.java | 12 ------------ .../main/java/com/querydsl/jpa/JPQLTemplates.java | 1 + 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml index 46dbea647..8f721327f 100644 --- a/querydsl-jpa/pom.xml +++ b/querydsl-jpa/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -23,7 +23,7 @@ - 4.3.7.Final + 4.3.11.Final 4.3.1.Final 2.6.0-RC1 javax.persistence.*;version="[1.1,3)",${osgi.import.package.root} @@ -366,4 +366,4 @@ - + diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java index ed7db59a2..442a6338e 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java @@ -483,18 +483,6 @@ public class JPQLSerializer extends SerializerBase { } private void visitAnyInPath(Class type, Operator operator, List> args) { - if (!templates.isEnumInPathSupported() && args.get(0) instanceof Constant && Enum.class.isAssignableFrom(args.get(0).getType())) { - @SuppressWarnings("unchecked") //guarded by previous check - Constant> expectedConstant = (Constant>) args.get(0); - - final Enum constant = expectedConstant.getConstant(); - final Enumerated enumerated = ((Path) args.get(1)).getAnnotatedElement().getAnnotation(Enumerated.class); - if (enumerated == null || enumerated.value() == EnumType.ORDINAL) { - args = ImmutableList.of(ConstantImpl.create(constant.ordinal()), args.get(1)); - } else { - args = ImmutableList.of(ConstantImpl.create(constant.name()), args.get(1)); - } - } super.visitOperation(type, operator == Ops.IN ? JPQLOps.MEMBER_OF : JPQLOps.NOT_MEMBER_OF, args); diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java index 881c3e912..18c8bc9be 100644 --- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java +++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java @@ -160,6 +160,7 @@ public class JPQLTemplates extends Templates { return cl.getSimpleName().toLowerCase(); } + @Deprecated // kept for backwards compatibility public boolean isEnumInPathSupported() { return true; }