From 54735d4270187a164421748d38d4d62d64327861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Wed, 21 Jan 2015 18:11:22 +0200
Subject: [PATCH] Remove type(?) expression customizations

---
 .../java/com/querydsl/jpa/HQLTemplates.java   |  9 ---------
 .../java/com/querydsl/jpa/JPQLSerializer.java | 20 -------------------
 .../java/com/querydsl/jpa/JPQLTemplates.java  |  5 -----
 3 files changed, 34 deletions(-)

diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java
index d2326483b..0d8984e6d 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/HQLTemplates.java
@@ -75,10 +75,6 @@ public class HQLTemplates extends JPQLTemplates {
         builder.put(BigDecimal.class, "big_decimal");
         typeNames = builder.build();
 
-        // TODO : remove this when Hibernate supports type(alias)
-        add(Ops.INSTANCE_OF, "{0}.class = {1}");
-        // TODO : remove this when Hibernate supports type(alias)
-        add(JPQLOps.TYPE, "{0}.class");
         // TODO : remove this when Hibernate supports member of properly
         add(JPQLOps.MEMBER_OF, "{0} in elements({1})");
         add(JPQLOps.NOT_MEMBER_OF, "{0} not in elements({1})");
@@ -110,11 +106,6 @@ public class HQLTemplates extends JPQLTemplates {
         return wrapElements.contains(operator);
     }
 
-    @Override
-    public boolean isTypeAsString() {
-        return true;
-    }
-
     @Override
     public String getTypeForCast(Class<?> cl) {
         return typeNames.get(cl);
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 2a20e081f..777e4eb81 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLSerializer.java
@@ -417,9 +417,6 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
                 super.visitOperation(type, operator, args);
             }
 
-        } else if (operator == Ops.INSTANCE_OF) {
-            visitInstanceOf(type, operator, args);
-
         } else if (operator == Ops.NUMCAST) {
             visitNumCast(args);
 
@@ -456,23 +453,6 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
         visitOperation(targetType, JPQLOps.CAST, ImmutableList.of(args.get(0), ConstantImpl.create(typeName)));
     }
 
-    private void visitInstanceOf(Class<?> type, Operator<?> operator,
-            List<? extends Expression<?>> args) {
-        if (templates.isTypeAsString()) {
-            final List<Expression<?>> newArgs = new ArrayList<Expression<?>>(args);
-            final Class<?> cl = ((Class<?>) ((Constant<?>) newArgs.get(1)).getConstant());
-            // use discriminator value instead of fqnm
-            if (cl.isAnnotationPresent(DiscriminatorValue.class)) {
-                newArgs.set(1, ConstantImpl.create(cl.getAnnotation(DiscriminatorValue.class).value()));
-            } else {
-                newArgs.set(1, ConstantImpl.create(cl.getSimpleName()));
-            }
-            super.visitOperation(type, operator, newArgs);
-        } else {
-            super.visitOperation(type, operator, args);
-        }
-    }
-
     private void visitPathInCollection(Class<?> type, Operator<?> operator,
             List<? extends Expression<?>> args) {
         Path<?> lhs = (Path<?>) args.get(0);
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 d2896b259..45ff42ad9 100644
--- a/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java
+++ b/querydsl-jpa/src/main/java/com/querydsl/jpa/JPQLTemplates.java
@@ -146,11 +146,6 @@ public class JPQLTemplates extends Templates {
         return false;
     }
 
-    public boolean isTypeAsString() {
-        // TODO : get rid of this when Hibernate supports type(alias)
-        return false;
-    }
-
     public String getTypeForCast(Class<?> cl) {
         return cl.getSimpleName().toLowerCase();
     }